fix(acr): 修复 codeServiceEditor 等问题

Author: winjo

packages/acr/src/antcode-cr.tsx

@@ -4,7 +4,12 @@ import { Injector } from '@ali/common-di';
 import { URI } from '@ali/ide-core-common';
 import { join } from '@ali/ide-core-common/lib/path';
 import { equals } from '@ali/ide-core-common/lib/arrays';
-import { RuntimeConfig } from '@alipay/alex-core';
+import {
+  RuntimeConfig,
+  codeServiceEditor,
+  MonacoCodeService,
+  IMonacoCodeService,
+} from '@alipay/alex-core';
 // internal patched
 import { disposeMode } from '@alipay/alex/lib/core/patch';
 
@@ -26,6 +31,7 @@ import { logPv } from './utils/tracert';
 import { RootElementId } from './constant';
 import { Portals } from './portal';
 import { reportUserAccess } from './utils/monitor';
+import { CommentsZoneWidgetPatch, CommentsZoneWidget } from './overrides/comments-zone.view';
 
 const { version } = require('../package.json');
 
@@ -55,8 +61,22 @@ const AntcodeCR: React.FC<IAntcodeCRProps> = (props) => {
         {
           token: RuntimeConfig,
           useValue: {},
+        },
+        {
+          token: MonacoCodeService,
+          useValue: codeServiceEditor,
+        },
+        {
+          token: IMonacoCodeService,
+          useClass: MonacoCodeService,
+          override: true,
+        },
+        {
+          token: CommentsZoneWidget,
+          useClass: CommentsZoneWidgetPatch,
         }
       );
+
       render(
         injector,
         workspaceDir,
@@ -84,6 +104,9 @@ const AntcodeCR: React.FC<IAntcodeCRProps> = (props) => {
       );
     }
 
+    // 保持 codeServiceEditor 单例，且组件每次实例化重新赋值
+    const clearInjector = codeServiceEditor.setInjector(injector);
+
     // spm 曝光埋点
     logPv('a1654', 'b23008');
     // 记录用户访问信息，包括 pr 维度的 pv, uv
