@opensumi/ide-editor 2.21.8-rc-1670567192.0 → 2.21.8

package/lib/browser/doc-model/saveParticipants.d.ts

@@ -1,13 +1,13 @@
-import { ClientAppContribution, WithEventBus } from '@opensumi/ide-core-browser';
-import { EditorDocumentModelWillSaveEvent } from './types';
+import { ClientAppContribution, WithEventBus, PreferenceService, CommandService, MonacoService, ILogger } from '@opensumi/ide-core-browser';
+import { EditorDocumentModelWillSaveEvent, IEditorDocumentModelService } from './types';
 export declare class CodeActionOnSaveParticipant extends WithEventBus {
-    private readonly preferenceService;
+    preferenceService: PreferenceService;
+    monacoService: MonacoService;
     private readonly overrideServiceRegistry;
-    private readonly commandService;
-    private readonly docService;
-    private readonly logger;
-    private readonly progressService;
     get bulkEditService(): any;
+    commandService: CommandService;
+    docService: IEditorDocumentModelService;
+    logger: ILogger;
     activate(): void;
     onEditorDocumentModelWillSave(e: EditorDocumentModelWillSaveEvent): Promise<void>;
     private applyOnSaveActions;

package/lib/browser/doc-model/saveParticipants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAYb,MAAM,4BAA4B,CAAC;AAmBpC,OAAO,EAAE,gCAAgC,EAA+B,MAAM,SAAS,CAAC;AAExF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAEnD,IAAI,eAAe,IAAI,GAAG,CAEzB;IAED,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YAkFzD,kBAAkB;YAmClB,gBAAgB;YAchB,eAAe;CAoB9B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAEzD,OAAO;CAGR"}
+{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,YAAY,EAGZ,iBAAiB,EACjB,cAAc,EACd,aAAa,EAEb,OAAO,EAGR,MAAM,4BAA4B,CAAC;AAiBpC,OAAO,EAAE,gCAAgC,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAExF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,aAAa,EAAE,aAAa,CAAC;IAG7B,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAExE,IAAI,eAAe,IAAI,GAAG,CAEzB;IAGD,cAAc,EAAE,cAAc,CAAC;IAG/B,UAAU,EAAE,2BAA2B,CAAC;IAGxC,MAAM,EAAE,OAAO,CAAC;IAEhB,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YA8DzD,kBAAkB;YAYlB,gBAAgB;YAchB,eAAe;CAc9B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAEzD,OAAO;CAGR"}

package/lib/browser/doc-model/saveParticipants.js

@@ -4,7 +4,6 @@ exports.SaveParticipantsContribution = exports.CodeActionOnSaveParticipant = voi
 const tslib_1 = require("tslib");
 const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
-const progress_1 = require("@opensumi/ide-core-browser/lib/progress");
 const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
 const languages_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api/languages");
 const languages = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages"));
@@ -29,74 +28,44 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends ide_
         if (!preferenceActions) {
             return undefined;
         }
-        return this.progressService.withProgress({
-            title: (0, ide_core_browser_1.formatLocalize)('editor.saveCodeActions.saving', e.payload.uri.displayName),
-            location: ide_core_browser_1.ProgressLocation.Notification,
-            cancellable: true,
-        }, async (progress) => {
-            const codeActions = Array.isArray(preferenceActions) ? preferenceActions : Object.keys(preferenceActions);
-            const codeActionsOnSave = codeActions.map((p) => new types_1.CodeActionKind(p));
-            if (!Array.isArray(preferenceActions)) {
-                codeActionsOnSave.sort((a, b) => {
-                    if (types_1.CodeActionKind.SourceFixAll.contains(a)) {
-                        if (types_1.CodeActionKind.SourceFixAll.contains(b)) {
-                            return 0;
-                        }
-                        return -1;
-                    }
-                    if (types_1.CodeActionKind.SourceFixAll.contains(b)) {
-                        return 1;
-                    }
-                    return 0;
-                });
+        const codeActionsOnSave = [];
+        for (const k of Object.keys(preferenceActions).map((p) => new types_1.CodeActionKind(p))) {
+            // source.fixAll
+            // source.fixAll.eslint
+            // source.fixAll.stylelint
+            if (types_1.CodeActionKind.SourceFixAll.equals(k) || types_1.CodeActionKind.SourceFixAll.contains(k)) {
+                codeActionsOnSave.push(types_1.CodeActionKind.SourceFixAll);
             }
-            if (codeActionsOnSave.length === 0) {
-                return;
+            // source.organizeImports
+            if (types_1.CodeActionKind.SourceOrganizeImports.equals(k)) {
+                codeActionsOnSave.push(types_1.CodeActionKind.SourceOrganizeImports);
             }
-            const modelRef = this.docService.getModelReference(e.payload.uri, 'codeActionOnSave');
-            if (!modelRef) {
-                return;
-            }
-            const model = modelRef.instance.getMonacoModel();
-            const tokenSource = new monaco.CancellationTokenSource();
-            const timeout = this.preferenceService.get('editor.codeActionsOnSaveTimeout', undefined, e.payload.uri.toString(), e.payload.language);
-            const excludedActions = Array.isArray(preferenceActions)
-                ? []
-                : Object.keys(preferenceActions)
-                    .filter((x) => preferenceActions[x] === false)
-                    .map((x) => new types_1.CodeActionKind(x));
-            return Promise.race([
-                new Promise((_resolve, reject) => setTimeout(() => {
-                    tokenSource.cancel();
-                    reject('codeActionsOnSave timeout');
-                }, timeout)),
-                this.applyOnSaveActions(model, codeActionsOnSave, excludedActions, progress, tokenSource.token),
-            ]).finally(() => {
+        }
+        if (codeActionsOnSave.length === 0) {
+            return;
+        }
+        const modelRef = this.docService.getModelReference(e.payload.uri, 'codeActionOnSave');
+        if (!modelRef) {
+            return;
+        }
+        const model = modelRef.instance.getMonacoModel();
+        const tokenSource = new monaco.CancellationTokenSource();
+        const timeout = this.preferenceService.get('editor.codeActionsOnSaveTimeout', undefined, e.payload.uri.toString(), e.payload.language);
+        return Promise.race([
+            new Promise((_resolve, reject) => setTimeout(() => {
                 tokenSource.cancel();
-                modelRef.dispose();
-            });
+                reject('codeActionsOnSave timeout');
+            }, timeout)),
+            this.applyOnSaveActions(model, codeActionsOnSave, tokenSource.token),
+        ]).finally(() => {
+            tokenSource.cancel();
+            modelRef.dispose();
         });
     }
-    async applyOnSaveActions(model, actions, excludes, progress, token) {
-        const getActionProgress = new (class {
-            constructor() {
-                this._names = new Set();
-            }
-            _report() {
-                progress.report({
-                    message: (0, ide_core_browser_1.formatLocalize)('editor.saveCodeActions.getting', [...this._names].map((name) => `'${name}'`).join(', ')),
-                });
-            }
-            report(provider) {
-                if (provider.displayName && !this._names.has(provider.displayName)) {
-                    this._names.add(provider.displayName);
-                    this._report();
-                }
-            }
-        })();
+    async applyOnSaveActions(model, actions, token) {
         for (const codeActionKind of actions) {
             try {
-                const actionsToRun = await this.getActionsToRun(model, codeActionKind, excludes, getActionProgress, token);
+                const actionsToRun = await this.getActionsToRun(model, codeActionKind, token);
                 await this.applyCodeActions(actionsToRun.validActions);
             }
             catch (e) {
@@ -115,18 +84,22 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant extends ide_
             }
         }
     }
-    async getActionsToRun(model, codeActionKind, excludes, progress, token) {
+    async getActionsToRun(model, codeActionKind, token) {
         return (0, codeAction_1.getCodeActions)(languages_1.languageFeaturesService.codeActionProvider, model, model.getFullModelRange(), {
             type: languages.CodeActionTriggerType.Auto,
-            filter: { include: codeActionKind, excludes, includeSourceActions: true },
+            filter: { include: codeActionKind, includeSourceActions: true },
             triggerAction: types_1.CodeActionTriggerSource.OnSave,
-        }, progress, token);
+        }, ide_core_browser_1.Progress.None, token);
     }
 };
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
     tslib_1.__metadata("design:type", Object)
 ], CodeActionOnSaveParticipant.prototype, "preferenceService", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_core_browser_1.MonacoService),
+    tslib_1.__metadata("design:type", ide_core_browser_1.MonacoService)
+], CodeActionOnSaveParticipant.prototype, "monacoService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.MonacoOverrideServiceRegistry),
     tslib_1.__metadata("design:type", ide_core_browser_1.MonacoOverrideServiceRegistry)
@@ -143,10 +116,6 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.ILogger),
     tslib_1.__metadata("design:type", Object)
 ], CodeActionOnSaveParticipant.prototype, "logger", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(progress_1.IProgressService),
