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

Убрал верхний регистр для выражений СКД resolves #153

Browse Source
This commit is contained in:
salexdv 2021-05-28 09:14:43 +03:00
parent 4cdbcafbd4
commit 650fd96745
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bsl_helper.js
View File

@ -177,10 +177,14 @@ class bslHelper {
let char = '';
let column = this.model.getLineLastNonWhitespaceColumn(lineNumber);
if (lineNumber) {
if (0 < column)
char = this.model.getValueInRange(new monaco.Range(lineNumber, column - 1, lineNumber, column));
let column = this.model.getLineLastNonWhitespaceColumn(lineNumber);
if (0 < column)
char = this.model.getValueInRange(new monaco.Range(lineNumber, column - 1, lineNumber, column));
}
return char;
@ -2361,8 +2365,9 @@ class bslHelper {
* @param {array} suggestions array of suggestions for provideCompletionItems
* @param {array} values array of values
* @param {CompletionItemKind} kind - monaco.languages.CompletionItemKind (class, function, constructor etc.)
* @param {bool} upperCase turn expression into upper case or not
*/
getFillSuggestionsFromArray(suggestions, values, kind) {
getFillSuggestionsFromArray(suggestions, values, kind, upperCase) {
let word = this.word;
@ -2372,7 +2377,10 @@ class bslHelper {
if (value.toLowerCase().startsWith(word)) {
let expression = value.toUpperCase();
let expression = value;
if (upperCase)
value = value.toUpperCase();
if (engLang) {
if (!/^[A-Za-z]*$/.test(expression))
@ -2552,7 +2560,7 @@ class bslHelper {
values.push(keyword);
}
this.getFillSuggestionsFromArray(suggestions, values, kind);
this.getFillSuggestionsFromArray(suggestions, values, kind, true);
}
@ -3500,7 +3508,7 @@ class bslHelper {
if (!this.requireQueryValue()) {
if (this.lastOperator != '"') {
this.getFillSuggestionsFromArray(suggestions, languages.bsl.languageDef.rules.DCSExp, monaco.languages.CompletionItemKind.Module);
this.getFillSuggestionsFromArray(suggestions, languages.bsl.languageDef.rules.DCSExp, monaco.languages.CompletionItemKind.Module, false);
let functions = this.getQueryFunctions(bslDCS);
this.getCommonCompletition(suggestions, functions, monaco.languages.CompletionItemKind.Function, true);
this.getCustomObjectsCompletition(suggestions, bslMetadata.customObjects, monaco.languages.CompletionItemKind.Enum);

4
src/bsl_language.js
View File

@ -170,8 +170,8 @@ define([], function () {
'LOWER', 'СТРЗАМЕНИТЬ', 'STRREPLACE', 'РАЗМЕРХРАНИМЫХДАННЫХ', 'STOREDDATASIZE'
],
DCSExp: [
'ВЫБОР', 'CASE', 'КОГДА', 'WHEN', 'ТОГДА', 'THEN', 'ИЛИ', 'OR',
'ИНАЧЕ', 'ELSE', 'ИСТИНА', 'TRUE', 'КОНЕЦ', 'END', 'ЛОЖЬ', 'FALSE'
'Выбор', 'Case', 'Когда', 'When', 'Тогда', 'Then', 'Или', 'Or',
'Иначе', 'Else', 'Истина', 'True', 'Конец', 'End', 'Ложь', 'False'
],
DCSFunctions: [
'ВЫЧИСЛИТЬ', 'EVAL', 'ВЫЧИСЛИТЬВЫРАЖЕНИЕ', 'EVALEXPRESSION',