@opensumi/ide-editor 3.2.5-next-1724743242.0 → 3.2.5

package/lib/common/editor.js.map

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

package/lib/common/index.d.ts

@@ -4,5 +4,4 @@ export * from './resource';
 export * from './language';
 export * from './utils';
 export * from './language-status';
-export * from './components';
 //# sourceMappingURL=index.d.ts.map

package/lib/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC;AAClC,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,mBAAmB,CAAC"}

package/lib/common/index.js

@@ -7,5 +7,4 @@ tslib_1.__exportStar(require("./resource"), exports);
 tslib_1.__exportStar(require("./language"), exports);
 tslib_1.__exportStar(require("./utils"), exports);
 tslib_1.__exportStar(require("./language-status"), exports);
-tslib_1.__exportStar(require("./components"), exports);
 //# sourceMappingURL=index.js.map

package/lib/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,mDAAyB;AACzB,qDAA2B;AAC3B,qDAA2B;AAC3B,kDAAwB;AACxB,4DAAkC;AAClC,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":";;;AAAA,sDAA4B;AAC5B,mDAAyB;AACzB,qDAA2B;AAC3B,qDAA2B;AAC3B,kDAAwB;AACxB,4DAAkC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-editor",
-  "version": "3.2.5-next-1724743242.0",
+  "version": "3.2.5",
   "files": [
     "lib",
     "src"
@@ -17,21 +17,21 @@
     "url": "git@github.com:opensumi/core.git"
   },
   "dependencies": {
-    "@opensumi/ide-core-common": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-core-node": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-file-service": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-monaco": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-utils": "3.2.5-next-1724743242.0",
+    "@opensumi/ide-core-common": "3.2.5",
+    "@opensumi/ide-core-node": "3.2.5",
+    "@opensumi/ide-file-service": "3.2.5",
+    "@opensumi/ide-monaco": "3.2.5",
+    "@opensumi/ide-utils": "3.2.5",
     "vscode-oniguruma": "1.5.1"
   },
   "devDependencies": {
-    "@opensumi/ide-components": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-core-browser": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-dev-tool": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-overlay": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-quick-open": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-theme": "3.2.5-next-1724743242.0",
-    "@opensumi/ide-workspace": "3.2.5-next-1724743242.0"
+    "@opensumi/ide-components": "3.2.5",
+    "@opensumi/ide-core-browser": "3.2.5",
+    "@opensumi/ide-dev-tool": "3.2.5",
+    "@opensumi/ide-overlay": "3.2.5",
+    "@opensumi/ide-quick-open": "3.2.5",
+    "@opensumi/ide-theme": "3.2.5",
+    "@opensumi/ide-workspace": "3.2.5"
   },
-  "gitHead": "81022dbcbf07564d2b732b00355f04d6ebb007bf"
+  "gitHead": "879ad36cb2e8e5bc9d928cf7d8bb003de7f0b7b3"
 }

package/src/browser/doc-model/editor-document-model-service.ts

@@ -23,7 +23,7 @@ import { IHashCalculateService } from '@opensumi/ide-core-common/lib/hash-calcul
 import { IFileServiceClient } from '@opensumi/ide-file-service';
 import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
-import { IEditorDocumentDescription, IEditorDocumentModel } from '../../common/editor';
+import { IEditorDocumentModel } from '../../common/editor';
 
 import { EditorDocumentModel } from './editor-document-model';
 import {
@@ -230,30 +230,6 @@ export class EditorDocumentModelServiceImpl extends WithEventBus implements IEdi
     return this._modelReferenceManager.getReferenceIfHasInstance(uri.toString(), reason);
   }
 
