@opensumi/ide-outline 2.22.10 → 2.23.0

package/lib/browser/outline-node.js

@@ -26,7 +26,7 @@ const OutlineNode = ({ item, defaultLeftPadding = 8, leftPadding = 8, onClick, o
             }
         }
     };
-    const paddingLeft = `${defaultLeftPadding + (item.depth || 0) * (leftPadding || 0) + (!outline_node_define_1.OutlineCompositeTreeNode.is(item) ? 16 : 0)}px`;
+    const paddingLeft = `${defaultLeftPadding + (item.depth || 0) * (leftPadding || 0) + (!outline_node_define_1.OutlineCompositeTreeNode.is(item) ? 12 : 0)}px`;
     const editorNodeStyle = {
         color: decoration ? decoration.color : '',
         height: exports.OUTLINE_TREE_NODE_HEIGHT,

package/lib/browser/outline.contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/outline.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EACzB,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,sBAAsB,EAAsB,MAAM,2BAA2B,CAAC;AAQvF,qBACa,mBAAoB,YAAW,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB;IAEhH,OAAO,CAAC,iBAAiB,CAAqB;IAG9C,OAAO,CAAC,kBAAkB,CAAqB;IAG/C,OAAO,CAAC,uBAAuB,CAAsB;IAGrD,UAAU,EAAE,kBAAkB,CAAC;IAE/B,WAAW;IAYX,gBAAgB,CAAC,QAAQ,EAAE,eAAe;IA6D1C,oBAAoB,CAAC,QAAQ,EAAE,eAAe;CAoC/C"}
+{"version":3,"file":"outline.contribution.d.ts","sourceRoot":"","sources":["../../src/browser/outline.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,yBAAyB,EACzB,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AAIpC,OAAO,EAAE,sBAAsB,EAAsB,MAAM,2BAA2B,CAAC;AAQvF,qBACa,mBAAoB,YAAW,sBAAsB,EAAE,yBAAyB,EAAE,mBAAmB;IAEhH,OAAO,CAAC,iBAAiB,CAAqB;IAG9C,OAAO,CAAC,kBAAkB,CAAqB;IAG/C,OAAO,CAAC,uBAAuB,CAAsB;IAGrD,UAAU,EAAE,kBAAkB,CAAC;IAE/B,WAAW;IAYX,gBAAgB,CAAC,QAAQ,EAAE,eAAe;IA4D1C,oBAAoB,CAAC,QAAQ,EAAE,eAAe;CAoC/C"}

package/lib/browser/outline.contribution.js

@@ -34,7 +34,6 @@ let OutlineContribution = class OutlineContribution {
         registry.registerCommand({
             id: ide_core_browser_1.OUTLINE_COMMANDS.OUTLINE_FOLLOW_CURSOR.id,
             iconClass: (0, ide_core_browser_2.getIcon)('follow-cursor'),
-            toogleIconClass: (0, ide_core_browser_2.getIcon)('follow-cursor', { fill: true }),
             label: (0, ide_core_browser_1.localize)('outline.follow.cursor'),
         }, {
             execute: () => {

package/lib/browser/outline.contribution.js.map

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

package/lib/browser/outline.d.ts

@@ -8,11 +8,12 @@ export declare const OutlinePanel: ({ viewState }: React.PropsWithChildren<{
 }>) => JSX.Element;
 interface IOutlineTreeViewProps {
     height: number;
+    loading: boolean;
     model?: OutlineTreeModel;
     onDidTreeReady(handle: IRecycleTreeHandle): void;
     onItemClick(ev: MouseEvent, item: OutlineTreeNode | OutlineCompositeTreeNode, type: TreeNodeType): void;
     onTwistierClick(ev: MouseEvent, item: OutlineTreeNode | OutlineCompositeTreeNode): void;
 }
-export declare const OutlineTreeView: React.MemoExoticComponent<({ height, model, onItemClick, onTwistierClick, onDidTreeReady }: IOutlineTreeViewProps) => JSX.Element>;
+export declare const OutlineTreeView: React.MemoExoticComponent<({ height, model, onItemClick, onTwistierClick, onDidTreeReady, loading }: IOutlineTreeViewProps) => JSX.Element>;
 export {};
 //# sourceMappingURL=outline.d.ts.map

package/lib/browser/outline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline.d.ts","sourceRoot":"","sources":["../../src/browser/outline.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EACZ,iBAAiB,EAGjB,UAAU,EAKX,MAAM,OAAO,CAAC;AAEf,OAAO,EAAe,kBAAkB,EAA0B,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAKvD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,eAAO,MAAM,YAAY;eAAkD,SAAS;kBAsFnF,CAAC;AAEF,UAAU,qBAAqB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,GAAG,wBAAwB,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACxG,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,GAAG,wBAAwB,GAAG,IAAI,CAAC;CACzF;AAED,eAAO,MAAM,eAAe,8FACwC,qBAAqB,iBAqCxF,CAAC"}
+{"version":3,"file":"outline.d.ts","sourceRoot":"","sources":["../../src/browser/outline.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EACZ,iBAAiB,EAGjB,UAAU,EAKX,MAAM,OAAO,CAAC;AAEf,OAAO,EAAe,kBAAkB,EAA0B,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACjH,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAMvD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAG5D,eAAO,MAAM,YAAY;eAAkD,SAAS;kBA2GnF,CAAC;AAEF,UAAU,qBAAqB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,cAAc,CAAC,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,GAAG,wBAAwB,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAAC;IACxG,eAAe,CAAC,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,eAAe,GAAG,wBAAwB,GAAG,IAAI,CAAC;CACzF;AAED,eAAO,MAAM,eAAe,uGACiD,qBAAqB,iBAyCjG,CAAC"}

package/lib/browser/outline.js

@@ -2,20 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutlineTreeView = exports.OutlinePanel = void 0;
 const tslib_1 = require("tslib");
+const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const react_1 = tslib_1.__importStar(require("react"));
 const ide_components_1 = require("@opensumi/ide-components");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
+const progress_bar_1 = require("@opensumi/ide-core-browser/lib/progress/progress-bar");
 const react_hooks_1 = require("@opensumi/ide-core-browser/lib/react-hooks");
 const outline_node_1 = require("./outline-node");
 const outline_module_less_1 = tslib_1.__importDefault(require("./outline.module.less"));
 const outline_model_service_1 = require("./services/outline-model.service");
 const OutlinePanel = ({ viewState }) => {
-    const [model, setModel] = (0, react_1.useState)();
     const { height } = viewState;
     const wrapperRef = (0, react_1.createRef)();
     const outlineModelService = (0, react_hooks_1.useInjectable)(outline_model_service_1.OutlineModelService);
+    const [model, setModel] = (0, react_1.useState)(undefined);
     const handleTreeReady = (0, react_1.useCallback)((handle) => {
-        outlineModelService.handleTreeHandler(Object.assign(Object.assign({}, handle), { getModel: () => outlineModelService.treeModel, hasDirectFocus: () => wrapperRef.current === document.activeElement }));
+        outlineModelService.handleTreeHandler(Object.assign(Object.assign({}, handle), { hasDirectFocus: () => wrapperRef.current === document.activeElement }));
     }, [outlineModelService, wrapperRef.current]);
     const handleItemClicked = (0, react_1.useCallback)((ev, item, type) => {
         // 阻止点击事件冒泡
@@ -61,16 +63,29 @@ const OutlinePanel = ({ viewState }) => {
             outlineModelService.handleTreeBlur();
         };
     }, [wrapperRef.current]);
+    const [loadingState, setLoadingState] = react_1.default.useState(false);
+    const loading = react_1.default.useMemo(() => loadingState, [loadingState]);
+    (0, react_1.useEffect)(() => {
+        const disposable1 = outlineModelService.onLoadingStateChange((0, debounce_1.default)((current) => {
+            setLoadingState((previous) => (previous !== current ? current : previous));
+        }, 16 * 5, {
+            leading: true,
+        }));
+        return () => {
+            disposable1.dispose();
+        };
+    }, [setLoadingState]);
     return (react_1.default.createElement("div", { className: outline_module_less_1.default.outline_container, tabIndex: -1, ref: wrapperRef, onClick: handleOuterClick },
-        react_1.default.createElement(exports.OutlineTreeView, { height: height, model: model, onItemClick: handleItemClicked, onTwistierClick: handleTwistierClicked, onDidTreeReady: handleTreeReady })));
+        react_1.default.createElement(progress_bar_1.Progress, { loading: loading }),
+        react_1.default.createElement(exports.OutlineTreeView, { loading: loading, height: height, model: model, onItemClick: handleItemClicked, onTwistierClick: handleTwistierClicked, onDidTreeReady: handleTreeReady })));
 };
 exports.OutlinePanel = OutlinePanel;
-exports.OutlineTreeView = (0, react_1.memo)(({ height, model, onItemClick, onTwistierClick, onDidTreeReady }) => {
+exports.OutlineTreeView = (0, react_1.memo)(({ height, model, onItemClick, onTwistierClick, onDidTreeReady, loading }) => {
     const outlineModelService = (0, react_hooks_1.useInjectable)(outline_model_service_1.OutlineModelService);
     const { decorationService, commandService } = outlineModelService;
     const renderTreeNode = (0, react_1.useCallback)((props) => (react_1.default.createElement(outline_node_1.OutlineNode, { item: props.item, itemType: props.itemType, decorationService: decorationService, commandService: commandService, decorations: outlineModelService.decorations.getDecorations(props.item), onClick: onItemClick, onTwistierClick: onTwistierClick, defaultLeftPadding: 8, leftPadding: 8 })), [model]);
     if (!model) {
-        return react_1.default.createElement("span", { className: outline_module_less_1.default.outline_empty_text }, (0, ide_core_browser_1.localize)('outline.noinfo'));
+        return (react_1.default.createElement("span", { className: outline_module_less_1.default.outline_empty_text }, loading ? (0, ide_core_browser_1.localize)('common.loading') : (0, ide_core_browser_1.localize)('outline.nomodel')));
     }
     else {
         return (react_1.default.createElement(ide_components_1.RecycleTree, { height: height, itemHeight: outline_node_1.OUTLINE_TREE_NODE_HEIGHT, onReady: onDidTreeReady, model: model, placeholder: () => react_1.default.createElement("span", { className: outline_module_less_1.default.outline_empty_text }, (0, ide_core_browser_1.localize)('outline.noinfo')) }, renderTreeNode));

package/lib/browser/outline.js.map

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

package/lib/browser/services/outline-event.service.d.ts

@@ -2,20 +2,30 @@ import { WithEventBus, URI, Event } from '@opensumi/ide-core-browser';
 import { IResource, IEditorGroup } from '@opensumi/ide-editor';
 import { EditorActiveResourceStateChangedEvent, EditorSelectionChangeEvent } from '@opensumi/ide-editor/lib/browser';
 import { DocumentSymbolChangedEvent } from '@opensumi/ide-editor/lib/browser/breadcrumb/document-symbol';
+import { ViewCollapseChangedEvent } from '@opensumi/ide-main-layout';
 export type OpenedEditorData = IEditorGroup | IResource;
 export interface OpenedEditorEvent {
     group: IEditorGroup;
     resource: IResource;
 }
 export declare class OutlineEventService extends WithEventBus {
-    private _onDidChange;
+    private _onDidDocumentSymbolChange;
     private _onDidSelectionChange;
-    private _onDidActiveChange;
+    private _onDidEditorActiveResourceStateChange;
+    private _onDidViewCollapseChange;
+    /**
+     * on did document symbol changed
+     */
     get onDidChange(): Event<URI | null>;
+    /**
+     * on did editor active resource state changed
+     */
     get onDidActiveChange(): Event<URI | null>;
     get onDidSelectionChange(): Event<URI | null>;
+    get onDidViewCollapseChange(): Event<boolean>;
     onEditorActiveResourceStateChangedEvent(e: EditorActiveResourceStateChangedEvent): void;
     onEditorSelectionChangeEvent(e: EditorSelectionChangeEvent): void;
     onDocumentSymbolChange(e: DocumentSymbolChangedEvent): void;
+    onViewCollapseChangedEvent(e: ViewCollapseChangedEvent): void;
 }
 //# sourceMappingURL=outline-event.service.d.ts.map

package/lib/browser/services/outline-event.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline-event.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/outline-event.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,YAAY,EAAW,GAAG,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,qCAAqC,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6DAA6D,CAAC;AAEzG,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,CAAC;AACxD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,qBACa,mBAAoB,SAAQ,YAAY;IACnD,OAAO,CAAC,YAAY,CAAsC;IAC1D,OAAO,CAAC,qBAAqB,CAAsC;IACnE,OAAO,CAAC,kBAAkB,CAAsC;IAEhE,IAAI,WAAW,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAEnC;IAED,IAAI,iBAAiB,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAEzC;IAED,IAAI,oBAAoB,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAE5C;IAGD,uCAAuC,CAAC,CAAC,EAAE,qCAAqC;IAKhF,4BAA4B,CAAC,CAAC,EAAE,0BAA0B;IAK1D,sBAAsB,CAAC,CAAC,EAAE,0BAA0B;CAGrD"}
+{"version":3,"file":"outline-event.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/outline-event.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,YAAY,EAAW,GAAG,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAC;AACxF,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,qCAAqC,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,6DAA6D,CAAC;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAIrE,MAAM,MAAM,gBAAgB,GAAG,YAAY,GAAG,SAAS,CAAC;AACxD,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,YAAY,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,qBACa,mBAAoB,SAAQ,YAAY;IACnD,OAAO,CAAC,0BAA0B,CAAsC;IACxE,OAAO,CAAC,qBAAqB,CAAsC;IAEnE,OAAO,CAAC,qCAAqC,CAAsC;IACnF,OAAO,CAAC,wBAAwB,CAAmC;IAEnE;;OAEG;IACH,IAAI,WAAW,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAEnC;IACD;;OAEG;IACH,IAAI,iBAAiB,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAEzC;IAED,IAAI,oBAAoB,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAE5C;IACD,IAAI,uBAAuB,IAAI,KAAK,CAAC,OAAO,CAAC,CAE5C;IAGD,uCAAuC,CAAC,CAAC,EAAE,qCAAqC;IAKhF,4BAA4B,CAAC,CAAC,EAAE,0BAA0B;IAK1D,sBAAsB,CAAC,CAAC,EAAE,0BAA0B;IAKpD,0BAA0B,CAAC,CAAC,EAAE,wBAAwB;CAKvD"}

package/lib/browser/services/outline-event.service.js

@@ -6,30 +6,47 @@ const di_1 = require("@opensumi/di");
 const ide_core_browser_1 = require("@opensumi/ide-core-browser");
 const browser_1 = require("@opensumi/ide-editor/lib/browser");
 const document_symbol_1 = require("@opensumi/ide-editor/lib/browser/breadcrumb/document-symbol");
+const ide_main_layout_1 = require("@opensumi/ide-main-layout");
+const index_1 = require("../../common/index");
 let OutlineEventService = class OutlineEventService extends ide_core_browser_1.WithEventBus {
     constructor() {
         super(...arguments);
-        this._onDidChange = new ide_core_browser_1.Emitter();
+        this._onDidDocumentSymbolChange = new ide_core_browser_1.Emitter();
         this._onDidSelectionChange = new ide_core_browser_1.Emitter();
-        this._onDidActiveChange = new ide_core_browser_1.Emitter();
+        this._onDidEditorActiveResourceStateChange = new ide_core_browser_1.Emitter();
+        this._onDidViewCollapseChange = new ide_core_browser_1.Emitter();
     }
+    /**
+     * on did document symbol changed
+     */
     get onDidChange() {
-        return this._onDidChange.event;
+        return this._onDidDocumentSymbolChange.event;
     }
+    /**
+     * on did editor active resource state changed
+     */
     get onDidActiveChange() {
-        return this._onDidActiveChange.event;
+        return this._onDidEditorActiveResourceStateChange.event;
     }
     get onDidSelectionChange() {
         return this._onDidSelectionChange.event;
     }
+    get onDidViewCollapseChange() {
+        return this._onDidViewCollapseChange.event;
+    }
     onEditorActiveResourceStateChangedEvent(e) {
-        this._onDidActiveChange.fire(e.payload.editorUri);
+        this._onDidEditorActiveResourceStateChange.fire(e.payload.editorUri);
     }
     onEditorSelectionChangeEvent(e) {
         this._onDidSelectionChange.fire(e.payload.editorUri);
     }
     onDocumentSymbolChange(e) {
-        this._onDidChange.fire(e.payload);
+        this._onDidDocumentSymbolChange.fire(e.payload);
+    }
+    onViewCollapseChangedEvent(e) {
+        if (e.payload.viewId === index_1.OUTLINE_VIEW_ID) {
+            this._onDidViewCollapseChange.fire(e.payload.collapsed);
+        }
     }
 };
 tslib_1.__decorate([
@@ -50,6 +67,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [document_symbol_1.DocumentSymbolChangedEvent]),
     tslib_1.__metadata("design:returntype", void 0)
 ], OutlineEventService.prototype, "onDocumentSymbolChange", null);
+tslib_1.__decorate([
+    (0, ide_core_browser_1.OnEvent)(ide_main_layout_1.ViewCollapseChangedEvent),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [ide_main_layout_1.ViewCollapseChangedEvent]),
+    tslib_1.__metadata("design:returntype", void 0)
+], OutlineEventService.prototype, "onViewCollapseChangedEvent", null);
 OutlineEventService = tslib_1.__decorate([
     (0, di_1.Injectable)()
 ], OutlineEventService);

package/lib/browser/services/outline-event.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"outline-event.service.js","sourceRoot":"","sources":["../../../src/browser/services/outline-event.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,iEAAwF;AAExF,8DAAqH;AACrH,iGAAyG;AASlG,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,+BAAY;IAA9C;;QACG,iBAAY,GAAwB,IAAI,0BAAO,EAAE,CAAC;QAClD,0BAAqB,GAAwB,IAAI,0BAAO,EAAE,CAAC;QAC3D,uBAAkB,GAAwB,IAAI,0BAAO,EAAE,CAAC;IA4BlE,CAAC;IA1BC,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;IACvC,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAC1C,CAAC;IAGD,uCAAuC,CAAC,CAAwC;QAC9E,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;IACrD,CAAC;IAGD,4BAA4B,CAAC,CAA6B;QACxD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAGD,sBAAsB,CAAC,CAA6B;QAClD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACF,CAAA;AAdC;IAAC,IAAA,0BAAO,EAAC,+CAAqC,CAAC;;6CACJ,+CAAqC;;kFAE/E;AAED;IAAC,IAAA,0BAAO,EAAC,oCAA0B,CAAC;;6CACJ,oCAA0B;;uEAEzD;AAED;IAAC,IAAA,0BAAO,EAAC,4CAA0B,CAAC;;6CACV,4CAA0B;;iEAEnD;AA9BU,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CA+B/B;AA/BY,kDAAmB"}
+{"version":3,"file":"outline-event.service.js","sourceRoot":"","sources":["../../../src/browser/services/outline-event.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,iEAAwF;AAExF,8DAAqH;AACrH,iGAAyG;AACzG,+DAAqE;AAErE,8CAAqD;AAS9C,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,+BAAY;IAA9C;;QACG,+BAA0B,GAAwB,IAAI,0BAAO,EAAE,CAAC;QAChE,0BAAqB,GAAwB,IAAI,0BAAO,EAAE,CAAC;QAE3D,0CAAqC,GAAwB,IAAI,0BAAO,EAAE,CAAC;QAC3E,6BAAwB,GAAqB,IAAI,0BAAO,EAAE,CAAC;IA2CrE,CAAC;IAzCC;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;IAC/C,CAAC;IACD;;OAEG;IACH,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,qCAAqC,CAAC,KAAK,CAAC;IAC1D,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAC1C,CAAC;IACD,IAAI,uBAAuB;QACzB,OAAO,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC;IAC7C,CAAC;IAGD,uCAAuC,CAAC,CAAwC;QAC9E,IAAI,CAAC,qCAAqC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAU,CAAC,CAAC;IACxE,CAAC;IAGD,4BAA4B,CAAC,CAA6B;QACxD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAGD,sBAAsB,CAAC,CAA6B;QAClD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAClD,CAAC;IAGD,0BAA0B,CAAC,CAA2B;QACpD,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,uBAAe,EAAE;YACxC,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACzD;IACH,CAAC;CACF,CAAA;AArBC;IAAC,IAAA,0BAAO,EAAC,+CAAqC,CAAC;;6CACJ,+CAAqC;;kFAE/E;AAED;IAAC,IAAA,0BAAO,EAAC,oCAA0B,CAAC;;6CACJ,oCAA0B;;uEAEzD;AAED;IAAC,IAAA,0BAAO,EAAC,4CAA0B,CAAC;;6CACV,4CAA0B;;iEAEnD;AAED;IAAC,IAAA,0BAAO,EAAC,0CAAwB,CAAC;;6CACJ,0CAAwB;;qEAIrD;AA/CU,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CAgD/B;AAhDY,kDAAmB"}

package/lib/browser/services/outline-model.service.d.ts

@@ -12,6 +12,7 @@ export declare class OutlineModelService {
     private static DEFAULT_REFRESH_DELAY;
     private static DEFAULT_INIT_TREE_MODEL_DELAY;
     private readonly injector;
+    private readonly logger;
     private readonly outlineTreeService;
     private markerManager;
     decorationService: IOutlineDecorationService;
@@ -22,8 +23,8 @@ export declare class OutlineModelService {
     private readonly mainLayoutService;
     private _activeTreeModel;
     private _allTreeModels;
+    private _treeModelDisposeMap;
     private _whenInitTreeModelReady;
-    private _whenActiveChangeDeferred;
     private _whenReady;
     private _decorations;
     private _outlineTreeHandle;
@@ -35,6 +36,7 @@ export declare class OutlineModelService {
     private _selectedNodes;
     private disposableCollection;
     private onDidRefreshedEmitter;
+    private onLoadingStateChangedEmitter;
     private onDidUpdateTreeModelEmitter;
     private _ignoreFollowCursorUpdateEventTimer;
     private initTreeModelDelayer;
@@ -44,14 +46,16 @@ export declare class OutlineModelService {
     get flushEventQueuePromise(): Promise<void> | null;
     get outlineTreeHandle(): IEditorTreeHandle;
     get decorations(): DecorationsManager;
-    get treeModel(): OutlineTreeModel;
+    get treeModel(): OutlineTreeModel | undefined;
     get focusedNode(): OutlineCompositeTreeNode | OutlineTreeNode | undefined;
     get selectedNodes(): (OutlineCompositeTreeNode | OutlineTreeNode)[];
+    get onLoadingStateChange(): Event<boolean>;
     get onDidRefreshed(): Event<void>;
     get onDidUpdateTreeModel(): Event<OutlineTreeModel | undefined>;
-    get whenActiveChangeReady(): Promise<void> | undefined;
     get whenInitTreeModelReady(): Promise<void>;
     get whenRefreshReady(): Promise<void> | undefined;
+    private setTreeModel;
+    private doInitTreeModelByCurrentUri;
     initTreeModelByCurrentUri(uri?: URI | null): Promise<void>;
     initTreeModel(): Promise<void>;
     initDecorations(root: any): DecorationsManager;
@@ -74,7 +78,7 @@ export declare class OutlineModelService {
      * 刷新指定下的所有子节点
      */
     refresh(): Promise<void>;
-    flushEventQueue: () => Promise<any> | undefined;
+    flushEventQueue: () => Promise<null[]> | undefined;
     location: (node: OutlineTreeNode) => Promise<void>;
     collapseAll: () => Promise<void>;
     dispose(): void;

package/lib/browser/services/outline-model.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outline-model.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/outline-model.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAc,kBAAkB,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AACxH,OAAO,EACL,GAAG,EAGH,cAAc,EAEd,KAAK,EASN,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAEL,yBAAyB,EAC1B,MAAM,6DAA6D,CAAC;AAKrE,OAAO,EAAE,yBAAyB,EAAmB,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,wBAAwB,EAAe,MAAM,wBAAwB,CAAC;AAGhG,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAKnD,MAAM,WAAW,iBAAkB,SAAQ,kBAAkB;IAC3D,cAAc,EAAE,MAAM,OAAO,CAAC;CAC/B;AAED,qBACa,mBAAmB;IAC9B,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAO;IAC3C,OAAO,CAAC,MAAM,CAAC,6BAA6B,CAAO;IAGnD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAGpC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,OAAO,CAAC,aAAa,CAAgB;IAG9B,iBAAiB,EAAE,yBAAyB,CAAC;IAEpD,SACgB,mBAAmB,EAAE,mBAAmB,CAAC;IAGzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAEvD,SACgB,cAAc,EAAE,cAAc,CAAC;IAG/C,OAAO,CAAC,mBAAmB,CAAsB;IAGjD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IAEvD,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,cAAc,CAA2F;IACjH,OAAO,CAAC,uBAAuB,CAAgB;IAC/C,OAAO,CAAC,yBAAyB,CAAwB;IAEzD,OAAO,CAAC,UAAU,CAAgB;IAElC,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,kBAAkB,CAAoB;IAE9C,OAAO,CAAC,eAAe,CAAwB;IAC/C,OAAO,CAAC,yBAAyB,CAAgB;IAGjD,OAAO,CAAC,kBAAkB,CAAmD;IAC7E,OAAO,CAAC,iBAAiB,CAAkD;IAE3E,OAAO,CAAC,YAAY,CAAyD;IAE7E,OAAO,CAAC,cAAc,CAAsD;IAE5E,OAAO,CAAC,oBAAoB,CAAoD;IAEhF,OAAO,CAAC,qBAAqB,CAAgC;IAC7D,OAAO,CAAC,2BAA2B,CAAwD;IAE3F,OAAO,CAAC,mCAAmC,CAAK;IAChD,OAAO,CAAC,oBAAoB,CAAyB;IACrD,OAAO,CAAC,cAAc,CAAyB;;IAQ/C,IAAI,SAAS,kBAEZ;IAED,IAAI,sBAAsB,yBAEzB;IAED,IAAI,iBAAiB,sBAEpB;IAED,IAAI,WAAW,uBAEd;IAED,IAAI,SAAS,qBAEZ;IAGD,IAAI,WAAW,2DAEd;IAED,IAAI,aAAa,mDAEhB;IAED,IAAI,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC,CAEhC;IAED,IAAI,oBAAoB,IAAI,KAAK,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAE9D;IAED,IAAI,qBAAqB,8BAExB;IAED,IAAI,sBAAsB,kBAEzB;IAED,IAAI,gBAAgB,8BAEnB;IAEK,yBAAyB,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI;IA+C1C,aAAa;IAoEnB,eAAe,CAAC,IAAI,KAAA;IAOpB,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,yBAAyB;IA0BjC,OAAO,CAAC,eAAe;IAcvB,2BAA2B,aAKzB;IAGF,oBAAoB,WAAY,wBAAwB,GAAG,eAAe,8BAgBxE;IAGF,oBAAoB,WAAY,wBAAwB,GAAG,eAAe,8BAgBxE;IAIF,2BAA2B,WACjB,wBAAwB,GAAG,eAAe,gDAsBlD;IAGF,4BAA4B,WAAY,wBAAwB,GAAG,eAAe,UAahF;IAGF,sBAAsB,aAMpB;IAEF,oBAAoB;IAQpB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB;IAI3C,cAAc,aAGZ;IAEF,eAAe,SAAU,wBAAwB,GAAG,eAAe,QAAQ,YAAY,UAOrF;IAEF,eAAe,SAAgB,wBAAwB,mBAMrD;IAEF,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,yBAAyB;IAQvD;;OAEG;IACG,OAAO;IA+CN,eAAe,iCA8BpB;IAEK,QAAQ,SAAgB,eAAe,mBAS5C;IAEK,WAAW,sBAGhB;IAEF,OAAO;CAGR"}
+{"version":3,"file":"outline-model.service.d.ts","sourceRoot":"","sources":["../../../src/browser/services/outline-model.service.ts"],"names":[],"mappings":"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"}

package/lib/browser/services/outline-model.service.js

@@ -19,7 +19,8 @@ const outline_tree_service_1 = require("./outline-tree.service");
 const { Path } = ide_core_browser_1.path;
 let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
     constructor() {
-        this._allTreeModels = new Map();
+        this._allTreeModels = new ide_core_browser_1.LRUMap(100, 80);
+        this._treeModelDisposeMap = new ide_core_browser_1.DisposableMap();
         this._changeEventDispatchQueue = [];
         // 装饰器
         this.selectedDecoration = new ide_components_1.Decoration(outline_node_module_less_1.default.mod_selected); // 选中态
@@ -28,6 +29,7 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
         this._selectedNodes = [];
         this.disposableCollection = new ide_core_browser_1.DisposableCollection();
         this.onDidRefreshedEmitter = new ide_core_browser_1.Emitter();
+        this.onLoadingStateChangedEmitter = new ide_core_browser_1.Emitter();
         this.onDidUpdateTreeModelEmitter = new ide_core_browser_1.Emitter();
         this._ignoreFollowCursorUpdateEventTimer = 0;
         // 清空所有节点选中态
@@ -142,7 +144,6 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
             }
         };
         this.flushEventQueue = () => {
-            let promise;
             if (!this._changeEventDispatchQueue || this._changeEventDispatchQueue.length === 0) {
                 return;
             }
@@ -160,9 +161,9 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
                     roots.push(path);
                 }
             }
-            promise = (0, ide_core_browser_1.pSeries)(roots.map((path) => async () => {
-                var _a;
-                const watcher = (_a = this.treeModel.root) === null || _a === void 0 ? void 0 : _a.watchEvents.get(path);
+            const promise = (0, ide_core_browser_1.pSeries)(roots.map((path) => async () => {
+                var _a, _b;
+                const watcher = (_b = (_a = this.treeModel) === null || _a === void 0 ? void 0 : _a.root) === null || _b === void 0 ? void 0 : _b.watchEvents.get(path);
                 if (watcher && typeof watcher.callback === 'function') {
                     await watcher.callback({ type: ide_components_1.WatchEvent.Changed, path });
                 }
@@ -215,16 +216,15 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
     get selectedNodes() {
         return this._selectedNodes;
     }
+    get onLoadingStateChange() {
+        return this.onLoadingStateChangedEmitter.event;
+    }
     get onDidRefreshed() {
         return this.onDidRefreshedEmitter.event;
     }
     get onDidUpdateTreeModel() {
         return this.onDidUpdateTreeModelEmitter.event;
     }
-    get whenActiveChangeReady() {
-        var _a;
-        return (_a = this._whenActiveChangeDeferred) === null || _a === void 0 ? void 0 : _a.promise;
-    }
     get whenInitTreeModelReady() {
         return this._whenInitTreeModelReady;
     }
@@ -232,52 +232,62 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
         var _a;
         return (_a = this.refreshDeferred) === null || _a === void 0 ? void 0 : _a.promise;
     }
-    async initTreeModelByCurrentUri(uri) {
-        var _a;
-        await this.outlineTreeService.whenReady;
-        // 等待上一次刷新完成
-        await ((_a = this.refreshDeferred) === null || _a === void 0 ? void 0 : _a.promise);
-        this.outlineTreeService.currentUri = uri;
-        if (!!uri && this._allTreeModels.has(uri.toString())) {
-            const treeModelStore = this._allTreeModels.get(uri.toString());
-            // 初始化节点装饰器
-            this._activeTreeModel = treeModelStore.treeModel;
-            this._decorations = treeModelStore.decoration;
-            this.onDidUpdateTreeModelEmitter.fire(this._activeTreeModel);
-        }
-        else if (uri) {
-            // 根据是否为多工作区创建不同根节点
+    setTreeModel(treeModel) {
+        this._activeTreeModel = treeModel;
+        this.onDidUpdateTreeModelEmitter.fire(this._activeTreeModel);
+    }
+    async doInitTreeModelByCurrentUri(uri) {
+        let treeModel;
+        if (uri) {
+            // FIXME: 根据是否为多工作区创建不同根节点
             const root = (await this.outlineTreeService.resolveChildren())[0];
             if (!root) {
+                this.logger.error(`init outline tree model error: cannot resolve ${uri} children`);
                 return;
             }
-            const treeModel = this.injector.get(outline_model_1.OutlineTreeModel, [root]);
+            treeModel = this.injector.get(outline_model_1.OutlineTreeModel, [root]);
             await treeModel.ensureReady;
-            this._activeTreeModel = treeModel;
             // 初始化节点装饰器
             const decoration = this.initDecorations(root);
-            if (uri) {
-                this._allTreeModels.set(uri === null || uri === void 0 ? void 0 : uri.toString(), {
-                    treeModel,
-                    decoration,
-                });
+            if (this._allTreeModels.has(uri.toString())) {
+                this._allTreeModels.delete(uri.toString());
             }
-            this.disposableCollection.push(treeModel.onWillUpdate(() => {
+            this._allTreeModels.set(uri.toString(), {
+                treeModel,
+                decoration,
+            });
+            this.disposableCollection.push(this._allTreeModels.onKeyDidDelete(uri.toString(), ({ key }) => {
+                this._treeModelDisposeMap.disposeKey(key);
+            }));
+            this._treeModelDisposeMap.set(uri.toString(), treeModel.onWillUpdate(() => {
                 if (this.focusedNode) {
                     // 更新树前更新下选中节点
-                    const node = treeModel === null || treeModel === void 0 ? void 0 : treeModel.root.getTreeNodeById(this.focusedNode.id);
+                    const node = treeModel.root.getTreeNodeById(this.focusedNode.id);
                     this.activeNodeDecoration(node, false);
                 }
                 else if (this.selectedNodes.length !== 0) {
                     // 仅处理一下单选情况
-                    const node = treeModel === null || treeModel === void 0 ? void 0 : treeModel.root.getTreeNodeById(this.selectedNodes[0].id);
+                    const node = treeModel.root.getTreeNodeById(this.selectedNodes[0].id);
                     this.selectNodeDecoration(node, false);
                 }
             }));
-            this.onDidUpdateTreeModelEmitter.fire(treeModel);
+        }
+        this.setTreeModel(treeModel);
+        return treeModel;
+    }
+    async initTreeModelByCurrentUri(uri) {
+        var _a;
+        await this.outlineTreeService.whenReady;
+        // 等待上一次刷新完成
+        await ((_a = this.refreshDeferred) === null || _a === void 0 ? void 0 : _a.promise);
+        this.outlineTreeService.currentUri = uri;
+        if (uri && this._allTreeModels.has(uri.toString())) {
+            const treeModelStore = this._allTreeModels.get(uri.toString());
+            this._decorations = treeModelStore.decoration;
+            this.setTreeModel(treeModelStore.treeModel);
         }
         else {
-            this.onDidUpdateTreeModelEmitter.fire(undefined);
+            await this.doInitTreeModelByCurrentUri(uri);
         }
     }
     async initTreeModel() {
@@ -291,14 +301,12 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
             }
         }));
         this.disposableCollection.push(this.outlineEventService.onDidActiveChange(async () => {
-            if (!this._whenActiveChangeDeferred) {
-                this._whenActiveChangeDeferred = new ide_core_browser_1.Deferred();
-            }
             if (!this.initTreeModelDelayer.isTriggered()) {
                 this.initTreeModelDelayer.cancel();
             }
+            this.onLoadingStateChangedEmitter.fire(true);
             this.initTreeModelDelayer.trigger(async () => {
-                var _a, _b;
+                var _a;
                 await this._whenInitTreeModelReady;
                 // 初始化时如果存在还未刷新的执行逻辑时，需要进行清理
                 if (!this.refreshDelayer.isTriggered()) {
@@ -306,8 +314,7 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
                 }
                 const uri = (_a = this.editorService.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri;
                 this._whenInitTreeModelReady = this.initTreeModelByCurrentUri(uri);
-                (_b = this._whenActiveChangeDeferred) === null || _b === void 0 ? void 0 : _b.resolve();
-                this._whenActiveChangeDeferred = null;
+                this.onLoadingStateChangedEmitter.fire(false);
             });
         }));
         this.disposableCollection.push(this.outlineEventService.onDidSelectionChange(() => {
@@ -317,10 +324,18 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
                 this.locateSelection(false);
             }
         }));
-        this.disposableCollection.push(this.outlineEventService.onDidChange((url) => {
-            var _a;
-            this.outlineTreeService.currentUri = (_a = this.editorService.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri;
-            this.refresh();
+        this.disposableCollection.push(this.outlineEventService.onDidChange((uri) => {
+            var _a, _b;
+            if (uri === ((_a = this.editorService.currentEditor) === null || _a === void 0 ? void 0 : _a.currentUri)) {
+                // 因为刷新 children 那个函数不能传 currentUri，这里利用一下副作用
+                this.outlineTreeService.currentUri = (_b = this.editorService.currentEditor) === null || _b === void 0 ? void 0 : _b.currentUri;
+                this.refresh();
+            }
+        }));
+        this.disposableCollection.push(this.outlineEventService.onDidViewCollapseChange((collapsed) => {
+            if (!collapsed) {
+                this.refresh();
+            }
         }));
         this.disposableCollection.push(this.outlineTreeService.onDidChange(() => {
             this.refresh();
@@ -413,15 +428,16 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
      * 刷新指定下的所有子节点
      */
     async refresh() {
-        var _a, _b, _c, _d, _e, _f, _g;
-        await this.whenActiveChangeReady;
+        var _a, _b, _c, _d, _e;
+        this.onLoadingStateChangedEmitter.fire(true);
         await this.whenInitTreeModelReady;
         await this.whenRefreshReady;
         const node = (_a = this.treeModel) === null || _a === void 0 ? void 0 : _a.root;
-        if ((!node && ((_c = (_b = this.editorService) === null || _b === void 0 ? void 0 : _b.currentEditor) === null || _c === void 0 ? void 0 : _c.currentUri)) || !((_e = (_d = this.editorService) === null || _d === void 0 ? void 0 : _d.currentEditor) === null || _e === void 0 ? void 0 : _e.currentUri)) {
+        if (!node || !((_c = (_b = this.editorService) === null || _b === void 0 ? void 0 : _b.currentEditor) === null || _c === void 0 ? void 0 : _c.currentUri)) {
             // 1. 初次加载时可能还没有初始化Tree，主要原因在于没办法在outline加载时准确把握拿到currentEditor的时机
             // 2. 当前没有激活的URI时，需要情况当前的Tree
-            this._whenInitTreeModelReady = this.initTreeModelByCurrentUri((_g = (_f = this.editorService) === null || _f === void 0 ? void 0 : _f.currentEditor) === null || _g === void 0 ? void 0 : _g.currentUri);
+            this._whenInitTreeModelReady = this.initTreeModelByCurrentUri((_e = (_d = this.editorService) === null || _d === void 0 ? void 0 : _d.currentEditor) === null || _e === void 0 ? void 0 : _e.currentUri);
+            this.onLoadingStateChangedEmitter.fire(false);
             return;
         }
         if (!this.refreshDelayer.isTriggered()) {
@@ -435,14 +451,15 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
                     this.refreshDeferred.resolve();
                     this.refreshDeferred = null;
                 }
+                this.onLoadingStateChangedEmitter.fire(false);
                 return;
             }
             if (!this.refreshDeferred) {
                 this.refreshDeferred = new ide_core_browser_1.Deferred();
             }
             this.outlineTreeService.currentUri = (_b = (_a = this.editorService) === null || _a === void 0 ? void 0 : _a.currentEditor) === null || _b === void 0 ? void 0 : _b.currentUri;
-            if (!!node.currentUri &&
-                !!this.outlineTreeService.currentUri &&
+            if (node.currentUri &&
+                this.outlineTreeService.currentUri &&
                 this.outlineTreeService.currentUri.isEqual(node.currentUri)) {
                 // 刷新前需要更新诊断信息数据
                 this.decorationService.updateDiagnosisInfo(this.outlineTreeService.currentUri);
@@ -452,10 +469,12 @@ let OutlineModelService = OutlineModelService_1 = class OutlineModelService {
             }
             (_c = this.refreshDeferred) === null || _c === void 0 ? void 0 : _c.resolve();
             this.refreshDeferred = null;
+            this.onLoadingStateChangedEmitter.fire(false);
         });
     }
     dispose() {
         this.disposableCollection.dispose();
+        this._treeModelDisposeMap.dispose();
     }
 };
 OutlineModelService.DEFAULT_REFRESH_DELAY = 200;
@@ -464,6 +483,10 @@ tslib_1.__decorate([
     (0, di_1.Autowired)(di_1.INJECTOR_TOKEN),
     tslib_1.__metadata("design:type", di_1.Injector)
 ], OutlineModelService.prototype, "injector", void 0);
+tslib_1.__decorate([
+    (0, di_1.Autowired)(ide_core_browser_1.ILogger),
+    tslib_1.__metadata("design:type", Object)
+], OutlineModelService.prototype, "logger", void 0);
 tslib_1.__decorate([
     (0, di_1.Autowired)(outline_tree_service_1.OutlineTreeService),
     tslib_1.__metadata("design:type", outline_tree_service_1.OutlineTreeService)