-    tslib_1.__metadata("design:type", Object)
-], CodeActionOnSaveParticipant.prototype, "progressService", void 0);
 tslib_1.__decorate([
     (0, ide_core_browser_1.OnEvent)(types_3.EditorDocumentModelWillSaveEvent),
     tslib_1.__metadata("design:type", Function),

package/lib/browser/doc-model/saveParticipants.js.map

@@ -1 +1 @@
-{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}

package/lib/browser/editor.decoration.service.d.ts

@@ -1,13 +1,14 @@
-import { URI, IDisposable } from '@opensumi/ide-core-browser';
+import { URI, IDisposable, IEventBus } from '@opensumi/ide-core-browser';
+import { IThemeService } from '@opensumi/ide-theme';
+import { ICSSStyleService } from '@opensumi/ide-theme/lib/common/style';
 import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 import { IDecorationRenderOptions } from '../common';
 import { IEditorDecorationCollectionService, IBrowserTextEditorDecorationType, IEditorDecorationProvider } from './types';
 export declare class EditorDecorationCollectionService implements IEditorDecorationCollectionService {
     decorations: Map<string, IBrowserTextEditorDecorationType>;
-    private readonly cssManager;
-    private readonly themeService;
-    private readonly iconService;
-    private readonly eventBus;
+    cssManager: ICSSStyleService;
+    themeService: IThemeService;
+    eventBus: IEventBus;
     private tempId;
     constructor();
     getNextTempId(): string;

package/lib/browser/editor.decoration.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"editor.decoration.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor.decoration.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAyB,MAAM,4BAA4B,CAAC;AAGrF,OAAO,KAAK,MAAM,MAAM,uDAAuD,CAAC;AAEhF,OAAO,EAAiC,wBAAwB,EAAmC,MAAM,WAAW,CAAC;AAErH,OAAO,EACL,kCAAkC,EAClC,gCAAgC,EAGhC,yBAAyB,EAI1B,MAAM,SAAS,CAAC;AAEjB,qBACa,iCAAkC,YAAW,kCAAkC;IAC1F,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAa;IAGvE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAmB;IAG9C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAG7C,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAe;IAG3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;IAErC,OAAO,CAAC,MAAM,CAAK;;IAInB,aAAa;IAKb,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAa;IAExE,8BAA8B,CAAC,OAAO,EAAE,wBAAwB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,gCAAgC;IAoBjH,2BAA2B,CAAC,GAAG,KAAA;IAI/B,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,mCAAmC;IAoD3C,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,sBAAsB;IAwB9B,0BAA0B,CAAC,QAAQ,EAAE,yBAAyB,GAAG,WAAW;IAiBtE,yBAAyB,CAC7B,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAA;KAAE,CAAC;CAuBrE"}
+{"version":3,"file":"editor.decoration.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor.decoration.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,WAAW,EAAc,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,uDAAuD,CAAC;AAEhF,OAAO,EAAiC,wBAAwB,EAAmC,MAAM,WAAW,CAAC;AAErH,OAAO,EACL,kCAAkC,EAClC,gCAAgC,EAGhC,yBAAyB,EAI1B,MAAM,SAAS,CAAC;AAEjB,qBACa,iCAAkC,YAAW,kCAAkC;IAC1F,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAa;IAGvE,UAAU,EAAE,gBAAgB,CAAC;IAG7B,YAAY,EAAE,aAAa,CAAC;IAG5B,QAAQ,EAAE,SAAS,CAAC;IAEpB,OAAO,CAAC,MAAM,CAAK;;IAInB,aAAa;IAKb,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAa;IAExE,8BAA8B,CAAC,OAAO,EAAE,wBAAwB,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,gCAAgC;IAoBjH,2BAA2B,CAAC,GAAG,KAAA;IAI/B,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,mCAAmC;IAoD3C,OAAO,CAAC,eAAe;IAoBvB,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,sBAAsB;IAwB9B,0BAA0B,CAAC,QAAQ,EAAE,yBAAyB,GAAG,WAAW;IAiBtE,yBAAyB,CAC7B,GAAG,EAAE,GAAG,EACR,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAA;KAAE,CAAC;CAuBrE"}

package/lib/browser/editor.decoration.service.js

@@ -108,13 +108,9 @@ let EditorDecorationCollectionService = class EditorDecorationCollectionService
         };
     }
     resolveCSSStyle(styles) {
-        var _a;
-        const iconPath = ((_a = styles.backgroundIcon) === null || _a === void 0 ? void 0 : _a.startsWith('data:'))
-            ? this.iconService.encodeBase64Path(decodeURIComponent(styles.backgroundIcon))
-            : styles.backgroundIcon;
         return {
             backgroundColor: this.themeService.getColorVar(styles.backgroundColor),
-            background: styles.backgroundIcon ? `url("${iconPath}") center center no-repeat` : undefined,
+            background: styles.backgroundIcon ? `url('${styles.backgroundIcon}') center center no-repeat` : undefined,
             backgroundSize: styles.backgroundIconSize ? `${styles.backgroundIconSize}` : undefined,
             outline: styles.outline,
             outlineColor: styles.outlineColor,
@@ -210,10 +206,6 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(ide_theme_1.IThemeService),
     tslib_1.__metadata("design:type", Object)
 ], EditorDecorationCollectionService.prototype, "themeService", void 0);
