monaco-yql-languages 1.4.0 → 1.6.0

package/build/completion.d.ts

@@ -2,8 +2,15 @@ import type { CancellationToken, Position, editor, languages } from './fillers/m
 export type CompletionListProvider = {
     (content: string, offset: number, signal?: AbortSignal | null): Promise<string[]>;
 };
+type YqlCompletionType = 'Keyword' | 'PragmaName' | 'TypeName' | 'FunctionName' | 'HintName' | 'FolderName' | 'TableName' | 'ClusterName' | 'BindingName' | 'UnknownName';
+export type CompletionData = string | {
+    type: YqlCompletionType;
+    text: string;
+    shift?: number;
+};
 export declare function provideCompletionItems(getCompletionList: CompletionListProvider, preserveOrder?: boolean): (model: editor.ITextModel, position: Position, context: languages.CompletionContext, token: CancellationToken) => languages.ProviderResult<languages.CompletionList>;
 export type CompletionLists = Partial<Record<`${Uncapitalize<keyof typeof languages.CompletionItemKind>}List`, Readonly<string[]>>>;
 export declare function getCompletionItemsProvider(completions: CompletionLists, completionItemKind: typeof languages.CompletionItemKind): {
     provideCompletionItems(model: editor.ITextModel, position: Position, _context: languages.CompletionContext, _token: CancellationToken): languages.CompletionList | undefined;
 };
+export {};

package/build/completion.js

@@ -1,5 +1,17 @@
 import { suggestionIndexToWeight } from './utils';
 const allUpperCaseRe = new RegExp('^[$A-Z_\\s]+$');
+const YqlCompletionTypeToMonacoKind = {
+    Keyword: 17,
+    PragmaName: 8,
+    TypeName: 24,
+    FunctionName: 1,
+    HintName: 18,
+    FolderName: 23,
+    TableName: 18,
+    ClusterName: 8,
+    BindingName: 4,
+    UnknownName: 18,
+};
 export function provideCompletionItems(getCompletionList, preserveOrder) {
     return (model, position, context, token) => {
         const controller = new AbortController();
@@ -19,7 +31,23 @@ export function provideCompletionItems(getCompletionList, preserveOrder) {
         }
         return getCompletionList(model.getValue(), model.getOffsetAt(position), signal).then(async (data) => {
             const suggestions = [];
-            for (const label of data) {
+            for (const item of data) {
+                let labelAsSnippet = '';
+                //languages.CompletionItemKind.Text
+                let kind = 18;
+                let label;
+                if (typeof item === 'object') {
+                    const { text, type, shift } = item;
+                    label = text;
+                    kind = YqlCompletionTypeToMonacoKind[type];
+                    if (shift) {
+                        const pos = text.length - shift;
+                        labelAsSnippet = text.slice(0, pos) + '$0' + text.slice(pos);
+                    }
+                }
+                else {
+                    label = item;
+                }
                 const suggest = label.length > 1
                     ? label.slice(0, -1).replace(/[/[]/g, '\\\\$&') + label.slice(-1)
                     : label;
@@ -41,8 +69,11 @@ export function provideCompletionItems(getCompletionList, preserveOrder) {
                 suggestions.push({
                     label,
                     filterText: allUpperCaseRe.test(label) ? label.toLowerCase() : label,
-                    kind: 18, // languages.CompletionItemKind.Text,
-                    insertText: suggest,
+                    kind,
+                    insertText: labelAsSnippet || suggest,
+                    //4 - languages.CompletionItemInsertTextRule.InsertAsSnippet
+                    //0 - languages.CompletionItemInsertTextRule.None
+                    insertTextRules: labelAsSnippet ? 4 : 0,
                     command: label.endsWith('/') || label.endsWith('.`') || label.endsWith('::')
                         ? { id: 'editor.action.triggerSuggest', title: '' }
                         : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-yql-languages",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "YQL languages for the Monaco Editor, based on monaco-languages.",
   "author": "YDB",
   "license": "MIT",