1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Доработка функции, определяющей имена переменных

Browse Source
This commit is contained in:
salexdv 2020-11-15 13:22:43 +03:00
parent 8f42dd76a0
commit 58dd30bac8
3 changed files with 60 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/bsl_helper.js
View File

@ -1217,29 +1217,55 @@ class bslHelper {
getVarsNames(currentLine) {
let names = [];
let comments = new Map();
const matches = this.model.findMatches('([a-zA-Z0-9\u0410-\u044F_]+)\\s?=\\s?.*(?:;|\\()\\s*$', true, true, false, null, true);
const commentMatches = this.model.findMatches('\\/\\/', true, true, false, null, true);
for (let idx = 0; idx < commentMatches.length; idx++) {
comments.set(commentMatches[idx].range.startLineNumber, commentMatches[idx].range.startColumn);
}
let matches = this.model.findMatches('([a-zA-Z0-9\u0410-\u044F_]+)\\s?=\\s?.*(?:;|\\()\\s*$', true, true, false, null, true);
for (let idx = 0; idx < matches.length; idx++) {
let match = matches[idx];
if (match.range.startLineNumber < currentLine) {
if (match.range.startLineNumber < currentLine || currentLine == 0) {
let varName = match.matches[match.matches.length - 1]
let comment = comments.get(match.range.startLineNumber);
if (!names.some(name => name === varName))
names.push(varName);
if (!comment || match.range.startColumn < comment) {
let varName = match.matches[match.matches.length - 1]
if (!names.some(name => name === varName))
names.push(varName);
}
}
}
matches = [];
let funcDef = [];
let funcLine = 0;
const funcDef = editor.getModel().findPreviousMatch('(?:процедура|функция)\\s+[a-zA-Z0-9\u0410-\u044F_]+\\(([a-zA-Z0-9\u0410-\u044F_,\\s=]+)\\)', true, true, false, null, true);
if (currentLine == 0)
matches = editor.getModel().findMatches('(?:процедура|функция)\\s+[a-zA-Z0-9\u0410-\u044F_]+\\(([a-zA-Z0-9\u0410-\u044F_,\\s=]+)\\)', true, true, false, null, true);
else {
funcDef = editor.getModel().findPreviousMatch('(?:процедура|функция)\\s+[a-zA-Z0-9\u0410-\u044F_]+\\(([a-zA-Z0-9\u0410-\u044F_,\\s=]+)\\)', true, true, false, null, true);
if (funcDef) {
funcLine = funcDef.range.startLineNumber;
matches.push(funcDef);
}
}
if (funcDef && 1 < funcDef.matches.length) {
const params = funcDef.matches[1].split(',');
for (let idx = 0; idx < matches.length; idx++) {
let match = matches[idx];
let params = match.matches[1].split(',');
params.forEach(function(param) {
let paramName = param.split('=')[0].trim();
@ -1248,7 +1274,29 @@ class bslHelper {
});
}
matches = editor.getModel().findMatches('(?:перем|var)\\s+([a-zA-Z0-9\u0410-\u044F_,\\s]+);', true, true, false, null, true);
for (let idx = 0; idx < matches.length; idx++) {
let match = matches[idx];
if (currentLine == 0 || funcLine < match.range.startLineNumber) {
let varDef = match.matches[match.matches.length - 1];
const params = varDef.split(',');
params.forEach(function(param) {
let paramName = param.split('=')[0].trim();
if (!names.some(name => name === paramName))
names.push(paramName);
});
}
}
return names;
}

2
src/editor.js
View File

@ -274,7 +274,7 @@ define(['bslGlobals', 'bslMetadata', 'snippets', 'bsl_language', 'vs/editor/edit
getVarsNames = function () {
let bsl = new bslHelper(editor.getModel(), editor.getPosition());
return bsl.getVarsNames(editor.getModel().getLineCount());
return bsl.getVarsNames(0);
}

2
src/test.js
View File

@ -3,6 +3,8 @@ describe("Проверка автокомлита и подсказок реда
require(['editor'], function () {
init('8.3.18.1');
var assert = chai.assert;
var expect = chai.expect;
chai.should();