mirror of
https://github.com/salexdv/bsl_console.git
synced 2024-11-24 08:33:29 +02:00
Подсказка для ВЫРАЗИТЬ в запросе
This commit is contained in:
salexdv
parent
3e60379a26
commit
f406d1fe40
@ -751,6 +751,20 @@ class bslHelper {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if the current function of query
|
||||
* is the CAST func or not
|
||||
*
|
||||
* @returns {bool}
|
||||
*/
|
||||
isItCastFunction() {
|
||||
|
||||
let exp = this.getFuncName();
|
||||
let word = this.getLastSeparatedWord(this.position).toLowerCase();
|
||||
return (exp == 'выразить' || exp == 'cast') && (word == 'как' || word == 'as');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if string contain ref constructor (ССЫЛКА|REFS)
|
||||
*
|
||||
@ -3711,6 +3725,138 @@ class bslHelper {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds AS-delimiter into CAST function if needed
|
||||
*
|
||||
* @param {array} suggestions array of suggestions for provideCompletionItems
|
||||
*/
|
||||
getCastDelimiter(suggestions) {
|
||||
|
||||
let exp = this.getFuncName();
|
||||
|
||||
if (exp == 'выразить' || exp == 'cast') {
|
||||
|
||||
let last_expression = this.lastRawExpression;
|
||||
let text_before = this.textBeforePosition;
|
||||
let as_require = (last_expression != 'выразить' && last_expression != 'cast');
|
||||
as_require = as_require && this.getLastCharacter() == ' ';
|
||||
as_require = as_require && (text_before.indexOf(' как ') < 0 && text_before.indexOf(' as '));
|
||||
|
||||
if (as_require) {
|
||||
|
||||
let label = engLang ? 'AS ' : 'КАК '
|
||||
suggestions.push({
|
||||
label: label,
|
||||
kind: monaco.languages.CompletionItemKind.Module,
|
||||
insertText: label,
|
||||
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
|
||||
command: { id: 'editor.action.triggerSuggest', title: 'suggest_type' }
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills array of completion for CAST function
|
||||
*
|
||||
* @param {array} suggestions array of suggestions for provideCompletionItems
|
||||
* @param {object} data objects from BSL-JSON dictionary
|
||||
* @param {CompletionItemKind} kind - monaco.languages.CompletionItemKind (class, function, constructor etc.)
|
||||
*/
|
||||
getCastValuesCompletion(suggestions, data) {
|
||||
|
||||
let metadataName = '';
|
||||
let word = this.getLastSeparatedWords(1).toString().toLowerCase();
|
||||
let exp = this.getLastNExpression(1);
|
||||
|
||||
if (word == 'как' || word == 'as' || exp == 'как' || exp == 'as') {
|
||||
|
||||
metadataName = ''
|
||||
|
||||
let label = engLang ? 'String' : 'Строка';
|
||||
suggestions.push({
|
||||
label: label,
|
||||
kind: monaco.languages.CompletionItemKind.Enum,
|
||||
insertText: label,
|
||||
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
|
||||
});
|
||||
|
||||
label = engLang ? 'Number' : 'Число';
|
||||
suggestions.push({
|
||||
label: label,
|
||||
kind: monaco.languages.CompletionItemKind.Enum,
|
||||
insertText: label,
|
||||
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
|
||||
});
|
||||
|
||||
}
|
||||
else {
|
||||
if (this.getLastNExpression(1) == '.')
|
||||
metadataName = this.getLastNExpression(2);
|
||||
else
|
||||
metadataName = word;
|
||||
}
|
||||
|
||||
if (word) {
|
||||
|
||||
for (const [key, value] of Object.entries(data)) {
|
||||
|
||||
if (!metadataName && value.hasOwnProperty('ref')) {
|
||||
|
||||
let suggestion = {
|
||||
label: key,
|
||||
kind: monaco.languages.CompletionItemKind.Enum,
|
||||
insertText: key,
|
||||
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
|
||||
}
|
||||
|
||||
if (value.hasOwnProperty('ref') || value.hasOwnProperty('items')) {
|
||||
suggestion.insertText += '.';
|
||||
suggestion['command'] = { id: 'editor.action.triggerSuggest', title: 'suggest_type' };
|
||||
}
|
||||
|
||||
suggestions.push(suggestion);
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
if (key.toLowerCase() == metadataName) {
|
||||
|
||||
if (value.hasOwnProperty('ref') && bslMetadata.hasOwnProperty(value.ref) && bslMetadata[value.ref].hasOwnProperty('items')) {
|
||||
|
||||
if (!Object.keys(bslMetadata[value.ref].items).length) {
|
||||
requestMetadata(bslMetadata[value.ref].name.toLowerCase());
|
||||
}
|
||||
else {
|
||||
|
||||
for (const [mkey, mvalue] of Object.entries(bslMetadata[value.ref].items)) {
|
||||
|
||||
suggestions.push({
|
||||
label: mkey,
|
||||
kind: monaco.languages.CompletionItemKind.Enum,
|
||||
insertText: mkey + ')',
|
||||
insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills array of completion for query values
|
||||
*
|
||||
@ -5204,7 +5350,11 @@ class bslHelper {
|
||||
let trigger_char = (context && context.triggerCharacter) ? context.triggerCharacter : '';
|
||||
|
||||
if (trigger_char == ' ') {
|
||||
|
||||
this.getQueryAliasCompletion(suggestions);
|
||||
|
||||
if (!suggestions.length);
|
||||
this.getCastDelimiter(suggestions);
|
||||
}
|
||||
else {
|
||||
|
||||
@ -5212,11 +5362,28 @@ class bslHelper {
|
||||
|
||||
if (!suggestions.length && !editor.disableNativeSuggestions) {
|
||||
|
||||
if (!this.requireQueryValue()) {
|
||||
let interrupt = false;
|
||||
|
||||
if (!this.requireQueryRef()) {
|
||||
if (this.requireQueryValue()) {
|
||||
this.getQueryValuesCompletion(suggestions, bslQuery.values, monaco.languages.CompletionItemKind.Enum);
|
||||
interrupt = true;
|
||||
}
|
||||
|
||||
if (!this.getQuerySourceCompletion(suggestions, monaco.languages.CompletionItemKind.Enum)) {
|
||||
if (!interrupt && this.requireQueryRef()) {
|
||||
this.getQueryRefCompletion(suggestions, monaco.languages.CompletionItemKind.Enum);
|
||||
interrupt = true;
|
||||
}
|
||||
|
||||
if (!interrupt && this.isItCastFunction()) {
|
||||
this.getCastValuesCompletion(suggestions, bslQuery.values);
|
||||
interrupt = true;
|
||||
}
|
||||
|
||||
if (!interrupt && this.getCastDelimiter(suggestions)) {
|
||||
interrupt = true;
|
||||
}
|
||||
|
||||
if (!interrupt && !this.getQuerySourceCompletion(suggestions, monaco.languages.CompletionItemKind.Enum)) {
|
||||
|
||||
let functions = null;
|
||||
|
||||
@ -5244,19 +5411,6 @@ class bslHelper {
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
this.getQueryRefCompletion(suggestions, monaco.languages.CompletionItemKind.Enum);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
|
||||
this.getQueryValuesCompletion(suggestions, bslQuery.values, monaco.languages.CompletionItemKind.Enum);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -428,7 +428,6 @@ describe("Проверка автокомлита и подсказок реда
|
||||
ИЗ
|
||||
Справочник.Товары.`);
|
||||
let suggestions = bsl.getQueryCompletion();
|
||||
console.log(suggestions);
|
||||
expect(suggestions).to.be.an('object');
|
||||
expect(suggestions.suggestions).to.be.an('array').that.not.is.empty;
|
||||
assert.equal(suggestions.suggestions.some(suggest => suggest.label === "ДополнительныеРеквизиты"), true);
|
||||
@ -446,6 +445,36 @@ describe("Проверка автокомлита и подсказок реда
|
||||
assert.equal(suggestions.some(suggest => suggest.label === "ИмяРеквизита"), true);
|
||||
});
|
||||
|
||||
it("проверка подсказки для функции ВЫРАЗИТЬ", function () {
|
||||
|
||||
bsl = helper("ВЫРАЗИТЬ(");
|
||||
let suggestions = bsl.getQueryCompletion();
|
||||
expect(suggestions).to.be.an('array').that.is.empty;
|
||||
|
||||
bsl = helper("ВЫРАЗИТЬ(Товары.Код ");
|
||||
suggestions = bsl.getQueryCompletion();
|
||||
console.log(suggestions);
|
||||
expect(suggestions).to.be.an('object');
|
||||
expect(suggestions.suggestions).to.be.an('array').that.is.not.empty;
|
||||
assert.equal(suggestions.suggestions.some(suggest => suggest.label === "КАК "), true);
|
||||
|
||||
bsl = helper("ВЫРАЗИТЬ(Товары.Код КАК ");
|
||||
suggestions = bsl.getQueryCompletion();
|
||||
console.log(suggestions);
|
||||
expect(suggestions).to.be.an('object');
|
||||
expect(suggestions.suggestions).to.be.an('array').that.is.not.empty;
|
||||
assert.equal(suggestions.suggestions.some(suggest => suggest.label === "Строка"), true);
|
||||
assert.equal(suggestions.suggestions.some(suggest => suggest.label === "Справочник"), true);
|
||||
|
||||
bsl = helper("ВЫРАЗИТЬ(Товары.Код КАК Справочник.");
|
||||
suggestions = bsl.getQueryCompletion();
|
||||
console.log(suggestions);
|
||||
expect(suggestions).to.be.an('object');
|
||||
expect(suggestions.suggestions).to.be.an('array').that.is.not.empty;
|
||||
assert.equal(suggestions.suggestions.some(suggest => suggest.label === "Товары"), true);
|
||||
|
||||
});
|
||||
|
||||
setLanguageMode('bsl_query');
|
||||
|
||||
mocha.run();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user