1c/bsl_console
1
0
Fork 0
mirror of https://github.com/salexdv/bsl_console.git synced 2025-02-13 13:48:24 +02:00
Code Issues Releases Activity

Связи по типам в bslGlobals, чтобы работали подсказки через точку для методов и свойств.

Browse Source 
Добавлены связи для типов ТаблицаЗначений, СписокЗначений, ДеревоЗначений, Массив,
HTTPОтвет, ДвоичныДанные и др.
This commit is contained in:
salexdv 2020-08-05 17:42:44 +03:00
parent 0c50dce9d3
commit 15ccf4fbaf
3 changed files with 965 additions and 850 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1768
src/bslGlobals.js
View File

File diff suppressed because one or more lines are too long

32
src/bsl_helper.js
View File

@ -284,9 +284,20 @@ class bslHelper {
postfix = '()';
}
let command = null;
let ref = null;
if (value.hasOwnProperty('ref'))
ref = value.ref;
if (ref || signatures.length) {
// If the attribute contains a ref, we need to run the command to save the position of ref
command = { id: 'vs.editor.ICodeEditor:1:saveref', arguments: [{ "name": value[this.nameField], "data": { "ref": ref, "sig": signatures } }] }
}
let template = value.hasOwnProperty('template') ? value.template : '';
values.push({ name: value[this.nameField], detail: value.description, description: value.hasOwnProperty('returns') ? value.returns : '', postfix: postfix, template: template });
values.push({ name: value[this.nameField], detail: value.description, description: value.hasOwnProperty('returns') ? value.returns : '', postfix: postfix, template: template, command: command });
}
else {
@ -297,7 +308,7 @@ class bslHelper {
let postfix = '';
if (invalue.hasOwnProperty('postfix'))
postfix = invalue.postfix;
values.push({ name: inkey, detail: '', description: '', postfix: postfix, template: '' });
values.push({ name: inkey, detail: '', description: '', postfix: postfix, template: '', command: null });
}
}
@ -312,7 +323,8 @@ class bslHelper {
insertText: value.template ? value.template : value.name + value.postfix,
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
detail: value.detail,
documentation: value.description
documentation: value.description,
command: value.command
});
}
})
@ -375,7 +387,7 @@ class bslHelper {
if (mvalue.hasOwnProperty('ref'))
ref = mvalue.ref;
if (ref || signatures) {
if (ref || signatures.length) {
// If the attribute contains a ref, we need to run the command to save the position of ref
command = { id: 'vs.editor.ICodeEditor:1:saveref', arguments: [{ "name": mvalue[this.nameField], "data": { "ref": ref, "sig": signatures } }] }
}
@ -462,6 +474,9 @@ class bslHelper {
// 1C does not support positive/negative lookbehind yet
//match = this.model.findPreviousMatch('(?<!\\/\\/.*)' + this.lastRawExpression + '\\s?=\\s?.*\\.([^.]*?)\\s?(?:;|\\()', this.position, true, false, null, true);
match = this.model.findPreviousMatch(this.lastRawExpression + '\\s?=\\s?.*\\.([^.]*?)\\s?(?:;|\\()', this.position, true, false, null, true);
if (!match)
match = this.model.findPreviousMatch(this.lastRawExpression + '\\s?=\\s?([a-zA-Z0-9\u0410-\u044F_]+)\\(', this.position, true, false, null, true);
if (match) {
@ -554,7 +569,7 @@ class bslHelper {
if (mvalue.hasOwnProperty('ref'))
ref = mvalue.ref;
if (ref || signatures) {
if (ref || signatures.length) {
// If the attribute contains a ref, we need to run the command to save the position of ref
command = { id: 'vs.editor.ICodeEditor:1:saveref', arguments: [{ "name": mvalue[this.nameField], "data": { "ref": ref, "sig": signatures } }] };
}
@ -577,6 +592,11 @@ class bslHelper {
for (const [pkey, pvalue] of Object.entries(obj.properties)) {
let command = null;
if (pvalue.hasOwnProperty('ref'))
command = { id: 'vs.editor.ICodeEditor:1:saveref', arguments: [{ "name": pvalue[this.nameField], "data": { "ref": pvalue.ref, "sig": null } }] };
suggestions.push({
label: pvalue[this.nameField],
kind: monaco.languages.CompletionItemKind.Field,
@ -584,7 +604,7 @@ class bslHelper {
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
detail: pvalue.description,
documentation: '',
command: null
command: command
});
}

15
src/test.js
View File

@ -442,12 +442,23 @@ describe("Проверка автокомлита и подсказок реда
[2, new Map([["Скопировать", { "ref": "classes.ТаблицаЗначений", "sig": null }]])],
[3, new Map([["ВыгрузитьКолонку", { "ref": "classes.Массив", "sig": signature }]])]
]);
let help = bsl.getRefSigHelp();
console.log(help);
let help = bsl.getRefSigHelp();
expect(help).to.have.property('activeParameter');
contextData = new Map();
});
it("проверка подсказки для таблицы, полученной функцией НайтиПоСсылкам", function () {
bsl = helper('Таблица = НайтиПоСсылкам();\nТаблица.');
let suggestions = [];
contextData = new Map([
[1, new Map([["НайтиПоСсылкам", { "ref": "classes.ТаблицаЗначений", "sig": null }]])]
]);
bsl.getRefCompletition(suggestions);
expect(suggestions).to.be.an('array').that.not.is.empty;
assert.equal(suggestions.some(suggest => suggest.label === "ВыгрузитьКолонку"), true);
contextData = new Map();
});
}
mocha.run();