feat: Optimize editor IntelliSense order

JerryFan626 · JerryFan626 · commit 832e5e9f47d1 · 2023-10-13T10:26:24.000+08:00
diff --git a/chat2db-client/src/utils/IntelliSense/field.ts b/chat2db-client/src/utils/IntelliSense/field.ts
@@ -31,6 +31,19 @@ const addIntelliSenseField = async (props: {
   }
 };
 
+function checkFieldContext(text) {
+  const normalizedText = text.trim().toUpperCase();
+  const columnKeywords = ['SELECT', 'WHERE', 'AND', 'OR', 'GROUP BY', 'ORDER BY', 'SET'];
+
+  for (const keyword of columnKeywords) {
+    if (normalizedText.endsWith(keyword)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseName, schemaName) => {
   intelliSenseField.dispose();
   fieldList = {};
@@ -47,6 +60,8 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
         endColumn: position.column,
       });
 
+      const isFieldContext = checkFieldContext(textUntilPosition);
+
       const match = textUntilPosition.match(/(\b\w+\b)[^\w]*$/);
       let word;
       if (match) {
@@ -77,11 +92,11 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
           },
           kind: monaco.languages.CompletionItemKind.Field,
           insertText: fieldObj.name,
+          sortText: (isFieldContext ? '01' : '02') + fieldObj.name,
         }));
 
         return [...acc, ...arr];
       }, []);
-      console.log('field suggestions', suggestions);
 
       return {
         suggestions,
diff --git a/chat2db-client/src/utils/IntelliSense/table.ts b/chat2db-client/src/utils/IntelliSense/table.ts
@@ -11,17 +11,36 @@ let intelliSenseTable = monaco.languages.registerCompletionItemProvider('sql', {
   },
 });
 
+/** 根据不同的数据库，插入不同的表名  */
+const handleInsertText = (text, databaseCode: DatabaseTypeCode = DatabaseTypeCode.MYSQL) => {
+  if (databaseCode === DatabaseTypeCode.POSTGRESQL) {
+    return `${text}`;
+  } else {
+    return `${text}`;
+  }
+};
+
+function checkTableContext(text) {
+  const normalizedText = text.trim().toUpperCase();
+  const tableKeywords = ['FROM', 'JOIN', 'INNER JOIN', 'LEFT JOIN', 'RIGHT JOIN', 'UPDATE'];
+
+  for (const keyword of tableKeywords) {
+    if (normalizedText.endsWith(keyword)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 const registerIntelliSenseTable = (
   tableList: Array<{ name: string; comment: string }>,
   databaseCode?: DatabaseTypeCode,
   dataSourceId?: number,
   databaseName?: string,
   schemaName?: string,
 ) => {
-  monaco.editor.registerCommand('myCustomCommand', (_: any, ...args: any[]) => {
-    // access the arguments here
-    console.log('trigger suggest', args[0]);
-    // addIntelliSenseField(tableName)
+  monaco.editor.registerCommand('addFieldList', (_: any, ...args: any[]) => {
     addIntelliSenseField(args[0]);
     return;
   });
@@ -30,13 +49,15 @@ const registerIntelliSenseTable = (
   intelliSenseTable = monaco.languages.registerCompletionItemProvider('sql', {
     triggerCharacters: [' '],
     provideCompletionItems: (model, position) => {
-      const handleInsertText = (text) => {
-        if (databaseCode === DatabaseTypeCode.POSTGRESQL) {
-          return `${text}`;
-        } else {
-          return `${text}`;
-        }
-      };
+      const lineContentUntilPosition = model.getValueInRange({
+        startLineNumber: position.lineNumber,
+        startColumn: 1,
+        endLineNumber: position.lineNumber,
+        endColumn: position.column,
+      });
+
+      const isTableContext = checkTableContext(lineContentUntilPosition);
+
       return {
         suggestions: (tableList || []).map((tableName) => {
           return {
@@ -46,12 +67,13 @@ const registerIntelliSenseTable = (
               description: '表名',
             },
             kind: monaco.languages.CompletionItemKind.Variable,
-            insertText: handleInsertText(tableName.name),
+            insertText: handleInsertText(tableName.name, databaseCode),
             // range: monaco.Range.fromPositions(position),
             documentation: tableName.comment,
+            sortText: (isTableContext ? '01' : '02') + tableName.name,
             command: {
-              id: 'myCustomCommand',
-              title: 'operator_additional_suggestions',
+              id: 'addFieldList',
+              title: 'addFieldList',
               arguments: [
                 {
                   tableName: tableName.name,
diff --git a/chat2db-client/yarn.lock b/chat2db-client/yarn.lock
