From 73ea8a4da12b77714c49f798158bee424b32a672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=9B=D1=8E?= =?UTF-8?q?=D0=BB=D1=8E=D0=BA?= Date: Thu, 29 Oct 2020 12:53:18 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=80=D1=84=D0=BE=D0=B3=D1=80=D0=B0=D1=84=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D1=83=D1=8E=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D1=83=20=D0=B2=20=D1=84=D0=B0=D0=B9=D0=BB=D0=B5=20=D0=BE?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=8F=D0=B7=D1=8B?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/bslQuery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bslQuery.js b/src/bslQuery.js index 2a44252..1bbdb58 100644 --- a/src/bslQuery.js +++ b/src/bslQuery.js @@ -8,9 +8,9 @@ define([], function () { "returns": "Тип: Число. Разность между датами в заданном типе.", "signature": { "default": { - "СтрокаПараметров": "(ВичитаемаяДата, ИсходнаяДата, ТипРазности): Число", + "СтрокаПараметров": "(ВычитаемаяДата, ИсходнаяДата, ТипРазности): Число", "Параметры": { - "ВичитаемаяДата": "Дата, вычитаемая дата", + "ВычитаемаяДата": "Дата, вычитаемая дата", "ИсходнаяДата": "Дата, исходная дата", "ТипРазности": "Тип разности, одно из: СЕКУНДА, МИНУТа, ЧАС, ДЕНЬ, МЕСЯЦ, КВАРТАЛ, ГОД" } From f9e91bc9aafb5e5570d8712094f53c59d1f61bfe Mon Sep 17 00:00:00 2001 From: tormozit Date: Tue, 11 May 2021 21:06:10 +0300 Subject: [PATCH 2/5] Revert "Merge branch 'master' into develop" This reverts commit 26b7fd67f029d9167fd32226397445e6efa46739, reversing changes made to d85fce88f86817e25127f46d21a7956584c5a34e. --- src/bslQuery.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bslQuery.js b/src/bslQuery.js index 3d93b35..b438fbd 100644 --- a/src/bslQuery.js +++ b/src/bslQuery.js @@ -8,9 +8,9 @@ define([], function () { "returns": "Тип: Число. Разность между датами в заданном типе.", "signature": { "default": { - "СтрокаПараметров": "(ВычитаемаяДата, ИсходнаяДата, ТипРазности): Число", + "СтрокаПараметров": "(ВичитаемаяДата, ИсходнаяДата, ТипРазности): Число", "Параметры": { - "ВычитаемаяДата": "Дата, вычитаемая дата", + "ВичитаемаяДата": "Дата, вычитаемая дата", "ИсходнаяДата": "Дата, исходная дата", "ТипРазности": "Тип разности, одно из: СЕКУНДА, МИНУТа, ЧАС, ДЕНЬ, МЕСЯЦ, КВАРТАЛ, ГОД" } From 55aa63ca63c953115cc2dbe02b3e7c7a39970989 Mon Sep 17 00:00:00 2001 From: tormozit Date: Sat, 15 May 2021 10:54:51 +0300 Subject: [PATCH 3/5] Update bsl_language.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавил поддержку фигурных скобок в описание языка запросов https://github.com/salexdv/bsl_console/issues/117 --- src/bsl_language.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bsl_language.js b/src/bsl_language.js index 86232df..ce0fcea 100644 --- a/src/bsl_language.js +++ b/src/bsl_language.js @@ -102,6 +102,7 @@ define([], function () { brackets: [ { open: '[', close: ']', token: 'delimiter.square' }, { open: '(', close: ')', token: 'delimiter.parenthesis' }, + { open: '{', close: '}', token: 'delimiter.curly' }, ], keywords: [ 'КонецПроцедуры', 'EndProcedure', 'КонецФункции', 'EndFunction', From 286a9cb09ef19e90f24ee01bdedb2e44fc767c05 Mon Sep 17 00:00:00 2001 From: tormozit Date: Sat, 22 May 2021 22:57:39 +0300 Subject: [PATCH 4/5] added triggering EVENT_BEFORE_SIGNATURE in "Query" and "DCS" modes --- src/bsl_language.js | 54 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/src/bsl_language.js b/src/bsl_language.js index e437c07..1c2dc7b 100644 --- a/src/bsl_language.js +++ b/src/bsl_language.js @@ -485,9 +485,32 @@ 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(); + + 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); + } + + return helper; } }, hoverProvider: { @@ -536,9 +559,32 @@ 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(); + + 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); + } + + return helper; } }, hoverProvider: { From b1d20e5666843a9e9544a22c162dfd0042d2c4fa Mon Sep 17 00:00:00 2001 From: tormozit Date: Sun, 23 May 2021 00:15:21 +0300 Subject: [PATCH 5/5] minor refactored and removed excess brackets --- src/bsl_language.js | 66 ++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/src/bsl_language.js b/src/bsl_language.js index 1c2dc7b..289d6b1 100644 --- a/src/bsl_language.js +++ b/src/bsl_language.js @@ -101,8 +101,7 @@ define([], function () { ignoreCase: true, brackets: [ { open: '[', close: ']', token: 'delimiter.square' }, - { open: '(', close: ')', token: 'delimiter.parenthesis' }, - { open: '{', close: '}', token: 'delimiter.curly' }, + { open: '(', close: ')', token: 'delimiter.parenthesis' } ], keywords: [ 'КонецПроцедуры', 'EndProcedure', 'КонецФункции', 'EndFunction', @@ -414,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: { @@ -496,20 +481,7 @@ define([], function () { let bsl = new bslHelper(model, position); let helper = bsl.getQuerySigHelp(); - - 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; } }, @@ -570,20 +542,7 @@ define([], function () { let bsl = new bslHelper(model, position); let helper = bsl.getDCSSigHelp(); - - 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; } }, @@ -612,4 +571,19 @@ define([], function () { }; -}); \ No newline at end of file +}); + +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); + } +} \ No newline at end of file