@@ -98,6 +121,7 @@ const AntcodeCR: React.FC<IAntcodeCRProps> = (props) => {
       const realInjector = injector$.current;
       if (realInjector) {
         disposeMode();
+        clearInjector();
         realInjector.disposeAll();
       }
       ReactDOM.unmountComponentAtNode(container$!.current!);

packages/acr/src/modules/git-scheme/resource-provider/git.ts

@@ -15,7 +15,7 @@ export class GitResourceProvider implements IResourceProvider {
   labelService: LabelService;
 
   provideResource(uri: URI) {
-    const path = uri.withoutScheme().toString(true);
+    const path = uri.withoutQuery().withoutScheme().toString(true);
     return Promise.all([
       this.getFileStat(uri.toString()),
       // 移除特殊的 / 开头

packages/acr/src/modules/merge-request/changes-tree/changes-tree-model.service.ts

@@ -171,8 +171,11 @@ export class ChangesTreeModelService extends WithEventBus {
 
   private showProgress(promise: Promise<any>) {
     // 展示一个进度条
-    this.progressService.withProgress({ location: ChangesTreeViewId }, async () => {
-      return promise;
+    // 延迟更新，否则在组件中更新会引起 react warning
+    setTimeout(() => {
+      this.progressService.withProgress({ location: ChangesTreeViewId }, async () => {
+        return promise;
+      });
     });
   }
 
@@ -247,12 +250,8 @@ export class ChangesTreeModelService extends WithEventBus {
     const type = isTreeMode ? ChangesTreeTypes.Tree : ChangesTreeTypes.List;
     const preType = !isTreeMode ? ChangesTreeTypes.Tree : ChangesTreeTypes.List;
     if (this.changesTreeModelMap.has(type)) {
-      const {
-        treeModel,
-        decorations,
-        selectedDecoration,
-        focusedDecoration,
-      } = this.changesTreeModelMap.get(type)!;
+      const { treeModel, decorations, selectedDecoration, focusedDecoration } =
+        this.changesTreeModelMap.get(type)!;
       this._activeTreeModel = treeModel;
       this._activeDecorations = decorations;
       this._selectedDecoration = selectedDecoration;
@@ -388,10 +387,8 @@ export class ChangesTreeModelService extends WithEventBus {
   };
 
   private persistFileSelection(preType: ChangesTreeTypes) {
-    const {
-      selectedDecoration: preSelectedDecoration,
-      focusedDecoration: preFocusedDecoration,
-    } = this.changesTreeModelMap.get(preType)!;
+    const { selectedDecoration: preSelectedDecoration, focusedDecoration: preFocusedDecoration } =
+      this.changesTreeModelMap.get(preType)!;
 
     // 切换时需要同步decoration状态，默认只取第一个选中的文件
     const file = this.selectedFiles[0];

packages/acr/src/overrides/comments-zone.view.tsx

@@ -0,0 +1,23 @@
+import { Injectable } from '@ali/common-di';
+import { Event } from '@ali/ide-core-common';
+import { CommentsZoneWidget } from '@ali/ide-comments/lib/browser/comments-zone.view';
+import type { ICommentsThread } from '@ali/ide-comments/lib/common';
+import { IEditor } from '@ali/ide-editor';
+
+export { CommentsZoneWidget };
+
+// 临时修复
+@Injectable({ multiple: true })
+export class CommentsZoneWidgetPatch extends CommentsZoneWidget {
+  constructor(editor: IEditor, thread: ICommentsThread) {
+    const { monacoEditor } = editor;
+    monacoEditor.onDidChangeConfiguration = Event.map(
+      monacoEditor.onDidChangeConfiguration,
+      (e) => {
+        e.hasChanged = e.hasChanged.bind(e);
+        return e;
+      }
+    );
+    super(editor, thread);
+  }
+}

packages/acr/src/overrides/doc-client.ts

@@ -1,8 +1,12 @@
 import { Injectable, Autowired } from '@ali/common-di';
 import { IFileSchemeDocClient, IContentChange, ISavingContent } from '@ali/ide-file-scheme';
-import { IEditorDocumentModelSaveResult, IEditorDocumentEditChange } from '@ali/ide-core-browser';
+import {
+  IEditorDocumentModelSaveResult,
+  IEditorDocumentEditChange,
+  TextDocumentContentChangeEvent,
+} from '@ali/ide-core-browser';
 import { IFileServiceClient } from '@ali/ide-file-service';
-import { TextDocumentContentChangeEvent, Range } from 'vscode-languageserver-types';
+import { Range } from 'vscode-languageserver-types';
 import md5 from 'md5';
 
 /**

packages/core/package.json

@@ -19,7 +19,7 @@
     "lockfile": "enable"
   },
   "dependencies": {
-    "@ali/common-di": "^5.2.2",
+    "@ali/common-di": "^5.3.1",
     "@ali/ide-core-browser": "2.5.5",
     "@ali/ide-core-common": "2.5.5",
     "@ali/ide-debug": "2.5.5",

packages/core/src/client/extension-manager/extension-detail.view.tsx

@@ -10,7 +10,7 @@ import { Markdown } from '@ali/ide-markdown';
 import { observer } from 'mobx-react-lite';
 import * as React from 'react';
 import { ExtensionDetail, IExtensionManagerService } from './base';
-import * as clx from 'classnames';
+import clx from 'classnames';
 import * as styles from './extension-detail.module.less';
 import * as commonStyles from './common.module.less';
 import { Tabs } from '@ali/ide-components';

packages/core/src/client/extension-manager/extension-list/index.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import * as clx from 'classnames';
+import clx from 'classnames';
 import { ProgressBar } from '@ali/ide-core-browser/lib/components/progressbar';
 import { RawExtensionView } from '../raw-extension';
 import { RawExtension, IExtensionManagerService } from '../base';
@@ -21,9 +21,8 @@ export interface ExtensionListProps {
 export const ExtensionList: React.FC<ExtensionListProps> = observer(
   ({ height, loading = false, list, empty, onReachBottom, showExtraAction = true }) => {
     const [selectExtensionId, setSelectExtensionId] = React.useState('');
-    const extensionManagerService = useInjectable<ExtensionManagerService>(
-      IExtensionManagerService
-    );
+    const extensionManagerService =
+      useInjectable<ExtensionManagerService>(IExtensionManagerService);
 
     function select(extension: RawExtension, isDouble: boolean) {
       setSelectExtensionId(extension.extensionId);

packages/core/src/client/extension-manager/raw-extension/index.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { localize } from '@ali/ide-core-browser';
-import * as clx from 'classnames';
+import clx from 'classnames';
 import { observer } from 'mobx-react-lite';
 import { RawExtension } from '../base';
 import * as commonStyles from '../common.module.less';

packages/core/src/client/index.ts

@@ -36,6 +36,8 @@ import {
 import { BreadCrumbServiceImplOverride, IBreadCrumbService } from './override/breadcrumb.service';
 import { SearchContribution } from './search/index.contribution';
 
+export * from './override/codeEditorService';
+
 export { ExtensionManagerModule as ExtensionClientManagerModule } from './extension-manager';
 
 export * from './extension';