-  getModelDescription(uri: URI, reason?: string): IEditorDocumentDescription | null {
-    const ref = this.getModelReference(uri, reason);
-    if (!ref) {
-      return null;
-    }
-
-    const instance = ref.instance;
-    const resullt = {
-      alwaysDirty: instance.alwaysDirty,
-      closeAutoSave: instance.closeAutoSave,
-      disposeEvenDirty: instance.disposeEvenDirty,
-      eol: instance.eol,
-      encoding: instance.encoding,
-      dirty: instance.dirty,
-      languageId: instance.languageId,
-      readonly: instance.readonly,
-      uri: instance.uri,
-      id: instance.id,
-      savable: instance.savable,
-    };
-    ref.dispose();
-    return resullt;
-  }
-
   getAllModels(): IEditorDocumentModel[] {
     return Array.from(this.editorDocModels.values());
   }

package/src/browser/doc-model/editor-document-model.ts

@@ -360,25 +360,7 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
     return this.monacoModel;
   }
 
-  async syncDocumentModelToExtThread() {
-    await this.eventBus.fireAndAwait(
-      new EditorDocumentModelOptionChangedEvent({
-        uri: this.uri,
-        languageId: this.languageId,
-        encoding: this.encoding,
-        eol: this.eol,
-        dirty: this.dirty,
-      }),
-    );
-  }
-
   async save(force = false, reason: SaveReason = SaveReason.Manual): Promise<boolean> {
-    if (!this.dirty) {
-      // 如果文档内容没有变化，则只同步新状态到插件进程
-      await this.syncDocumentModelToExtThread();
-      return false;
-    }
-
     const provider = await this.contentRegistry.getProvider(this.uri);
     const isReadonly = await provider?.isReadonly(this.uri);
 

package/src/browser/doc-model/saveParticipants.ts

@@ -283,7 +283,6 @@ export class TrimFinalNewLinesParticipant extends WithEventBus {
 
       const model = modelRef.instance.getMonacoModel();
       this.doTrimFinalNewLines(model, e.payload.reason !== SaveReason.Manual);
-      modelRef.dispose();
     }
   }
 

package/src/browser/doc-model/types.ts

@@ -12,7 +12,7 @@ import * as monaco from '@opensumi/ide-monaco';
 import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
 import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
