chore: upgrade opensumi to 2.20.2

hacke2 · guqiankun.gqk · commit 49b739b26981 · 2022-11-22T20:48:55.000+08:00
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "description": "Ant Codespaces for browser",
   "main": "index.js",
   "engines": {
-    "kaitian": "2.19.10"
+    "kaitian": "2.20.2"
   },
   "scripts": {
     "type-check": "tsc --skipLibCheck --noEmit",
diff --git a/packages/acr/src/modules/misc.contribution.ts b/packages/acr/src/modules/misc.contribution.ts
@@ -25,7 +25,6 @@ import {
   EditorGroupChangeEvent,
 } from '@opensumi/ide-editor/lib/browser';
 import { TOGGLE_DIFF_SIDE_BY_SIDE } from '@opensumi/ide-scm';
-import { QUICK_OPEN_COMMANDS } from '@opensumi/ide-quick-open';
 
 import { IMenuRegistry, MenuId, MenuContribution } from '@opensumi/ide-core-browser/lib/menu/next';
 import { fromDiffUri, fromGitUri } from './merge-request/changes-tree/util';
@@ -34,6 +33,7 @@ import { WorkspaceManagerService } from './workspace/workspace-loader.service';
 import { IAntcodeService } from './antcode-service/base';
 import { reportDiffEditorInlineMode } from '../utils/monitor';
 import { ACR_IS_HIGHLIGHT, ACR_IS_FULLSCREEN } from '../constant';
+import { QUICK_OPEN_COMMANDS } from '@alipay/alex/lib/modules/opensumi__ide-core-browser';
 
 class MiscCommands {
   static ExpandFie = {
diff --git a/packages/acr/src/overrides/comments-zone.view.tsx b/packages/acr/src/overrides/comments-zone.view.tsx
@@ -6,11 +6,12 @@ import { IEditor } from '@opensumi/ide-editor';
 
 export { CommentsZoneWidget };
 
-// 临时修复
+// TODO: 临时修复
 @Injectable({ multiple: true })
 export class CommentsZoneWidgetPatch extends CommentsZoneWidget {
   constructor(editor: IEditor, thread: ICommentsThread) {
     const { monacoEditor } = editor;
+    // @ts-ignore
     monacoEditor.onDidChangeConfiguration = Event.map(
       monacoEditor.onDidChangeConfiguration,
       (e) => {
diff --git a/packages/acr/src/overrides/empty-statusbar.service.ts b/packages/acr/src/overrides/empty-statusbar.service.ts
@@ -73,6 +73,12 @@ export class EmptyStatusBarService implements IStatusBarService {
       console.log('empty Method not implemented.');
     }
   }
+  getColor() {
+    if (process.env.NODE_ENV !== 'production') {
+      console.log('empty Method not implemented.');
+    }
+    return undefined;
+  }
   addElement(id: string, entry: StatusBarEntry): StatusBarEntryAccessor {
     if (process.env.NODE_ENV !== 'production') {
       console.log('empty Method not implemented.');
diff --git a/packages/alex/package.json b/packages/alex/package.json
@@ -30,47 +30,47 @@
     "registry": "https://registry.npm.alibaba-inc.com"
   },
   "dependencies": {
-    "@opensumi/ide-addons": "2.19.10",
-    "@opensumi/ide-comments": "2.19.10",
-    "@opensumi/ide-core-browser": "2.19.10",
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-debug": "2.19.10",
-    "@opensumi/ide-decoration": "2.19.10",
-    "@opensumi/ide-editor": "2.19.10",
-    "@opensumi/ide-explorer": "2.19.10",
-    "@opensumi/ide-express-file-server": "2.19.10",
-    "@opensumi/ide-extension-storage": "2.19.10",
-    "@opensumi/ide-file-scheme": "2.19.10",
-    "@opensumi/ide-file-service": "2.19.10",
-    "@opensumi/ide-file-tree-next": "2.19.10",
-    "@opensumi/ide-i18n": "2.19.10",
-    "@opensumi/ide-extension": "2.19.10",
-    "@opensumi/ide-keymaps": "2.19.10",
-    "@opensumi/ide-logs": "2.19.10",
-    "@opensumi/ide-main-layout": "2.19.10",
-    "@opensumi/ide-markdown": "2.19.10",
-    "@opensumi/ide-markers": "2.19.10",
-    "@opensumi/ide-menu-bar": "2.19.10",
-    "@opensumi/ide-monaco": "2.19.10",
-    "@opensumi/ide-monaco-enhance": "2.19.10",
-    "@opensumi/ide-opened-editor": "2.19.10",
-    "@opensumi/ide-outline": "2.19.10",
-    "@opensumi/ide-output": "2.19.10",
-    "@opensumi/ide-overlay": "2.19.10",
-    "@opensumi/ide-preferences": "2.19.10",
-    "@opensumi/ide-quick-open": "2.19.10",
-    "@opensumi/ide-scm": "2.19.10",
-    "@opensumi/ide-search": "2.19.10",
-    "@opensumi/ide-static-resource": "2.19.10",
-    "@opensumi/ide-status-bar": "2.19.10",
-    "@opensumi/ide-storage": "2.19.10",
-    "@opensumi/ide-theme": "2.19.10",
-    "@opensumi/ide-webview": "2.19.10",
-    "@opensumi/ide-workspace": "2.19.10",
-    "@opensumi/ide-workspace-edit": "2.19.10",
-    "@opensumi/ide-toolbar": "2.19.10",
-    "@opensumi/ide-testing": "2.19.10",
-    "@opensumi/ide-variable": "2.19.10",
+    "@opensumi/ide-addons": "2.20.2",
+    "@opensumi/ide-comments": "2.20.2",
+    "@opensumi/ide-core-browser": "2.20.2",
+    "@opensumi/ide-core-common": "2.20.2",
+    "@opensumi/ide-debug": "2.20.2",
+    "@opensumi/ide-decoration": "2.20.2",
+    "@opensumi/ide-editor": "2.20.2",
+    "@opensumi/ide-explorer": "2.20.2",
+    "@opensumi/ide-express-file-server": "2.20.2",
+    "@opensumi/ide-extension-storage": "2.20.2",
+    "@opensumi/ide-file-scheme": "2.20.2",
+    "@opensumi/ide-file-service": "2.20.2",
+    "@opensumi/ide-file-tree-next": "2.20.2",
+    "@opensumi/ide-i18n": "2.20.2",
+    "@opensumi/ide-extension": "2.20.2",
+    "@opensumi/ide-keymaps": "2.20.2",
+    "@opensumi/ide-logs": "2.20.2",
+    "@opensumi/ide-main-layout": "2.20.2",
+    "@opensumi/ide-markdown": "2.20.2",
+    "@opensumi/ide-markers": "2.20.2",
+    "@opensumi/ide-menu-bar": "2.20.2",
+    "@opensumi/ide-monaco": "2.20.2",
+    "@opensumi/ide-monaco-enhance": "2.20.2",
+    "@opensumi/ide-opened-editor": "2.20.2",
+    "@opensumi/ide-outline": "2.20.2",
+    "@opensumi/ide-output": "2.20.2",
+    "@opensumi/ide-overlay": "2.20.2",
+    "@opensumi/ide-preferences": "2.20.2",
+    "@opensumi/ide-quick-open": "2.20.2",
+    "@opensumi/ide-scm": "2.20.2",
+    "@opensumi/ide-search": "2.20.2",
+    "@opensumi/ide-static-resource": "2.20.2",
+    "@opensumi/ide-status-bar": "2.20.2",
+    "@opensumi/ide-storage": "2.20.2",
+    "@opensumi/ide-theme": "2.20.2",
+    "@opensumi/ide-webview": "2.20.2",
+    "@opensumi/ide-workspace": "2.20.2",
+    "@opensumi/ide-workspace-edit": "2.20.2",
+    "@opensumi/ide-toolbar": "2.20.2",
+    "@opensumi/ide-testing": "2.20.2",
+    "@opensumi/ide-variable": "2.20.2",
     "@ali/kaitian-textmate-languages": "^2.7.0",
     "@alipay/alex-cli": "2.1.0-0",
     "@alipay/alex-code-api": "2.1.0-0",
diff --git a/packages/alex/src/core/editor/editor.module.ts b/packages/alex/src/core/editor/editor.module.ts
@@ -1,6 +1,6 @@
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
-import { FindController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/find/findController';
-import { FindWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/find/findWidget';
+import { FindController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/find/browser/findController';
+import { FindWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/find/browser/findWidget';
 import * as monacoKeybindings from '@opensumi/monaco-editor-core/esm/vs/platform/keybinding/common/keybindingsRegistry';
 import { ContextKeyDefinedExpr } from '@opensumi/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
 import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
@@ -25,6 +25,7 @@ import {
   ServiceNames,
   IContextKeyService,
   KeybindingRegistryImpl,
+  QUICK_OPEN_COMMANDS,
 } from '@opensumi/ide-core-browser';
 import { RawContextKey } from '@opensumi/ide-core-browser/lib/raw-context-key';
 import { uuid } from '@opensumi/ide-core-common';
@@ -51,7 +52,6 @@ import { IBreadCrumbService } from '@opensumi/ide-editor/lib/browser/types';
 import { EditorHistoryService, EditorHistoryState } from '@opensumi/ide-editor/lib/browser/history';
 import { IEditorDocumentModelService } from '@opensumi/ide-editor/lib/browser/doc-model/types';
 import { FileSchemeDocumentProvider } from '@opensumi/ide-file-scheme/lib/browser/file-doc';
-import { QUICK_OPEN_COMMANDS } from '@opensumi/ide-quick-open/lib/common';
 
 import * as path from 'path';
 import md5 from 'md5';
@@ -589,7 +589,7 @@ class EditorSpecialContribution
     if (typeof adjustFindWidgetTop === 'undefined') {
       return;
     }
-    const findController: FindController = editor.monacoEditor.getContribution(FindController.ID);
+    const findController: FindController = editor.monacoEditor.getContribution(FindController.ID)!;
     const findState = findController.getState();
 
     let styleDisposer: IDisposable | null = null;
diff --git a/packages/alex/src/core/patch.ts b/packages/alex/src/core/patch.ts
@@ -4,8 +4,9 @@
 
 import { Injector } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-common';
-import { StaticServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
-import { ModesRegistry } from '@opensumi/monaco-editor-core/esm/vs/editor/common/modes/modesRegistry';
+import { ModesRegistry } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/modesRegistry';
+import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
 import { DirtyDiffWidget } from '@opensumi/ide-scm/lib/browser/dirty-diff/dirty-diff-widget';
 import { AbstractResourcePreferenceProvider } from '@opensumi/ide-preferences/lib/browser/abstract-resource-preference-provider';
 import { DiskFsProviderClient } from '@opensumi/ide-file-service/lib/browser/file-service-provider-client';
@@ -16,7 +17,7 @@ export const disposableCollection: ((injector: Injector) => void)[] = [];
 
 // TODO: 不使用 private 如何清除副作用
 export const disposeMode = () => {
-  const modeService: any = StaticServices.modeService;
+  const modeService: any = StandaloneServices.get(ILanguageService);
 
   // 需要把 LanguageRegistry dispose，否则二次加载会重复触发事件，导致加载越来越慢
   modeService._value?._registry?.dispose?.();
@@ -47,7 +48,7 @@ DebugConfigurationManager.prototype.canSetBreakpointsIn = () => false;
 // TODO: 临时 patch icon 路径不对问题，蚂蚁链上线依赖
 // OpenSumi 集成 2.10 后删除该 patch 逻辑
 // @ts-ignore
-IconService.prototype.getPath = function(basePath: string, relativePath: string) {
+IconService.prototype.getPath = function (basePath: string, relativePath: string) {
   if (relativePath.startsWith('./')) {
     const uri = new URI(basePath).resolve(relativePath.replace(/^\.\//, ''));
     return uri.scheme ? uri : URI.file(uri.toString());
@@ -61,18 +62,26 @@ IconService.prototype.getPath = function(basePath: string, relativePath: string)
   } else {
     return URI.file(relativePath);
   }
-}
+};
 
 // @ts-ignore
-IconService.prototype.getMaskStyleSheetWithStaticService = function(path: URI, className: string, baseTheme?: string) {
+IconService.prototype.getMaskStyleSheetWithStaticService = function (
+  path: URI,
+  className: string,
+  baseTheme?: string
+) {
   const iconUrl = this.staticResourceService.resolveStaticResource(path).toString();
   // @ts-ignore
   return this.getMaskStyleSheet(iconUrl, className, baseTheme);
-}
+};
 
 // @ts-ignore
-IconService.prototype.getBackgroundStyleSheetWithStaticService = function(path: URI, className: string, baseTheme?: string) {
+IconService.prototype.getBackgroundStyleSheetWithStaticService = function (
+  path: URI,
+  className: string,
+  baseTheme?: string
+) {
   const iconUrl = this.staticResourceService.resolveStaticResource(path).toString();
   // @ts-ignore
   return this.getBackgroundStyleSheet(iconUrl, className, baseTheme);
-}
+};
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@ali/ide-extension-installer": "^2.0.0",
-    "@opensumi/ide-extension": "2.19.10",
     "@alipay/alex-shared": "2.1.0-0",
+    "@opensumi/ide-extension": "2.20.2",
     "commander": "^7.2.0",
     "fs-extra": "^9.0.1",
     "lodash.pick": "^4.4.0",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -20,13 +20,13 @@
   },
   "dependencies": {
     "@opensumi/di": "^1.0.0",
-    "@opensumi/ide-core-browser": "2.19.10",
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-debug": "2.19.10",
-    "@opensumi/ide-file-scheme": "2.19.10",
-    "@opensumi/ide-file-service": "2.19.10",
-    "@opensumi/ide-extension": "2.19.10",
-    "@opensumi/ide-logs": "2.19.10",
+    "@opensumi/ide-core-browser": "2.20.2",
+    "@opensumi/ide-core-common": "2.20.2",
+    "@opensumi/ide-debug": "2.20.2",
+    "@opensumi/ide-file-scheme": "2.20.2",
+    "@opensumi/ide-file-service": "2.20.2",
+    "@opensumi/ide-extension": "2.20.2",
+    "@opensumi/ide-logs": "2.20.2",
     "@alipay/alex-browserfs": "~2.1.0",
     "@alipay/alex-registry": "2.1.0-0",
     "@alipay/alex-shared": "2.1.0-0",
diff --git a/packages/core/src/client/override/codeEditorService.ts b/packages/core/src/client/override/codeEditorService.ts
@@ -7,19 +7,20 @@
 
 import { Injector } from '@opensumi/di';
 import { MonacoCodeService } from '@opensumi/ide-editor/lib/browser/editor.override';
-import { CodeEditorServiceImpl } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorServiceImpl';
-import { StaticServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { AbstractCodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/abstractCodeEditorService';
+import { IStandaloneThemeService } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
+import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 
 export const IMonacoCodeService = Symbol('IMonacoCodeService');
 
 export { MonacoCodeService };
 
-class CodeEditorService extends CodeEditorServiceImpl {
+class CodeEditorService extends AbstractCodeEditorService {
   private injector: Injector | null = null;
   private uid = 0;
 
   constructor() {
-    super(null, StaticServices.standaloneThemeService.get());
+    super(StandaloneServices.get(IStandaloneThemeService));
   }
 
   setInjector(injector: Injector) {
diff --git a/packages/core/src/server/file-service/disk-file-system.provider.ts b/packages/core/src/server/file-service/disk-file-system.provider.ts
@@ -108,14 +108,11 @@ export class DiskFileSystemProvider extends FCService implements IDiskFileProvid
 
   /**
    * @param {Uri} uri
-   * @param {{ recursive: boolean; excludes: string[] }} [options]  // 还不支持 recursive 参数
+   * @param {{ excludes: string[] }} [options]  // 还不支持 recursive 参数
    * @returns {number}
    * @memberof DiskFileSystemProvider
    */
-  async watch(
-    uri: UriComponents,
-    options?: { recursive: boolean; excludes?: string[] }
-  ): Promise<number> {
+  async watch(uri: UriComponents, options?: { excludes?: string[] }): Promise<number> {
     const _uri = Uri.revive(uri);
     const watcherId = await this.watcherServer.watchFileChanges(_uri.toString(), {
       excludes: options && options.excludes ? options.excludes : [],
diff --git a/packages/core/src/server/file-service/file-service-watcher.ts b/packages/core/src/server/file-service/file-service-watcher.ts
@@ -5,7 +5,7 @@ import {
   Uri,
   FileChangeType,
   FileSystemWatcherClient,
-  FileSystemWatcherServer,
+  IFileSystemWatcherServer,
   WatchOptions,
   URI,
   parseGlob as parse,
@@ -27,7 +27,7 @@ export interface NsfwFileSystemWatcherOption {
   error?: (message: string, ...args: any[]) => void;
 }
 
-export class FWFileSystemWatcherServer implements FileSystemWatcherServer {
+export class FWFileSystemWatcherServer implements IFileSystemWatcherServer {
   private static WATCHER_FILE_DETECTED_TIME = 500;
   protected client: FileSystemWatcherClient | undefined;
   protected watcherSequence = 1;
diff --git a/packages/core/src/server/file-service/file-service.ts b/packages/core/src/server/file-service/file-service.ts
@@ -95,7 +95,6 @@ export class FileService extends FCService implements IFileService {
     const _uri = this.getUri(uri);
 
     const watcherId = await this.diskService.watch(_uri.codeUri, {
-      recursive: true,
       excludes: (options && options.excludes) || [],
     });
     this.watcherDisposerMap.set(id, {
diff --git a/packages/core/src/server/search/content-search.service.ts b/packages/core/src/server/search/content-search.service.ts
@@ -1,4 +1,4 @@
-import { getMapForWordSeparators } from '@opensumi/monaco-editor-core/esm/vs/editor/common/controller/wordCharacterClassifier';
+import { getMapForWordSeparators } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/wordCharacterClassifier';
 import { isValidMatch } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model/textModelSearch';
 import { Injectable, Autowired } from '@opensumi/di';
 import {
diff --git a/packages/integrations/src/startup/startup.module.ts b/packages/integrations/src/startup/startup.module.ts
@@ -27,9 +27,9 @@ export class AlexAppContribution extends Disposable implements CommandContributi
     this.addDispose([
       // codeswing 依赖
       // FIXME: 框架侧支持
-      ...[
-        'vscode.setEditorLayout',
-      ].map((id) => commands.registerCommand({ id }, { execute: () => {} })),
+      // ...[
+      //   'vscode.setEditorLayout',
+      // ].map((id) => commands.registerCommand({ id }, { execute: () => {} })),
       commands.registerCommand(
         { id: 'cloudide.command.workspace.getRuntimeConfig' },
         {
diff --git a/packages/lsif-service/package.json b/packages/lsif-service/package.json
@@ -25,7 +25,7 @@
     "tslib": "^2.2.0"
   },
   "peerDependencies": {
-    "@opensumi/ide-core-common": "2.19.10",
-    "@opensumi/ide-extension": "2.19.10"
+    "@opensumi/ide-core-common": "2.20.2",
+    "@opensumi/ide-extension": "2.20.2"
   }
 }
diff --git a/packages/toolkit/define.json b/packages/toolkit/define.json
@@ -1,5 +1,5 @@
 {
-  "__KAITIAN_VERSION__": "2.19.10",
+  "__KAITIAN_VERSION__": "2.20.2",
   "__WORKER_HOST__": "https://gw.alipayobjects.com/os/ide-server/worker-host.c8b76727.js",
   "__WEBVIEW_ENDPOINT__": "https://gw.alipayobjects.com/os/ide-server/webview.2d8f6a79",
   "__WEBVIEW_ENDPOINT_INTERNAL__": "http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/ide-server/webview.2d8f6a79",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,12 @@ export class EmptyStatusBarService implements IStatusBarService {`
`73`	`73`	`console.log('empty Method not implemented.');`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+ getColor() {`
	`77`	`+ if (process.env.NODE_ENV !== 'production') {`
	`78`	`+ console.log('empty Method not implemented.');`
	`79`	`+ }`
	`80`	`+ return undefined;`
	`81`	`+ }`
`76`	`82`	`addElement(id: string, entry: StatusBarEntry): StatusBarEntryAccessor {`
`77`	`83`	`if (process.env.NODE_ENV !== 'production') {`
`78`	`84`	`console.log('empty Method not implemented.');`