feat: add autoNext param

HSunboy · HSunboy · commit ef0ec9ce167c · 2025-12-23T14:26:51.000+08:00
diff --git a/packages/monaco-plugin-ob/example/src/components/App/index.tsx b/packages/monaco-plugin-ob/example/src/components/App/index.tsx
@@ -64,37 +64,23 @@ export default function () {
             editor.current = monaco.editor.create(dom.current, {
                 language: 'obmysql',
                 theme: theme,
-                wordBasedSuggestions: false
+                wordBasedSuggestions: false,
+                inlineSuggest: {
+                    mode: "prefix",
+                    enabled: true,
+                    suppressSuggestions: false
+                }
             });
             const model = editor.current.getModel()?.id;
             if (model) {
                 plugin.setModelOptions(model, {
                     delimiter: ';',
-                    // llm: {
-                    //     async completions(input: string, pos: number) {
-                    //         // input 的 pos 位置增加一个光标
-                    //         const cursor = input.slice(0, pos) + '|' + input.slice(pos);
-                    //         const res = await fetch('http://localhost/v1/workflows/run', {
-                    //             method: 'POST',
-                    //             headers: {
-                    //                 "Authorization": `Bearer app-XyQfvJ9VFtm58VLquEMNHUmO`,
-                    //                 "Content-Type": 'application/json'
-                    //             },
-                    //             body: JSON.stringify({
-                    //                 user: 'shankar',
-                    //                 response_mode: "blocking",
-                    //                 inputs: {
-                    //                     sql: cursor,
-                    //                     currentDatabase: 'dbgpt'
-                    //                 }
-                    //             })
-                    //         })
-                    //         const data = await res.json();
-                    //         const sql = data.data?.outputs?.sql || '';
-                    //         console.log(sql);
-                    //         return sql;
-                    //     }
-                    // },
+                    llm: {
+                        async completions(input: string, pos: number) {
+                            // input 的 pos 位置增加一个光标
+                            return 'select112233'
+                        }
+                    },
                     async getSnippets() {
                         return [
                             {
diff --git a/packages/monaco-plugin-ob/package.json b/packages/monaco-plugin-ob/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase-odc/monaco-plugin-ob",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
diff --git a/packages/monaco-plugin-ob/src/autoComplete/completionItem.ts b/packages/monaco-plugin-ob/src/autoComplete/completionItem.ts
@@ -12,13 +12,13 @@ export enum CompletionItemSort{
     Snippet = '52'
 }
 
-export function keywordItem(keyword: string, range: monaco.languages.CompletionItemRanges | monaco.IRange): monaco.languages.CompletionItem {
+export function keywordItem(keyword: string, range: monaco.languages.CompletionItemRanges | monaco.IRange, autoNext: boolean): monaco.languages.CompletionItem {
     return {
         label: keyword,
         range,
         insertText: keyword + ' ',
         kind: monaco.languages.CompletionItemKind.Keyword,
-        command: {id: 'editor.action.triggerSuggest', title: "" },
+        command: autoNext ? {id: 'editor.action.triggerSuggest', title: "" } : undefined,
         sortText: keyword === "*" ? CompletionItemSort.Star :  CompletionItemSort.Keyword
     }
 }
diff --git a/packages/monaco-plugin-ob/src/inlineCompletion/index.ts b/packages/monaco-plugin-ob/src/inlineCompletion/index.ts
@@ -23,6 +23,7 @@ class MonacoInlineComplete implements monaco.languages.InlineCompletionsProvider
         this.modelVersion[modelId] = version;
         const currentToken = model.getWordAtPosition(position)
         const plugin = this.getModelOptions(modelId);
+        
         if (!plugin?.llm?.completions) {
             return;
         }
@@ -48,13 +49,18 @@ class MonacoInlineComplete implements monaco.languages.InlineCompletionsProvider
                 })
                 return;
             }
-            
+            /**
+             * 当前行头到光标的内容
+             */
             const start = model.getValueInRange({
                 startLineNumber: position.lineNumber,
                 startColumn: 0,
                 endLineNumber: position.lineNumber,
                 endColumn: position.column
             });
+            /**
+             * 当前行光标到行尾的内容
+             */
             const end = model.getValueInRange({
                 startLineNumber: position.lineNumber,
                 startColumn: position.column,
diff --git a/packages/monaco-plugin-ob/src/mysql/autoComplete/index.ts b/packages/monaco-plugin-ob/src/mysql/autoComplete/index.ts
@@ -91,7 +91,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {
                     onlyKeywords = false;
                 }
                 if (typeof item === 'string') {
-                    suggestions.push(keywordItem(item, range))
+                    suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))
                 } else if (item.type === 'allTables') {
                     suggestions = suggestions.concat(await this.getTableList(model, item.schema, range))
                 } else if (item.type === 'tableColumns') {
diff --git a/packages/monaco-plugin-ob/src/obmysql/autoComplete/index.ts b/packages/monaco-plugin-ob/src/obmysql/autoComplete/index.ts
@@ -90,7 +90,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {
                     onlyKeywords = false;
                 }
                 if (typeof item === 'string') {
-                    suggestions.push(keywordItem(item, range))
+                    suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))
                 } else if (item.type === 'allTables') {
                     suggestions = suggestions.concat(await this.getTableList(model, item.schema, range))
                 } else if (item.type === 'tableColumns') {
@@ -121,7 +121,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {
                 }
             }
             if (onlyKeywords) {
-                suggestions.push(keywordItem("RETURN", range));
+                suggestions.push(keywordItem("RETURN", range, this.getModelOptions(model.id)?.autoNext ?? true));
                 suggestions = suggestions.concat(
                     await this.getSnippets(model, range)
                 )
diff --git a/packages/monaco-plugin-ob/src/oboracle/autoComplete/index.ts b/packages/monaco-plugin-ob/src/oboracle/autoComplete/index.ts
@@ -96,7 +96,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {
                     onlyKeywords = false;
                 }
                 if (typeof item === 'string') {
-                    suggestions.push(keywordItem(item, range))
+                    suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))
                 } else if (item.type === 'allTables') {
                     suggestions = suggestions.concat(await this.getTableList(model, item.schema, range));
                     if (!item.schema && !item.disableSys) {
diff --git a/packages/monaco-plugin-ob/src/type.ts b/packages/monaco-plugin-ob/src/type.ts
@@ -28,6 +28,10 @@ export declare type IFunctionParam = IFunctionParamRich | string;
 
 export interface IModelOptions {
     delimiter: string;
+    /**
+     * 自动提示下一个token,默认为true
+     */
+    autoNext?: boolean;
     getTableList?: (schema?: string) => Promise<string[]>;
     getSchemaList?: () => Promise<string[]>;
     getViewList?: (schema?: string) => Promise<string[]>;
diff --git a/packages/ob-parser-js/package.json b/packages/ob-parser-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase-odc/ob-parser-js",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "OB 前端解析工具库",
   "main": "./lib/index.js",
   "module": "./esm/index.js",
diff --git a/packages/ob-parser-js/src/parser/obmysql/PLLexer.js b/packages/ob-parser-js/src/parser/obmysql/PLLexer.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // Generated from PLLexer.g4 by ANTLR 4.8
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
diff --git a/packages/ob-parser-js/src/parser/obmysql/PLParser.js b/packages/ob-parser-js/src/parser/obmysql/PLParser.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // Generated from PLParser.g4 by ANTLR 4.8
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
diff --git a/packages/ob-parser-js/src/parser/obmysql/obmysql.js b/packages/ob-parser-js/src/parser/obmysql/obmysql.js
@@ -1,4 +1,4 @@
-
+// @ts-nocheck
 /* parser generated by jison 0.6.1-215 */
 
 /*
diff --git a/packages/ob-parser-js/src/parser/oracle/PlSqlLexer.js b/packages/ob-parser-js/src/parser/oracle/PlSqlLexer.js
@@ -1,3 +1,4 @@
+// @ts-nocheck
 // Generated from PlSqlLexer.g4 by ANTLR 4.8
 // jshint ignore: start
 var antlr4 = require('antlr4/index');
diff --git a/packages/ob-parser-js/src/parser/oracle/oraclePL.js b/packages/ob-parser-js/src/parser/oracle/oraclePL.js
@@ -1,4 +1,4 @@
-
+// @ts-nocheck
 /* parser generated by jison 0.6.1-215 */
 
 /*
diff --git a/packages/ob-parser-js/src/parser/oracle/oracleSQL_ori.js b/packages/ob-parser-js/src/parser/oracle/oracleSQL_ori.js
@@ -1,4 +1,4 @@
-
+// @ts-nocheck
 /* parser generated by jison 0.6.1-215 */
 
 /*
diff --git a/packages/ob-parser-js/test/t.js b/packages/ob-parser-js/test/t.js
diff --git a/packages/ob-parser-js/tsconfig.json b/packages/ob-parser-js/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@oceanbase-odc/monaco-plugin-ob",`
`3`		`- "version": "1.6.4",`
	`3`	`+ "version": "1.6.5",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,13 @@ export enum CompletionItemSort{`
`12`	`12`	`Snippet = '52'`
`13`	`13`	`}`
`14`	`14`
`15`		`-export function keywordItem(keyword: string, range: monaco.languages.CompletionItemRanges \| monaco.IRange): monaco.languages.CompletionItem {`
	`15`	`+export function keywordItem(keyword: string, range: monaco.languages.CompletionItemRanges \| monaco.IRange, autoNext: boolean): monaco.languages.CompletionItem {`
`16`	`16`	`return {`
`17`	`17`	`label: keyword,`
`18`	`18`	`range,`
`19`	`19`	`insertText: keyword + ' ',`
`20`	`20`	`kind: monaco.languages.CompletionItemKind.Keyword,`
`21`		`- command: {id: 'editor.action.triggerSuggest', title: "" },`
	`21`	`+ command: autoNext ? {id: 'editor.action.triggerSuggest', title: "" } : undefined,`
`22`	`22`	`sortText: keyword === "*" ? CompletionItemSort.Star : CompletionItemSort.Keyword`
`23`	`23`	`}`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {`
`91`	`91`	`onlyKeywords = false;`
`92`	`92`	`}`
`93`	`93`	`if (typeof item === 'string') {`
`94`		`- suggestions.push(keywordItem(item, range))`
	`94`	`+ suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))`
`95`	`95`	`} else if (item.type === 'allTables') {`
`96`	`96`	`suggestions = suggestions.concat(await this.getTableList(model, item.schema, range))`
`97`	`97`	`} else if (item.type === 'tableColumns') {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {`
`90`	`90`	`onlyKeywords = false;`
`91`	`91`	`}`
`92`	`92`	`if (typeof item === 'string') {`
`93`		`- suggestions.push(keywordItem(item, range))`
	`93`	`+ suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))`
`94`	`94`	`} else if (item.type === 'allTables') {`
`95`	`95`	`suggestions = suggestions.concat(await this.getTableList(model, item.schema, range))`
`96`	`96`	`} else if (item.type === 'tableColumns') {`
`@@ -121,7 +121,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`	`if (onlyKeywords) {`
`124`		`- suggestions.push(keywordItem("RETURN", range));`
	`124`	`+ suggestions.push(keywordItem("RETURN", range, this.getModelOptions(model.id)?.autoNext ?? true));`
`125`	`125`	`suggestions = suggestions.concat(`
`126`	`126`	`await this.getSnippets(model, range)`
`127`	`127`	`)`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class MonacoAutoComplete implements monaco.languages.CompletionItemProvider {`
`96`	`96`	`onlyKeywords = false;`
`97`	`97`	`}`
`98`	`98`	`if (typeof item === 'string') {`
`99`		`- suggestions.push(keywordItem(item, range))`
	`99`	`+ suggestions.push(keywordItem(item, range, this.getModelOptions(model.id)?.autoNext ?? true))`
`100`	`100`	`} else if (item.type === 'allTables') {`
`101`	`101`	`suggestions = suggestions.concat(await this.getTableList(model, item.schema, range));`
`102`	`102`	`if (!item.schema && !item.disableSys) {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@oceanbase-odc/ob-parser-js",`
`3`		`- "version": "3.2.1",`
	`3`	`+ "version": "3.2.2",`
`4`	`4`	`"description": "OB 前端解析工具库",`
`5`	`5`	`"main": "./lib/index.js",`
`6`	`6`	`"module": "./esm/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// @ts-nocheck`
`1`	`2`	`// Generated from PLLexer.g4 by ANTLR 4.8`
`2`	`3`	`// jshint ignore: start`
`3`	`4`	`var antlr4 = require('antlr4/index');`