-tslib_1.__decorate([
-    (0, di_1.Autowired)(ide_theme_1.IIconService),
-    tslib_1.__metadata("design:type", Object)
-], EditorDecorationCollectionService.prototype, "iconService", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(ide_core_browser_1.IEventBus),
     tslib_1.__metadata("design:type", Object)

package/lib/browser/editor.decoration.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"editor.decoration.service.js","sourceRoot":"","sources":["../../src/browser/editor.decoration.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editor.decoration.service.js","sourceRoot":"","sources":["../../src/browser/editor.decoration.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "2.21.8-rc-1670567192.0",
+  "version": "2.21.8",
   "files": [
-    "lib",
-    "src"
+    "lib"
   ],
   "license": "MIT",
   "main": "lib/index.js",
@@ -17,21 +16,21 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-core-node": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-file-service": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-monaco": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-utils": "2.21.8-rc-1670567192.0",
+    "@opensumi/ide-core-common": "2.21.8",
+    "@opensumi/ide-core-node": "2.21.8",
+    "@opensumi/ide-file-service": "2.21.8",
+    "@opensumi/ide-monaco": "2.21.8",
+    "@opensumi/ide-utils": "2.21.8",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-core-browser": "2.21.8-rc-1670567192.0",
+    "@opensumi/ide-components": "2.21.8",
+    "@opensumi/ide-core-browser": "2.21.8",
     "@opensumi/ide-dev-tool": "^1.3.1",
-    "@opensumi/ide-overlay": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-quick-open": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-theme": "2.21.8-rc-1670567192.0",
-    "@opensumi/ide-workspace": "2.21.8-rc-1670567192.0"
+    "@opensumi/ide-overlay": "2.21.8",
+    "@opensumi/ide-quick-open": "2.21.8",
+    "@opensumi/ide-theme": "2.21.8",
+    "@opensumi/ide-workspace": "2.21.8"
   },
-  "gitHead": "acb182cbff72a453386044944b33a9f71eca426d"
+  "gitHead": "603eaa81756ee0e8a58871fb67cfb01c8499593a"
 }

package/src/browser/breadcrumb/default.ts

@@ -1,299 +0,0 @@
-import debounce from 'lodash/debounce';
-
-import { Autowired, Injectable } from '@opensumi/di';
-import {
-  CommandService,
-  EDITOR_COMMANDS,
-  Event,
-  Emitter,
-  getSymbolIcon,
-  IPosition,
-  IRange,
-  MaybeNull,
-  OnEvent,
-  URI,
-  WithEventBus,
-  LRUMap,
-  path,
-  Schemes,
-} from '@opensumi/ide-core-browser';
-import { LabelService } from '@opensumi/ide-core-browser/lib/services';
-import { FileStat } from '@opensumi/ide-file-service/lib/common';
-import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common/file-service-client';
-import { IWorkspaceService } from '@opensumi/ide-workspace/lib/common/workspace.interface';
-
-import { IEditor } from '../../common';
-import { EditorSelectionChangeEvent, IBreadCrumbPart, IBreadCrumbProvider } from '../types';
-
-import { DocumentSymbolChangedEvent, DocumentSymbolStore, INormalizedDocumentSymbol } from './document-symbol';
-
-const { Path } = path;
-@Injectable()
-export class DefaultBreadCrumbProvider extends WithEventBus implements IBreadCrumbProvider {
-  private _onDidUpdateBreadCrumb = new Emitter<URI>();
-  public onDidUpdateBreadCrumb: Event<URI> = this._onDidUpdateBreadCrumb.event;
-
-  @Autowired(IFileServiceClient)
-  fileServiceClient: IFileServiceClient;
-
-  @Autowired(IWorkspaceService)
-  workspaceService: IWorkspaceService;
-
-  @Autowired(LabelService)
-  labelService: LabelService;
-
-  @Autowired(CommandService)
-  commandService: CommandService;
-
-  @Autowired()
-  documentSymbolStore: DocumentSymbolStore;
-
-  private debouncedFireUriEvent = new Map<string, () => any>();
-
-  private cachedBreadCrumb = new LRUMap<string, IBreadCrumbPart>(200, 100);
-
-  handlesUri(uri: URI): boolean {
-    return this.fileServiceClient.handlesScheme(uri.scheme);
-  }
-
-  provideBreadCrumbForUri(uri: URI, editor: MaybeNull<IEditor>): IBreadCrumbPart[] {
-    return this.getFileParts(uri).concat(this.getDocumentSymbolParts(uri, editor));
-  }
-
-  private getFileParts(uri: URI): IBreadCrumbPart[] {
-    const workspaceRoot: URI | undefined = this.workspaceService.workspace
-      ? new URI(this.workspaceService.workspace.uri)
-      : undefined;
-    let root: URI;
-    let relativePaths: path.Path;
-    if (workspaceRoot && workspaceRoot.isEqualOrParent(uri)) {
-      root = workspaceRoot;
-      relativePaths = workspaceRoot.relative(uri)!;
-    } else {
-      root = URI.from({
-        scheme: uri.scheme,
-        authority: uri.authority,
-      });
-      relativePaths = uri.path;
-    }
-
-    let p = root.path;
-    const result: IBreadCrumbPart[] = [];
-    for (const r of relativePaths
-      .toString()
-      .split(Path.separator)
-      .filter((p) => !!p)) {
-      p = p.join(r);
-      const u = root.withPath(p);
-      result.push(this.createFilePartBreadCrumbUri(u, !u.isEqual(uri)));
-    }
-    return result;
-  }
-
-  private createFilePartBreadCrumbUri(uri: URI, isDirectory: boolean): IBreadCrumbPart {
-    const uriString = uri.toString();
-    if (this.cachedBreadCrumb.has(uriString)) {
-      return this.cachedBreadCrumb.get(uriString)!;
-    }
-
-    const res: IBreadCrumbPart = {
-      name: uri.path.base,
-      icon: this.labelService.getIcon(uri, { isDirectory }),
-      getSiblings: async () => {
-        const parentDir = URI.from({
-          scheme: uri.scheme,
-        }).withPath(uri.path.dir);
-        const stat = await this.fileServiceClient.getFileStat(parentDir.toString());
-        const parts: IBreadCrumbPart[] = [];
-        let currentIndex = -1;
-        if (stat && stat.children && stat.children.length > 0) {
-          sortByNumeric(stat.children).forEach((file, i) => {
-            parts.push(this.createFilePartBreadCrumbUri(new URI(file.uri), file.isDirectory));
-            if (currentIndex === -1 && uri.toString() === file.uri) {
-              currentIndex = i;
-            }
-          });
-        }
-        return {
-          parts,
-          currentIndex,
-        };
-      },
-    };
-
-    if (isDirectory) {
-      res.getChildren = async () => {
-        const stat = await this.fileServiceClient.getFileStat(uri.toString());
-        const parts: IBreadCrumbPart[] = [];
-        if (stat && stat.children && stat.children.length > 0) {
-          sortByNumeric(stat.children).forEach((file, i) => {
-            parts.push(this.createFilePartBreadCrumbUri(new URI(file.uri), file.isDirectory));
-          });
-        }
-        return parts;
-      };
-    } else {
-      res.onClick = () => {
-        this.commandService.executeCommand(EDITOR_COMMANDS.OPEN_RESOURCE.id, uri);
-      };
-    }
-
-    this.cachedBreadCrumb.set(uriString, res);
-    return res;
-  }
-
-  private getDocumentSymbolParts(uri: URI, editor: MaybeNull<IEditor>): IBreadCrumbPart[] {
-    if (!editor) {
-      return [];
-    }
-    const symbols = this.documentSymbolStore.getDocumentSymbol(uri);
-    if (symbols && symbols.length > 0) {
-      const currentSymbols = findCurrentDocumentSymbol(symbols, editor.monacoEditor.getPosition());
-      if (currentSymbols.length > 0) {
-        return currentSymbols.map((symbol) => this.createFromDocumentSymbol(symbol, editor));
-      } else {
-        return [
-          {
-            name: '...',
-            getSiblings: () => ({
-              parts: symbols
-                .sort((a, b) => sortByRangeStart(a.range, b.range))
-                .map((symbol) => this.createFromDocumentSymbol(symbol, editor)),
-              currentIndex: -1,
-            }),
-          },
-        ];
-      }
-    } else {
-      return [];
-    }
-  }
-
-  private createFromDocumentSymbol(symbol: INormalizedDocumentSymbol, editor: IEditor): IBreadCrumbPart {
-    const res: IBreadCrumbPart = {
-      name: symbol.name,
-      icon: getSymbolIcon(symbol.kind),
-      onClick: () => {
-        editor.setSelection({
-          startColumn: symbol.range.startColumn,
-          endColumn: symbol.range.startColumn,
-          startLineNumber: symbol.range.startLineNumber,
-          endLineNumber: symbol.range.startLineNumber,
-        });
-        editor.monacoEditor.revealRangeInCenter(symbol.range);
-        editor.monacoEditor.focus();
-      },
-    };
-    if (symbol.parent) {
-      res.getSiblings = () => ({
-        parts: symbol
-          .parent!.children!.sort((a, b) => sortByRangeStart(a.range, b.range))
-          .map((symbol) => this.createFromDocumentSymbol(symbol, editor)),
-        currentIndex: symbol.parent!.children!.indexOf(symbol),
-      });
-    }
-    if (symbol.children && symbol.children.length > 0) {
-      res.getChildren = () =>
-        symbol
-          .children!.sort((a, b) => sortByRangeStart(a.range, b.range))
-          .map((symbol) => this.createFromDocumentSymbol(symbol, editor));
-    }
-    return res;
-  }
-
-  @OnEvent(DocumentSymbolChangedEvent)
-  onDocumentSymbolChangedEvent(e: DocumentSymbolChangedEvent) {
-    this.notifyUpdate(e.payload);
-  }
-
-  @OnEvent(EditorSelectionChangeEvent)
-  onEditorSelectionChangeEvent(e: EditorSelectionChangeEvent) {
-    this.notifyUpdate(e.payload.editorUri);
-  }
-
-  private notifyUpdate(uri: URI) {
-    if (!this.debouncedFireUriEvent.has(uri.toString())) {
-      this.debouncedFireUriEvent.set(
-        uri.toString(),
-        debounce(
-          () => {
-            this._onDidUpdateBreadCrumb.fire(uri);
-          },
-          100,
-          { maxWait: 1000 },
-        ),
-      );
-    }
-    this.debouncedFireUriEvent.get(uri.toString())!();
-  }
-}
-
-export function findCurrentDocumentSymbol(
-  documentSymbols: INormalizedDocumentSymbol[],
-  position: MaybeNull<IPosition>,
-): INormalizedDocumentSymbol[] {
-  const result: INormalizedDocumentSymbol[] = [];
-  if (!position) {
-    return result;
-  }
-  let toFindIn: INormalizedDocumentSymbol[] | undefined = documentSymbols;
-  while (toFindIn && toFindIn.length > 0) {
-    let found = false;
-    for (const documentSymbol of toFindIn) {
-      if (positionInRange(position, documentSymbol.range)) {
-        result.push(documentSymbol);
-        toFindIn = documentSymbol.children;
-        found = true;
-        break;
-      }
-    }
-    if (!found) {
-      break;
-    }
-  }
-  return result;
-}
-
-function sortByNumeric(files: FileStat[]): FileStat[] {
-  return files.sort((a: FileStat, b: FileStat) => {
-    if ((a.isDirectory && b.isDirectory) || (!a.isDirectory && !b.isDirectory)) {
-      // numeric 参数确保数字为第一排序优先级
-      const nameA = new URI(a.uri).path.name;
-      const nameB = new URI(b.uri).path.name;
-      return nameA.localeCompare(nameB, 'kn', { numeric: true });
-    } else if (a.isDirectory && !b.isDirectory) {
-      return -1;
-    } else if (!a.isDirectory && b.isDirectory) {
-      return 1;
-    } else {
-      return 0;
-    }
-  });
-}
-
-function positionInRange(pos: IPosition, range: IRange): boolean {
-  if (pos.lineNumber < range.startLineNumber) {
-    return false;
-  } else if (pos.lineNumber === range.startLineNumber) {
-    return pos.column >= range.startColumn;
-  } else if (pos.lineNumber < range.endLineNumber) {
-    return true;
-  } else if (pos.lineNumber === range.endLineNumber) {
-    return pos.column <= range.endColumn;
-  } else {
-    return false;
-  }
-}
-
-function sortByRangeStart(rangeA: IRange, rangeB: IRange) {
-  if (rangeA.startLineNumber > rangeB.startLineNumber) {
-    return 1;
-  } else if (rangeA.startLineNumber < rangeB.startLineNumber) {
-    return -1;
-  } else {
-    if (rangeA.startColumn === rangeB.startColumn) {
-      return 0;
-    }
-    return rangeA.startColumn > rangeB.startColumn ? 1 : -1;
-  }
-}