feat: Optimize the sort of intelligent completion of keyword and function

JerryFan626 · JerryFan626 · commit f7e30cffbdfa · 2023-10-13T11:14:00.000+08:00
diff --git a/chat2db-client/src/utils/IntelliSense/field.ts b/chat2db-client/src/utils/IntelliSense/field.ts
@@ -89,7 +89,7 @@ const registerIntelliSenseField = (tableList: string[], dataSourceId, databaseNa
           },
           kind: monaco.languages.CompletionItemKind.Field,
           insertText: fieldObj.name,
-          sortText: (isFieldContext ? '01' : '02') + fieldObj.name,
+          sortText: isFieldContext ? '01' : '08',
         }));
 
         return [...acc, ...arr];
diff --git a/chat2db-client/src/utils/IntelliSense/keyword.ts b/chat2db-client/src/utils/IntelliSense/keyword.ts
@@ -12,6 +12,7 @@ const getSQLKeywords = (keywords: string[]) => {
     },
     kind: monaco.languages.CompletionItemKind.Text,
     insertText: key,
+    sortText: '08',
   }));
 };
 
@@ -22,6 +23,7 @@ const getSQLFunctions = (functions: string[]) => {
       label: key,
       detail: '',
       description: '函数',
+      sortText: '09',
     },
     kind: monaco.languages.CompletionItemKind.Method,
     insertText: key,
diff --git a/chat2db-client/src/utils/IntelliSense/table.ts b/chat2db-client/src/utils/IntelliSense/table.ts
@@ -14,15 +14,12 @@ let intelliSenseTable = monaco.languages.registerCompletionItemProvider('sql', {
 /** 根据不同的数据库，插入不同的表名  */
 const handleInsertText = (text, databaseCode: DatabaseTypeCode = DatabaseTypeCode.MYSQL) => {
   if (
-    [
-      DatabaseTypeCode.POSTGRESQL,
-      DatabaseTypeCode.ORACLE,
-      DatabaseTypeCode.DB2,
-      DatabaseTypeCode.SQLITE,
-    ].includes(databaseCode)
+    [DatabaseTypeCode.POSTGRESQL, DatabaseTypeCode.ORACLE, DatabaseTypeCode.DB2, DatabaseTypeCode.SQLITE].includes(
+      databaseCode,
+    )
   ) {
     return `\"${text}\"`;
-  } else if([DatabaseTypeCode.SQLSERVER].includes(databaseCode)){
+  } else if ([DatabaseTypeCode.SQLSERVER].includes(databaseCode)) {
     return `[${text}]`;
   } else if ([DatabaseTypeCode.MYSQL].includes(databaseCode)) {
     return `\`${text}\``;
@@ -81,7 +78,7 @@ const registerIntelliSenseTable = (
             insertText: handleInsertText(tableName.name, databaseCode),
             // range: monaco.Range.fromPositions(position),
             // documentation: tableName.comment,
-            sortText: (isTableContext ? '01' : '02') + tableName.name,
+            sortText: isTableContext ? '01' : '08',
             command: {
               id: 'addFieldList',
               title: 'addFieldList',