-import { IEditorDocumentDescription, IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
+import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
 
 export interface IDocModelUpdateOptions extends monaco.editor.ITextModelUpdateOptions {
   detectIndentation?: boolean;
@@ -130,7 +130,6 @@ export interface IEditorDocumentModelService {
    * 当文档从来没有被打开过时，返回null
    */
   getModelReference(uri: URI, reason?: string): IEditorDocumentModelRef | null;
-  getModelDescription(uri: URI, reason?: string): IEditorDocumentDescription | null;
 
   /**
    * 获得全部model
@@ -194,7 +193,6 @@ export interface IEditorDocumentModelOptionChangedEventPayload {
   encoding?: string;
   languageId?: string;
   eol?: EOL;
-  dirty?: boolean;
 }
 
 export class EditorDocumentModelCreationEvent extends BasicEvent<IEditorDocumentModelCreationEventPayload> {}

package/src/browser/editor.contribution.ts

@@ -808,12 +808,7 @@ export class EditorContribution
           return;
         }
 
-        const ref = this.editorDocumentModelService.getModelDescription(uri);
-        if (!ref) {
-          return;
-        }
-
-        return ref.encoding;
+        return this.editorDocumentModelService.getModelReference(uri)?.instance.encoding;
       },
     });
 
@@ -837,8 +832,8 @@ export class EditorContribution
 
         const provider = await this.contentRegistry.getProvider(uri);
         const guessedEncoding = await provider?.guessEncoding?.(uri);
-        const ref = this.editorDocumentModelService.getModelDescription(uri);
-        const currentEncoding = documentModel?.encoding ?? ref?.encoding;
+        const ref = this.editorDocumentModelService.getModelReference(uri);
+        const currentEncoding = documentModel?.encoding ?? ref?.instance.encoding;
 
         let matchIndex: number | undefined;
         const encodingItems: QuickPickItem<string>[] = Object.keys(SUPPORTED_ENCODINGS)

package/src/browser/editor.module.less

@@ -48,7 +48,6 @@
     position: absolute;
     width: 100%;
     height: 100%;
-    pointer-events: none;
   }
   .kt_editor_tabs {
     display: flex;
@@ -74,7 +73,7 @@
         left: 0;
         position: absolute;
         display: block;
-        z-index: var(--stacking-level-background, 0);
+        z-index: 0;
       }
       &::after {
         content: '';
@@ -85,7 +84,7 @@
         left: 0;
         position: absolute;
         display: block;
-        z-index: var(--stacking-level-background, 0);
+        z-index: 0;
       }
       .editor_action_wrapper {
         margin-left: 8px;
@@ -133,6 +132,12 @@
     }
   }
 
+  .kt_editor_tabs_scroll_wrapper {
+    flex-grow: 1;
+    width: 100%;
+    position: relative;
+  }
+
   .kt_editor_tabs_scroll {
     overflow-y: hidden;
     :global(.loading_indicator) {
@@ -170,7 +175,7 @@
         left: 0;
         position: absolute;
         display: block;
-        z-index: var(--stacking-level-background, 0);
+        z-index: 0;
       }
     }
   }
@@ -179,7 +184,7 @@
   }
   .kt_editor_tabs_content {
     overflow-y: hidden;
-    display: flex;
+    display: inline-flex;
     position: relative;
     height: 100%;
     &.kt_on_drag_over {
@@ -192,6 +197,8 @@
       display: flex;
       position: relative;
       align-items: center;
+      flex-shrink: 1;
+      flex-grow: 1;
       padding: 0 12px;
       border-right: 1px solid var(--tab-border);
       height: 100%;
@@ -202,6 +209,7 @@
       color: var(--tab-inactiveForeground);
       background: var(--tab-inactiveBackground);
       border-top: 1px solid transparent;
+      box-sizing: border-box;
       z-index: 1;
       word-break: keep-all;
       white-space: nowrap;
@@ -296,7 +304,7 @@
         position: relative;
         background: var(--tab-activeBackground);
         color: var(--tab-activeForeground);
-        z-index: var(--stacking-level-editor-tabbar-current, 11);
+        z-index: 11;
         &::before {
           position: absolute;
           content: '';
@@ -304,7 +312,7 @@
           width: 100%;
           top: -1px;
           left: 0;
-          z-index: var(--stacking-level-overlay, 800);
+          z-index: 999;
           background-color: var(--tab-activeBorderTop);
         }
         .dirty {
@@ -340,7 +348,7 @@
   }
 
   .editorGroupHeader {
-    z-index: var(--stacking-level-workbench, 1);
+    z-index: 0;
     position: relative;
   }
 
@@ -481,7 +489,7 @@
   .overlay-shadow();
   border-radius: 2px;
   padding: 5px 10px;
-  z-index: var(--stacking-level-overlay-top, 1000);
+  z-index: 10001;
   white-space: nowrap;
   .editor_action_tip_close {
     cursor: pointer;

package/src/browser/editor.view.tsx

@@ -17,10 +17,8 @@ import {
   PreferenceService,
   URI,
   View,
-  renderView,
   useDesignStyles,
   useDisposable,
-  usePreference,
 } from '@opensumi/ide-core-browser';
 import {
   IResizeHandleDelegate,
@@ -243,6 +241,7 @@ const EditorEmptyComponent: React.FC<{
 export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
   const groupWrapperRef = React.useRef<HTMLElement | null>();
 
+  const preferenceService = useInjectable(PreferenceService) as PreferenceService;
   const [isEmpty, setIsEmpty] = React.useState(group.resources.length === 0);
   const styles_kt_editor_group = useDesignStyles(styles.kt_editor_group, 'kt_editor_group');
 
@@ -264,7 +263,20 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
     };
   }, []);
 
-  const showActionWhenGroupEmpty = usePreference('editor.showActionWhenGroupEmpty', false);
+  const [showActionWhenGroupEmpty, setShowActionWhenGroupEmpty] = React.useState(
+    () => !!preferenceService.get<boolean>('editor.showActionWhenGroupEmpty'),
+  );
+
+  useDisposable(
+    () => [
+      preferenceService.onPreferenceChanged((change) => {
+        if (change.preferenceName === 'editor.showActionWhenGroupEmpty') {
+          setShowActionWhenGroupEmpty(!!change.newValue);
+        }
+      }),
+    ],
+    [],
+  );
 
   const componentRegistry = useInjectable<ComponentRegistry>(ComponentRegistry);
 
@@ -302,7 +314,12 @@ export const EditorGroupView = observer(({ group }: { group: EditorGroup }) => {
             backgroundImage: !EmptyEditorViewConfig && editorBackgroundImage ? `url(${editorBackgroundImage})` : 'none',
           }}
         >
-          {renderView(EmptyEditorViewConfig)}
+          {EmptyEditorViewConfig && ReactIs.isValidElementType(EmptyEditorViewConfig.component) ? (
+            <ErrorBoundary>
+              {EmptyEditorViewConfig.component &&
+                React.createElement(EmptyEditorViewConfig.component, EmptyEditorViewConfig.initialProps)}
+            </ErrorBoundary>
+          ) : null}
         </div>
       )}
     </div>

package/src/browser/format/formatter-selector.ts

@@ -47,11 +47,12 @@ export class FormattingSelector implements IFormattingSelector {
     mode: FormattingMode,
     _kind: FormattingKind,
   ): Promise<T | undefined> {
-    const docDesc = this.modelService.getModelDescription(URI.from(document.uri.toJSON()));
-    if (!docDesc) {
+    const docRef = this.modelService.getModelReference(URI.from(document.uri.toJSON()));
+    if (!docRef) {
       return;
     }
-    const languageId = docDesc.languageId;
+    const languageId = docRef.instance.languageId;
+    docRef.dispose();
     const preferred = this.getPreferedFormatter(languageId);
 
     const elements: { [key: string]: T } = {};
@@ -119,11 +120,12 @@ export class FormattingSelector implements IFormattingSelector {
     formatters: T[],
     document: ITextModel,
   ): Promise<T | undefined> {
-    const docDesc = this.modelService.getModelDescription(URI.from(document.uri.toJSON()));
-    if (!docDesc) {
+    const docRef = this.modelService.getModelReference(URI.from(document.uri.toJSON()));
+    if (!docRef) {
       return;
     }
-    const languageId = docDesc.languageId;
+    const languageId = docRef.instance.languageId;
+    docRef.dispose();
 
     const elements: { [key: string]: T } = {};
     formatters.forEach((provider: T) => {

package/src/browser/fs-resource/fs-resource.ts

@@ -181,8 +181,8 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
     this.cachedFileStat.delete(resource.uri.toString());
   }
   async shouldCloseResourceWithoutConfirm(resource: IResource) {
-    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
-    if (documentModelRef && documentModelRef.dirty) {
+    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
+    if (documentModelRef && documentModelRef.instance.dirty) {
       return true;
     }
     return false;
@@ -204,7 +204,6 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
       documentModelRef.dispose();
       return false;
     } else {
-      documentModelRef.dispose();
       return true;
     }
   }
@@ -223,8 +222,11 @@ export class FileSystemResourceProvider extends WithEventBus implements IResourc
         }
       }
     }
-    const documentModelRef = this.documentModelService.getModelDescription(resource.uri, 'close-resource-check');
-    if (!documentModelRef || !documentModelRef.dirty) {
+    const documentModelRef = this.documentModelService.getModelReference(resource.uri, 'close-resource-check');
+    if (!documentModelRef || !documentModelRef.instance.dirty) {
+      if (documentModelRef) {
+        documentModelRef.dispose();
+      }
       return true;
     }
 

package/src/browser/grid/grid.service.ts

@@ -1,5 +1,5 @@
 import { Emitter, IDisposable, IEventBus, MaybeNull } from '@opensumi/ide-core-browser';
-import { DisposableStore, makeRandomHexString } from '@opensumi/ide-core-common';
+import { makeRandomHexString } from '@opensumi/ide-core-common';
 
 import { Direction, IEditorGroup, IEditorGroupState } from '../../common';
 import { GridResizeEvent } from '../types';
@@ -7,19 +7,17 @@ import { GridResizeEvent } from '../types';
 export const editorGridUid = new Set();
 
 export class EditorGrid implements IDisposable {
-  private _disposables = new DisposableStore();
-
   public editorGroup: IGridEditorGroup | null = null;
 
   public children: EditorGrid[] = [];
 
   public splitDirection: SplitDirection | undefined;
 
-  protected readonly _onDidGridStateChange = this._disposables.add(new Emitter<void>());
+  protected readonly _onDidGridStateChange = new Emitter<void>();
 
   public readonly onDidGridStateChange = this._onDidGridStateChange.event;
 
-  protected readonly _onDidGridAndDesendantStateChange = this._disposables.add(new Emitter<void>());
+  protected readonly _onDidGridAndDesendantStateChange = new Emitter<void>();
 
   public readonly onDidGridAndDesendantStateChange = this._onDidGridAndDesendantStateChange.event;
 
@@ -32,12 +30,10 @@ export class EditorGrid implements IDisposable {
     }
     this.uid = uid;
     editorGridUid.add(uid);
-    this._disposables.add(
-      this.onDidGridStateChange(() => {
-        this._onDidGridAndDesendantStateChange.fire();
-        this.parent?._onDidGridAndDesendantStateChange.fire();
-      }),
-    );
+    this.onDidGridStateChange(() => {
+      this._onDidGridAndDesendantStateChange.fire();
+      this.parent?._onDidGridAndDesendantStateChange.fire();
+    });
   }
 
   setEditorGroup(editorGroup: IGridEditorGroup) {
@@ -110,8 +106,6 @@ export class EditorGrid implements IDisposable {
     } else {
       // 应该不会落入这里
     }
-
-    this._disposables.dispose();
   }
 
   public replaceBy(target: EditorGrid) {

package/src/browser/hooks/useEditor.ts

@@ -1,35 +1,34 @@
 import { useEffect, useState } from 'react';
 
-import { DisposableStore, URI, useInjectable } from '@opensumi/ide-core-browser';
+import { URI, useInjectable } from '@opensumi/ide-core-browser';
 
 import { IEditorDocumentModelService } from '../doc-model/types';
-import { IEditorDocumentModel } from '../types';
+import { IEditorDocumentModelRef } from '../types';
 
-export function useEditorDocumentModel(uri: URI) {
+export function useEditorDocumentModelRef(uri: URI) {
   const documentService: IEditorDocumentModelService = useInjectable(IEditorDocumentModelService);
-  const [instance, setInstance] = useState<IEditorDocumentModel | null>(null);
+  const [ref, setRef] = useState<IEditorDocumentModelRef | null>(null);
 
   useEffect(() => {
-    const toDispose = new DisposableStore();
     const run = () => {
       const ref = documentService.getModelReference(uri);
       if (ref) {
-        setInstance(ref.instance);
-        ref.dispose();
+        setRef(ref);
       }
     };
 
-    toDispose.add(
-      documentService.onDocumentModelCreated(uri.toString(), () => {
-        run();
-      }),
-    );
+    const toDispose = documentService.onDocumentModelCreated(uri.toString(), () => {
+      run();
+    });
 
     run();
     return () => {
       toDispose.dispose();
+      if (ref) {
+        ref.dispose();
+      }
     };
   }, [uri]);
 
-  return instance;
+  return ref;
 }

package/src/browser/merge-conflict/merge-conflict.model.ts

@@ -4,12 +4,12 @@ import { useEffect, useMemo, useState } from 'react';
 import { formatLocalize, useInjectable } from '@opensumi/ide-core-browser';
 import { DisposableStore, URI } from '@opensumi/ide-utils';
 
-import { useEditorDocumentModel } from '../hooks/useEditor';
+import { useEditorDocumentModelRef } from '../hooks/useEditor';
 
 import { MergeConflictService } from './merge-conflict.service';
 
 export function useMergeConflictModel(uri: URI) {
-  const editorModel = useEditorDocumentModel(uri);
+  const editorModel = useEditorDocumentModelRef(uri);
 
   /**
    * 如果是原来就有冲突的文件，当冲突没了之后，仍然显示冲突
@@ -28,8 +28,9 @@ export function useMergeConflictModel(uri: URI) {
     const disposables = new DisposableStore();
 
     if (editorModel) {
+      const { instance } = editorModel;
       const run = () => {
-        const n = mergeConflictService.scanDocument(editorModel.getMonacoModel());
+        const n = mergeConflictService.scanDocument(instance.getMonacoModel());
         setConflictsCount(n);
         if (n > 0) {
           setIsInitialVisiable(true);
@@ -39,7 +40,7 @@ export function useMergeConflictModel(uri: URI) {
       const debounceRun = debounce(run, 150);
 
       disposables.add(
-        editorModel.getMonacoModel().onDidChangeContent(() => {
+        instance.getMonacoModel().onDidChangeContent(() => {
           debounceRun();
         }),
       );

package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts

@@ -112,10 +112,8 @@ export class CallHierarchyService implements ICallHierarchyService {
   }
 
   async prepareCallHierarchyProvider(resource: Uri, position: Position) {
-    let textModelReference = this.modelService.getModelReference(URI.parse(resource.toString()));
-    let textModel: ITextModel | undefined = textModelReference?.instance.getMonacoModel();
-    textModelReference?.dispose();
-
+    let textModel = this.modelService.getModelReference(URI.parse(resource.toString()))?.instance.getMonacoModel();
+    let textModelReference: IDisposable | undefined;
     if (!textModel) {
       const result = await this.modelService.createModelReference(URI.parse(resource.toString()));
       textModel = result.instance.getMonacoModel();

package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.ts

@@ -104,11 +104,8 @@ export class TypeHierarchyService implements ITypeHierarchyService {
   }
 
   async prepareTypeHierarchyProvider(resource: Uri, position: Position) {
-    let textModelReference = this.modelService.getModelReference(URI.parse(resource.toString()));
-
-    let textModel: ITextModel | undefined = textModelReference?.instance.getMonacoModel();
-    textModelReference?.dispose();
-
+    let textModel = this.modelService.getModelReference(URI.parse(resource.toString()))?.instance.getMonacoModel();
+    let textModelReference: IDisposable | undefined;
     if (!textModel) {
       const result = await this.modelService.createModelReference(URI.parse(resource.toString()));
       textModel = result.instance.getMonacoModel();

package/src/browser/navigation.module.less

@@ -15,13 +15,12 @@
   }
 
   .navigation_icon {
-    font-size: 12px !important;
+    font-size: 12px;
     color: var(--breadcrumb-foreground);
   }
-
   .navigation-part {
     color: var(--breadcrumb-foreground);
-    font-size: 12px !important;
+    font-size: 12px;
     padding: 0 4px;
     position: relative;
     line-height: 22px;

package/src/browser/navigation.view.tsx

@@ -56,7 +56,7 @@ export const NavigationBar = ({ editorGroup }: { editorGroup: EditorGroup }) =>
   }
   return parts.length === 0 ? null : (
     <div
-      className={cls('kt-navigation-container', styles_navigation_container)}
+      className={styles_navigation_container}
       onContextMenu={(event) => {
         event.preventDefault();
       }}