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

Merge pull request #138 from tormozit/develop

Browse Source 
added triggering EVENT_BEFORE_SIGNATURE in "Query" and "DCS" modes
This commit is contained in:
Alexander Shkuraev 2021-05-23 08:34:01 +03:00 committed by GitHub
commit 7cded77258
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/bsl_language.js
View File

@ -101,7 +101,7 @@ define([], function () {
ignoreCase: true,
brackets: [
{ open: '[', close: ']', token: 'delimiter.square' },
{ open: '(', close: ')', token: 'delimiter.parenthesis' },
{ open: '(', close: ')', token: 'delimiter.parenthesis' }
],
keywords: [
'КонецПроцедуры', 'EndProcedure', 'КонецФункции', 'EndFunction',
@ -413,22 +413,8 @@ define([], function () {
let bsl = new bslHelper(model, position);
let helper = bsl.getSigHelp(context);
if (generateBeforeSignatureEvent) {
let activeSignature = context.activeSignatureHelp ? context.activeSignatureHelp.activeSignature : 0;
let params = {
word: bsl.getWordUntilOpenBracket(),
line: position.lineNumber,
column: position.column,
activeParameter: bsl.textBeforePosition.split(',').length - 1,
activeSignature: activeSignature,
triggerCharacter: context.triggerCharacter
}
sendEvent('EVENT_BEFORE_SIGNATURE', params);
}
onProvideSignature(bsl, context, position);
return helper;
}
},
hoverProvider: {
@ -484,9 +470,19 @@ define([], function () {
signatureProvider: {
signatureHelpTriggerCharacters: ['(', ','],
signatureHelpRetriggerCharacters: [')'],
provideSignatureHelp: (model, position) => {
provideSignatureHelp: (model, position, token, context) => {
let widget = document.querySelector('.parameter-hints-widget');
if (widget) {
widget.style.display = '';
signatureVisible = true;
}
let bsl = new bslHelper(model, position);
return bsl.getQuerySigHelp();
let helper = bsl.getQuerySigHelp();
onProvideSignature(bsl, context, position);
return helper;
}
},
hoverProvider: {
@ -535,9 +531,19 @@ define([], function () {
signatureProvider: {
signatureHelpTriggerCharacters: ['(', ','],
signatureHelpRetriggerCharacters: [')'],
provideSignatureHelp: (model, position) => {
provideSignatureHelp: (model, position, token, context) => {
let widget = document.querySelector('.parameter-hints-widget');
if (widget) {
widget.style.display = '';
signatureVisible = true;
}
let bsl = new bslHelper(model, position);
return bsl.getDCSSigHelp();
let helper = bsl.getDCSSigHelp();
onProvideSignature(bsl, context, position);
return helper;
}
},
hoverProvider: {
@ -565,4 +571,19 @@ define([], function () {
};
});
});
function onProvideSignature(bsl, context, position) {
if (generateBeforeSignatureEvent) {
let activeSignature = context.activeSignatureHelp ? context.activeSignatureHelp.activeSignature : 0;
let params = {
word: bsl.getWordUntilOpenBracket(),
line: position.lineNumber,
column: position.column,
activeParameter: bsl.textBeforePosition.split(',').length - 1,
activeSignature: activeSignature,
triggerCharacter: context.triggerCharacter
};
sendEvent('EVENT_BEFORE_SIGNATURE', params);
}
}