fix(Queries): chyt spyt path autocomplete [YTFRONT-4368]

ytsaurus · Sep 24, 2024 · df3cff1 · df3cff1
1 parent 7347349
commit df3cff1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/packages/ui/src/ui/libs/monaco-yql-languages/helpers/createProvideSuggestionsFunction.ts b/packages/ui/src/ui/libs/monaco-yql-languages/helpers/createProvideSuggestionsFunction.ts
@@ -26,15 +26,12 @@ export const createProvideSuggestionsFunction =
         });
 
         const range = getRangeToInsertSuggestion(model, monacoCursorPosition);
-        let pathSuggestions: languages.CompletionItem[] = [];
-        if ('suggestEntity' in parseResult && parseResult.suggestEntity?.includes('table')) {
-            pathSuggestions = await getDirectoryContent({
-                model,
-                monacoCursorPosition,
-                engine,
-                range,
-            });
-        }
+        const pathSuggestions = await getDirectoryContent({
+            model,
+            monacoCursorPosition,
+            engine,
+            range,
+        });
 
         const additionalSuggestion = additionalSuggestions
             ? additionalSuggestions(range, parseResult)

diff --git a/packages/ui/src/ui/libs/monaco-yql-languages/helpers/getPathFromMonacoModel.ts b/packages/ui/src/ui/libs/monaco-yql-languages/helpers/getPathFromMonacoModel.ts
@@ -16,17 +16,10 @@ export const getPathFromMonacoModel = (
     const useArray = model.getValue().match(/(USE|use)\s\w+/g);
     const useClusterName = useArray ? useArray.pop()?.replace(/(USE|use)\s/, '') : null;
 
-    let path: RegExpMatchArray | null = null;
-    if (engine === QueryEngine.SPYT) {
-        path = editedPart.match(/\/\/(.*)[^`]/);
-    } else {
-        path = editedPart.match(/\/\/[^`]+/g);
-    }
-
+    const path = editedPart.match(/\/\/[^`]+/g);
     let cluster = clusterName || useClusterName;
 
-    if (!cluster) {
-        // get cluster from select
+    if (!cluster || engine === QueryEngine.SPYT) {
         const state = getWindowStore().getState();
         cluster = state.queryTracker.query?.draft.settings?.cluster;
     }

diff --git a/packages/ui/src/ui/libs/monaco-yql-languages/s-expressions/s-expressions.ts b/packages/ui/src/ui/libs/monaco-yql-languages/s-expressions/s-expressions.ts
@@ -104,7 +104,7 @@ export const language: languages.IMonarchLanguage & Record<string, unknown> = {
             {include: '@complexDataTypes'},
             [/[;,.]/, TokenClassConsts.DELIMITER],
             [/[(){}[\]]/, '@brackets'],
-            [/yt\.`(.*)`/, 'path'],
+            [/yt\.`(\/\/.*)`/g, {token: 'path'}],
             [
                 /[\w@#$]+/,
                 {