feat: 支持文件和代码搜索配置

Author: winjo

package.json

@@ -136,6 +136,11 @@
       "publisher": "alex",
       "name": "git-graph",
       "version": "1.30.0-2"
+    },
+    {
+      "publisher": "alex",
+      "name": "image-preview",
+      "version": "1.53.0-patch.1"
     }
   ]
 }

packages/alex/src/api/createApp.tsx

@@ -22,7 +22,7 @@ import { IPluginConfig } from '@alipay/alex-plugin';
 import { deletionLogPath } from '@alipay/alex-browserfs/lib/backend/OverlayFS';
 
 import '../core/extension/extension.patch';
-import { disposeMode } from '../core/patch';
+import { disposeMode, disposableCollection } from '../core/patch';
 
 import { modules } from '../core/modules';
 import { IconSlim, IDETheme } from '../core/extension/metadata';
@@ -104,6 +104,7 @@ export function createApp({ appConfig, runtimeConfig }: IConfig): IAppInstance {
     }
     destroyed = true;
     disposeMode();
+    disposableCollection.forEach((d) => d(app.injector));
     app.injector.disposeAll();
   };
 

packages/alex/src/api/createEditor.tsx

@@ -20,7 +20,7 @@ import '@ali/ide-core-browser/lib/style/index.less';
 import { IPluginConfig } from '@alipay/alex-plugin';
 import { deletionLogPath } from '@alipay/alex-browserfs/lib/backend/OverlayFS';
 
-import { disposeMode } from '../core/patch';
+import { disposeMode, disposableCollection } from '../core/patch';
 import { getModules } from '../core/editor/modules';
 import { mergeConfig } from '../core/utils';
 import { EditorLayoutComponent, getEditorLayoutConfig } from '../core/layout';
@@ -86,6 +86,7 @@ export function createEditor({ appConfig, runtimeConfig }: IConfig): IAppInstanc
     }
     destroyed = true;
     disposeMode();
+    disposableCollection.forEach((d) => d(app.injector));
     app.injector.disposeAll();
   };
 

packages/alex/src/core/editor/editor.extension.ts

@@ -20,10 +20,9 @@ class ExtensionServiceImplOverride extends ExtensionServiceImpl {
    * TODO: 目前使用私有属性，待升级后改造
    */
   async lazyActivate(this: any) {
-    await this.initBaseData();
-    this.extensionMetaDataArr = await this.getAllExtensions();
-    await this.initExtension();
-    await this.enableAvailableExtensions();
+    await this.initExtensionMetaData();
+    await this.initExtensionInstanceData();
+    await this.runExtensionContributes();
     this.doActivate();
   }
 }

packages/alex/src/core/extension/extension.patch.ts

@@ -1,9 +1,7 @@
-import { ExtensionServiceImpl } from '@ali/ide-kaitian-extension/lib/browser/extension.service';
 import { MainThreadLanguages } from '@ali/ide-kaitian-extension/lib/browser/vscode/api/main.thread.language';
+import { AbstractExtInstanceManagementService } from '@ali/ide-kaitian-extension/lib/browser/types';
 
-// TODO：待 kaitian 中去掉，临时覆盖掉实现，这样 loader 可移除了
-// ExtensionServiceImpl.prototype.initCommonBrowserDependency = () => Promise.resolve();
-// ExtensionServiceImpl.prototype.initKaitianBrowserAPIDependency = () => Promise.resolve();
+import { disposableCollection } from '../patch';
 
 // TODO: PR to kaitian, monaco 内会 dispose，先临时 override
 // @ts-ignore
@@ -22,3 +20,9 @@ MainThreadLanguages.prototype.createSignatureHelpProvider = function (...args: a
   };
   return provider;
 };
+
+disposableCollection.push((injector) => {
+  (injector.get(
+    AbstractExtInstanceManagementService
+  ) as AbstractExtInstanceManagementService).dispose();
+});

packages/alex/src/core/patch.ts

@@ -2,11 +2,14 @@
  * 收敛 kaitian 的 patch
  */
 
+import { Injector } from '@ali/common-di';
 import { StaticServices } from '@ali/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
 import { ModesRegistry } from '@ali/monaco-editor-core/esm/vs/editor/common/modes/modesRegistry';
 import { DirtyDiffWidget } from '@ali/ide-scm/lib/browser/dirty-diff/dirty-diff-widget';
 import { AbstractResourcePreferenceProvider } from '@ali/ide-preferences/lib/browser/abstract-resource-preference-provider';
 
