chore: 修改 open 命令调用

Author: guqiankun.gqk

packages/integrations/src/sql/index.tsx

@@ -79,12 +79,13 @@ const App = () => {
     editor?.monacoEditor.trigger('editor', 'type', { text: '\n' });
   }
 
-  function openFile() {
+  async function openFile() {
     /** COMMAND alex.sql.open
      *  @param {string} uri - 文件uri
      *  @param {string} content - 文件内容 无内容时创建并注入默认内容
      */
-    SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test1.sql', '默认内容');
+    const result = await SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test1.sql', '默认内容');
+    console.log('open',result);
   }
 
   async function editor() {
@@ -123,7 +124,7 @@ const App = () => {
     setCurrent(e.key);
     // 每次切换tab 打开对应的文件
     if(e.key === '1') {
-      SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri1/test.sql', '');
+     SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri1/test.sql', '');
     }else {
       SQLPlugin.api.commands?.executeCommand('alex.sql.open', 'test_uri3/test.sql');
     }
@@ -248,10 +249,9 @@ const App = () => {
   return (
     <div style={{ height: '100%', overflow: 'scroll' }}>
       <div style={{ height: '300px' }}>
-        <div style={{ margin: '20px' }} onContextMenu={()=>{console.log('ContextMenu')}} onClick={()=>console.log('click')}>
           <Button onClick={() => format()}>格式化</Button>
           <Button onClick={() => addLine()}>添加行</Button>
-          <Button onClick={() => openFile()}>打开文件</Button>
+          <Button onClick={async() => await openFile()}>打开文件</Button>
           <Button onClick={() => editor()}>获取当前内容</Button>
           <Button onClick={() => initMonaco()}>原生编辑器</Button>
 
@@ -270,186 +270,6 @@ const App = () => {
               <SQLRender  id={current} visible={current === '2'} />
           </div>
         </div>
-
-        {/* <AppRenderer2
-          onLoad={(app) => {
-            window.app = app;
-          }}
-          appConfig={{
-            plugins: [SQLPlugin],
-            modules: [
-              SqlServiceModule.Config({
-                onValidation: (ast: any, markers: any) => {
-                  // console.log(ast, markers);
-                  // const filterMarkers = markers.filter((item, index) => {
-                  //   if (item.message == 'SEMICOLON expected.') {
-                  //     const markerText = editorIns.current.editor.getModel().getValueInRange({
-                  //       startLineNumber: item.startLineNumber,
-                  //       startColumn: item.startColumn,
-                  //       endLineNumber: item.endLineNumber,
-                  //       endColumn: item.endColumn,
-                  //     });
-                  //     if (!['by', 'from'].includes(markerText)) {
-                  //       return true;
-                  //     }
-                  //   }
-                  // });
-                  return markers;
-                },
-                // onWokerLoad: ({language, loadTime}) => {
-                //   // worker 加载完成
-                //   console.log(language, loadTime);
-                // },
-                lowerCaseComplete: true,
-                marks: [
-                  {
-                    message: '测试效果',
-                    startRow: 1,
-                    startCol: 1,
-                  },
-                ],
-                formatRules: [
-                  // @ts-ignore
-                  {
-                    // regex: /\w/g,
-                    // value: 'select',
-                  },
-                ],
-                onSuggestTables: (keyword, options) => {
-                  console.log('suggest', keyword, options, suggestTables.current);
-                  return suggestTables.current;
-                },
-                onSuggestFields: (prefix, options) => {
-                  console.log('files', prefix, options);
-
-                  return Promise.resolve([
-                    {
-                      label: 'age',
-                      type: 'SAMPLE_TYPE_ONE',
-                      insertText: 'age',
-                      kind: CompletionItemKind.Field,
-                      sortText: 'b',
-                    },
-                    {
-                      label: 'banana',
-                      type: 'SAMPLE_TYPE_ONE',
-                      insertText: 'banana',
-                      kind: CompletionItemKind.Field,
-                      sortText: 'b',
-                    },
-                    {
-                      label: 'sample_one_table1',
-                      type: 'SAMPLE_TYPE_ONE',
-                      insertText: 'id_test',
-                      kind: CompletionItemKind.Field,
-                      sortText: 'b',
-                    },
-                  ]);
-                },
-                options: {
-                  language: supportLanguage.ODPSSQL,
-                  disableAsyncItemCache: true,
-                },
-                sorter: (type) => {
-                  switch (type) {
-                    case 'TABLEALIAS':
-                    case 'TABLE':
-                      return 'c';
-                    case 'FIELD':
-                    case 'FIELDALIAS':
-                      return 'd';
-                    case 'KEYWORD':
-                    case 'CONSTS':
-                      return 'e';
-                    case 'FUNCTION':
-                      return 'f';
-                    default:
-                      return 'g';
-                  }
-                },
-                onChange: (data) => {
-                  // console.log('change',data);
-                },
-                completionTypes: {
-                  KEYWORD: {
-                    text: '关键词',
-                    kind: CompletionItemKind.Keyword,
-                  },
-                  CONSTS: {
-                    text: '常量',
-                    kind: CompletionItemKind.Snippet,
-                  },
-                  FUNCTION: {
-                    text: '函数',
-                    kind: CompletionItemKind.Function,
-                  },
-                  TABLE: {
-                    text: '表名',
-                    kind: CompletionItemKind.Method,
-                  },
-                  TABLEALIAS: {
-                    text: '表别名',
-                    kind: CompletionItemKind.Method,
-                  },
-                  SNIPPET: {
-                    text: '代码块',
-                    kind: CompletionItemKind.Snippet,
-                  },
-                  FIELD: {
-                    text: '表字段',
-                    kind: CompletionItemKind.Field,
-                  },
-                  FIELDALIAS: {
-                    text: '表字段别名',
-                    kind: CompletionItemKind.Field,
-                  },
-                },
-              }),
-            ],
-            extensionMetadata: [odcTheme],
-            workspaceDir: `sql-service`,
-            layoutConfig,
-            defaultPreferences: {
-              'general.theme': 'odc-light',
-              'application.confirmExit': 'never',
-              'editor.autoSave': 'afterDelay',
-              'editor.guides.bracketPairs': false,
-              'editor.minimap': false,
-              'editor.autoSaveDelay': 1000,
-              'editor.fixedOverflowWidgets': true, // widget editor 默认改为 fixed
-              'files.encoding': 'utf8', // 默认编码
-              'editor.fontSize': 12,
-            },
-          }}
-          runtimeConfig={{
-            biz: 'sql-service',
-            // hideEditorTab: true,
-            scenario: 'ALEX_TEST',
-            defaultOpenFile: 'test.sql',
-            hideBreadcrumb: true,
-            hideLeftTabBar: true,
-            registerKeybindings: [
-              {
-                command: '',
-                keybinding: 'f8',
-              },
-            ],
-            workspace: {
-              filesystem: {
-                fs: 'FileIndexSystem',
-                options: {
-                  // 初始全量文件索引
-                  requestFileIndex() {
-                    return Promise.resolve({
-                      'test.sql': 'select * from',
-                    });
-                  },
-                },
-              },
-            },
-          }}
-        /> */}
-      </div>
       <div style={{ height: '300px', margin: '20px', border: '2px soldi' }} id="monaco">
 
         </div>

packages/sql-service/src/contribution/sql-keybind.contribution.ts

@@ -61,17 +61,19 @@ export class SQLKeybindContribution
       execute: (filepath: string, defaultContent?: string) => {
         const { workspaceDir } = this.appConfig;
         const uri = URI.file(path.join(workspaceDir, filepath));
-        this.fileService.access(uri.toString()).then((res) => {
+        return this.fileService.access(uri.toString()).then((res) => {
           if (!res) {
-            this.fileService
+            return this.fileService
               .createFile(uri.toString(), {
                 content: defaultContent,
               })
               .then(() => {
-                this.workbenchEditorService.open(uri);
-              });
+                return this.workbenchEditorService.open(uri);
+              }).catch(err=> {
+                return false
+              })
           } else {
-            this.workbenchEditorService.open(uri);
+            return this.workbenchEditorService.open(uri);
           }
         });
       },
@@ -105,5 +107,6 @@ export class SQLKeybindContribution
     // menus.unregisterMenuItem(MenuId.EditorContext, 'EditorContextPeek');
     // menus.unregisterMenuItem(MenuId.EditorContext, EDITOR_COMMANDS.FORMAT_DOCUMENT_WITH.id);
     // menus.unregisterMenuItem(MenuId.EditorContext, 'editor.action.changeAll');
+    menus.unregisterMenuId(MenuId.EditorContext)
   }
 }

packages/sql-service/src/sql-generics/completion-adapter.ts

@@ -306,7 +306,7 @@ class CompletionAdapter implements monaco.languages.CompletionItemProvider {
             this.options.customizeFieldSuggest(false);
             return;
           }
-
+          // console.log('===> info' , info)
           // 是否配置了跳过性能分析上报
           const skipCompletionReport = _get(this.options, 'options.skipReport', false);
           if (!skipCompletionReport) {

packages/sql-service/src/worker/OBWorker.ts

@@ -5,17 +5,17 @@ import { initialize } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.wo
 import { TableAuthResponse } from '../tools/validationRules/TableAuth';
 
 import * as ls from 'vscode-languageserver-types';
-import _find from 'lodash/find';
-import _filter from 'lodash/filter';
-import _flatten from 'lodash/flatten';
-import _isEmpty from 'lodash/isEmpty';
-import _union from 'lodash/union';
-import _uniq from 'lodash/uniq';
-import _get from 'lodash/get';
-import _orderByget from 'lodash/orderBy';
-import _flattenDeep from 'lodash/flattenDeep';
-import _findLast from 'lodash/findLast';
-import _orderBy from 'lodash/orderBy';
+// import _find from 'lodash/find';
+// import _filter from 'lodash/filter';
+// import _flatten from 'lodash/flatten';
+// import _isEmpty from 'lodash/isEmpty';
+// import _union from 'lodash/union';
+// import _uniq from 'lodash/uniq';
+// import _get from 'lodash/get';
+// import _orderByget from 'lodash/orderBy';
+// import _flattenDeep from 'lodash/flattenDeep';
+// import _findLast from 'lodash/findLast';
+// import _orderBy from 'lodash/orderBy';
 import { validateGroupBy, validateSelectAll, validateTableAuth } from '../tools/validationRules';
 import { functionTypeTextMap } from '../sql-functions/odps/definitions';
 import { InputStream, CommonTokenStream } from 'antlr4';
@@ -87,6 +87,10 @@ class OBWorker {
     console.log(tokens, parser);
 
 
+    console.log('lexer ==> ',Lexer)
+    console.log('tokens ==> ',tokens)
+    console.log('parser ==> ',parser)
+
   }