+export const disposableCollection: ((injector: Injector) => void)[] = [];
+
 // TODO: 不使用 private 如何清除副作用
 export const disposeMode = () => {
   const modeService: any = StaticServices.modeService;

packages/code-api/src/common/types.ts

@@ -175,7 +175,7 @@ export interface ICodeAPIService {
   searchFile(
     repo: IRepositoryModel,
     searchString: string,
-    options: { limit: number }
+    options: { limit?: number }
   ): Promise<string[]>;
   /**
    * file blame

packages/code-service/src/code-service.contribution.ts

@@ -35,6 +35,7 @@ import { MainLayoutContribution } from '@ali/ide-main-layout';
 import configureFileSystem from './filesystem/configure';
 import { CodeModelService } from './code-model.service';
 import { RefType, ICodeServiceConfig } from './types';
+import { Configure } from './config.service';
 
 @Domain(LaunchContribution, BrowserEditorContribution, CommandContribution, MainLayoutContribution)
 export class CodeContribution
@@ -82,6 +83,9 @@ export class CodeContribution
   @Autowired(ICodeServiceConfig)
   codeServiceConfig: ICodeServiceConfig;
 
+  @Autowired(Configure)
+  configure: Configure;
+
   private _unmount: () => void | undefined;
 
   private _mounting = false;
@@ -93,6 +97,9 @@ export class CodeContribution
   async launch({ rootFS }: IServerApp) {
     if (!this.codeServiceConfig) return;
 
+    this.configure.configTextSearch();
+    this.configure.configFileSearch();
+
     let initMountDefer: Deferred<void> | null = new Deferred();
     this.codeModel.rootRepository.onDidChangeCommit(() => {
       this.mountFilesystem(rootFS).then(() => {

packages/code-service/src/config.service.ts

@@ -0,0 +1,79 @@
+import { Autowired, Injectable } from '@ali/common-di';
+import { RuntimeConfig } from '@alipay/alex-core';
+
+import { CodeModelService } from './code-model.service';
+
+/**
+ * 调整 runtimeConfig
+ */
+@Injectable()
+export class Configure {
+  @Autowired(RuntimeConfig)
+  runtimeConfig: RuntimeConfig;
+
+  @Autowired()
+  codeModel: CodeModelService;
+
+  configTextSearch() {
+    if (this.runtimeConfig.textSearch) return;
+
+    this.runtimeConfig.textSearch = {
+      config: {
+        regexp: false,
+        replace: false,
+        caseSensitive: 'local',
+        wordMatch: 'local',
+        include: 'local',
+        exclude: 'local',
+      },
+      provideResults: async (query, options, progress) => {
+        const requestResults = await this.codeModel.rootRepository.request.searchContent(
+          query.pattern,
+          {
+            limit: options.maxResults,
+          }
+        );
+        if (!requestResults.length) return;
+        const searchString = query.pattern.toLowerCase();
+        const searchStringLen = searchString.length;
+        requestResults.forEach(({ path, line, content }) => {
+          const text = content.toLowerCase();
+
+          let lastMatchIndex = -searchStringLen;
+          const matches: [number, number][] = [];
+          while (
+            (lastMatchIndex = text.indexOf(searchString, lastMatchIndex + searchStringLen)) !== -1
+          ) {
+            matches.push([lastMatchIndex, lastMatchIndex + searchStringLen]);
+          }
+          if (matches.length) {
+            progress.report({
+              path,
+              lineNumber: line,
+              preview: {
+                text: content,
+                matches,
+              },
+            });
+          }
+        });
+      },
+    };
+  }
+
+  configFileSearch() {
+    if (this.runtimeConfig.fileSearch) return;
+
+    this.runtimeConfig.fileSearch = {
+      config: {
+        include: 'local',
+        exclude: 'local',
+      },
+      provideResults: (query, options) => {
+        return this.codeModel.rootRepository.request.searchFile(query.pattern, {
+          limit: options.maxResults,
+        });
+      },
+    };
+  }
+}

packages/code-service/src/index.ts

@@ -1,12 +1,7 @@
 import { Injectable, Provider } from '@ali/common-di';
 import { BrowserModule } from '@ali/ide-core-browser';
 import { extendModule, ModuleConstructor } from '@alipay/alex-core';
-import { ContentSearchServerPath } from '@ali/ide-search/lib/common';
-import { FileSearchServicePath } from '@ali/ide-file-search/lib/common';
 
-import { SearchContribution } from './search/search.contributon';
-import { ContentSearchService } from './search/content-search.service';
-import { FileSearchService } from './search/file-search.service';
 import { CodeContribution } from './code-service.contribution';
 import { CodeStaticResourceContribution } from './static-resource.contribution';
 import { CodeModelService } from './code-model.service';
@@ -42,18 +37,7 @@ export class CodeServiceModule extends BrowserModule {
     CodeStaticResourceContribution,
     StatusbarContribution,
     DecorationProvider,
-    SearchContribution,
     LineDecorationContribution,
     CommandsContribution,
-    {
-      token: ContentSearchServerPath,
-      useClass: ContentSearchService,
-      override: true,
-    },
-    {
-      token: FileSearchServicePath,
-      useClass: FileSearchService,
-      override: true,
-    },
   ];
 }