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

package/src/browser/tab.view.tsx

@@ -13,8 +13,8 @@ import React, {
   useState,
 } from 'react';
 
+import { Scrollbars } from '@opensumi/ide-components';
 import {
-  ComponentRegistry,
   ConfigContext,
   Disposable,
   DisposableCollection,
@@ -29,7 +29,6 @@ import {
   getExternalIcon,
   getIcon,
   getSlotLocation,
-  renderView,
   useDesignStyles,
 } from '@opensumi/ide-core-browser';
 import { InlineMenuBar } from '@opensumi/ide-core-browser/lib/components/actions';
@@ -37,18 +36,9 @@ import { LayoutViewSizeConfig } from '@opensumi/ide-core-browser/lib/layout/cons
 import { VIEW_CONTAINERS } from '@opensumi/ide-core-browser/lib/layout/view-id';
 import { IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
 import { useInjectable, useUpdateOnEventBusEvent } from '@opensumi/ide-core-browser/lib/react-hooks';
-import { formatLocalize } from '@opensumi/ide-core-common';
 
-import {
-  IEditorGroup,
-  IResource,
-  ResourceDidUpdateEvent,
-  ResourceService,
-  TabbarRightExtraContentId,
-  WorkbenchEditorService,
-} from '../common';
-
-import { Scroll } from './editor-scrollbar';
+import { IEditorGroup, IResource, ResourceDidUpdateEvent, ResourceService, WorkbenchEditorService } from '../common';
+
 import styles from './editor.module.less';
 import { TabTitleMenuService } from './menu/title-context.menu';
 import {
@@ -82,7 +72,6 @@ export const Tabs = ({ group }: ITabsProps) => {
   const menuRegistry = useInjectable<IMenuRegistry>(IMenuRegistry);
   const editorTabService = useInjectable<IEditorTabService>(IEditorTabService);
   const layoutViewSize = useInjectable<LayoutViewSizeConfig>(LayoutViewSizeConfig);
-  const componentRegistry = useInjectable<ComponentRegistry>(ComponentRegistry);
 
   const styles_tab_right = useDesignStyles(styles.tab_right, 'tab_right');
   const styles_close_tab = useDesignStyles(styles.close_tab, 'close_tab');
@@ -116,13 +105,6 @@ export const Tabs = ({ group }: ITabsProps) => {
 
   const slotLocation = useMemo(() => getSlotLocation(pkgName, configContext.layoutConfig), []);
 
-  const RightExtraContentViewConfig = React.useMemo(() => {
-    const firstView = componentRegistry.getComponentRegistryInfo(TabbarRightExtraContentId)?.views?.[0];
-    if (firstView) {
-      return firstView;
-    }
-  }, []);
-
   useUpdateOnGroupTabChange(group);
   useUpdateOnEventBusEvent(
     ResourceDidUpdateEvent,
@@ -378,9 +360,7 @@ export const Tabs = ({ group }: ITabsProps) => {
       return editorTabService.renderEditorTab(
         <>
           <div className={tabsLoadingMap[resource.uri.toString()] ? 'loading_indicator' : cls(resource.icon)}> </div>
-          <div tabIndex={0} role='tab' aria-selected={isCurrent ? 'true' : 'false'}>
-            {resource.name}
-          </div>
+          <div>{resource.name}</div>
           {subname ? <div className={styles.subname}>{subname}</div> : null}
           {decoration.readOnly ? (
             <span className={cls(getExternalIcon('lock'), styles.editor_readonly_icon)}></span>
@@ -400,12 +380,7 @@ export const Tabs = ({ group }: ITabsProps) => {
               }}
             >
               {editorTabService.renderTabCloseComponent(
-                <div
-                  className={cls(getIcon('close'), styles_kt_editor_close_icon)}
-                  tabIndex={0}
-                  role='button'
-                  aria-label={formatLocalize('editor.closeTab.title', resource.name)}
-                />,
+                <div className={cls(getIcon('close'), styles_kt_editor_close_icon)} />,
               )}
             </div>
           </div>
@@ -426,7 +401,6 @@ export const Tabs = ({ group }: ITabsProps) => {
           [styles_kt_editor_tabs_current_last]: curTabIndex === group.resources.length - 1,
         })}
         ref={contentRef as any}
-        role='tablist'
       >
         {group.resources.map((resource, i) => {
           let ref: HTMLDivElement | null;
@@ -518,19 +492,18 @@ export const Tabs = ({ group }: ITabsProps) => {
         onDoubleClick={handleEmptyDBClick}
       >
         {!wrapMode ? (
-          <Scroll
+          <Scrollbars
+            tabBarMode
             forwardedRef={(el) => (el ? (tabContainer.current = el) : null)}
             className={styles.kt_editor_tabs_scroll}
           >
             {renderTabContent()}
-          </Scroll>
+          </Scrollbars>
         ) : (
           <div className={styles.kt_editor_wrap_container}>{renderTabContent()}</div>
         )}
       </div>
       {!wrapMode && <EditorActions ref={editorActionRef} group={group} />}
-
-      {renderView(RightExtraContentViewConfig)}
     </div>
   );
 };
@@ -567,11 +540,6 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
     const [hasFocus, setHasFocus] = useState<boolean>(editorService.currentEditorGroup === group);
     const [args, setArgs] = useState<[URI, IEditorGroup, MaybeNull<URI>] | undefined>(acquireArgs());
 
-    /**
-     * 集成场景下可以不展示任何菜单，可以用以下代码取消菜单注册
-     * registry.unregisterMenuId(MenuId.EditorTitle);
-     * registry.unregisterMenuId(MenuId.EditorTitleRun);
-     */
     const noActions = menu.getMergedMenuNodes().length === 0;
 
     useEffect(() => {

package/src/browser/untitled-resource.ts

@@ -171,8 +171,8 @@ export class UntitledSchemeResourceProvider extends WithEventBus implements IRes
   }
 
   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;
@@ -195,14 +195,16 @@ export class UntitledSchemeResourceProvider extends WithEventBus implements IRes
       documentModelRef.dispose();
       return false;
     } else {
-      documentModelRef.dispose();
       return true;
     }
   }
 
   async shouldCloseResource(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) {
+      if (documentModelRef) {
+        documentModelRef.dispose();
+      }
       return true;
     }
     // 询问用户是否保存

package/src/browser/workbench-editor.service.ts

@@ -44,7 +44,6 @@ import {
   debounce,
   formatLocalize,
   getDebugLogger,
-  isDefined,
   isUndefinedOrNull,
   localize,
   makeRandomHexString,
@@ -436,9 +435,10 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
     // contextKeys
     const getLanguageFromModel = (uri: URI) => {
       let result: string | null = null;
-      const modelRef = this.documentModelManager.getModelDescription(uri, 'resourceContextKey');
+      const modelRef = this.documentModelManager.getModelReference(uri, 'resourceContextKey');
       if (modelRef) {
-        result = modelRef.languageId;
+        result = modelRef.instance.languageId;
+        modelRef.dispose();
       }
       return result;
     };
@@ -491,13 +491,10 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
       state = this.openedResourceState.get<IEditorGridState>('grid', state);
     }
     this.topGrid = new EditorGrid();
-    this.addDispose(this.topGrid);
-    this.addDispose(
-      this.topGrid.onDidGridAndDesendantStateChange(() => {
-        this._sortedEditorGroups = undefined;
-        this._onDidEditorGroupsChanged.fire();
-      }),
-    );
+    this.topGrid.onDidGridAndDesendantStateChange(() => {
+      this._sortedEditorGroups = undefined;
+      this._onDidEditorGroupsChanged.fire();
+    });
     const editorRestorePromises = [];
     const promise = this.topGrid
       .deserialize(state, () => this.createEditorGroup(), editorRestorePromises)
@@ -717,10 +714,12 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   /**
    * 当前打开的所有resource
    */
+  // @observable.shallow
   resources: IResource[] = [];
 
   resourceStatus: Map<IResource, Promise<void>> = new Map();
 
+  // @observable.ref
   _currentResource: IResource | null;
 
   _currentOpenType: IEditorOpenType | null;
@@ -892,9 +891,12 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     if (!this._resourceContext) {
       const getLanguageFromModel = (uri: URI) => {
         let result: string | null = null;
-        const modelRef = this.documentModelManager.getModelDescription(uri, 'resourceContextKey');
+        const modelRef = this.documentModelManager.getModelReference(uri, 'resourceContextKey');
         if (modelRef) {
-          result = modelRef.languageId;
+          if (modelRef) {
+            result = modelRef.instance.languageId;
+          }
+          modelRef.dispose();
         }
         return result;
       };
@@ -1409,9 +1411,6 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
           if (options && options.label) {
             resource.name = options.label;
           }
-          if (options && isDefined(options.supportsRevive)) {
-            resource.supportsRevive = options.supportsRevive;
-          }
           let replaceResource: IResource | null = null;
           if (options && options.index !== undefined && options.index < this.resources.length) {
             replaceResource = this.resources[options.index];
@@ -2303,7 +2302,9 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     // 否则使用 document 进行保存 (如果有)
     const docRef = this.documentModelManager.getModelReference(resource.uri);
     if (docRef) {
-      await docRef.instance.save(undefined, reason);
+      if (docRef.instance.dirty) {
+        await docRef.instance.save(undefined, reason);
+      }
       docRef.dispose();
     }
   }
@@ -2336,9 +2337,11 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
 
   hasDirty(): boolean {
     for (const r of this.resources) {
-      const docRef = this.documentModelManager.getModelDescription(r.uri);
+      const docRef = this.documentModelManager.getModelReference(r.uri);
       if (docRef) {
-        if (docRef.dirty) {
+        const isDirty = docRef.instance.dirty;
+        docRef.dispose();
+        if (isDirty) {
           return true;
         }
       }
@@ -2352,13 +2355,15 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   calcDirtyCount(countedUris: Set<string> = new Set<string>()): number {
     let count = 0;
     for (const r of this.resources) {
-      const docRef = this.documentModelManager.getModelDescription(r.uri, 'calc-dirty-count');
+      const docRef = this.documentModelManager.getModelReference(r.uri, 'calc-dirty-count');
       if (countedUris.has(r.uri.toString())) {
         continue;
       }
       countedUris.add(r.uri.toString());
       if (docRef) {
-        if (docRef.dirty) {
+        const isDirty = docRef.instance.dirty;
+        docRef.dispose();
+        if (isDirty) {
           count += 1;
         }
       }

package/src/common/editor.ts

@@ -29,66 +29,10 @@ import type { ITextModel, ITextModelUpdateOptions } from '@opensumi/monaco-edito
 
 export { ShowLightbulbIconMode } from '@opensumi/ide-monaco';
 
-export interface IEditorDocumentDescription {
-  /**
-   * 文档URI
-   */
-  readonly uri: URI;
-
-  /**
-   * A unique identifier associated with this model.
-   */
-  readonly id: string;
-
-  /**
-   * 编码
-   */
-  readonly encoding: string;
-
-  /**
-   * 行末结束
-   */
-  readonly eol: EOL;
-
-  /**
-   * 语言Id
-   */
-  readonly languageId: string;
-
-  /**
-   * 是否被修改过
-   */
-  readonly dirty: boolean;
-
-  /**
-   * 能否修改
-   */
-  readonly readonly: boolean;
-
-  /**
-   * 能否保存
-   */
-  readonly savable: boolean;
-
-  /**
-   * 是否永远都显示 dirty
-   */
-  readonly alwaysDirty: boolean;
-
-  /**
-   * 即便是 dirty 也要被 dispose
-   */
-  readonly disposeEvenDirty: boolean;
-
-  /**
-   * 是否关闭自动保存功能
-   */
-  readonly closeAutoSave: boolean;
-}
-
 /**
  * editorDocumentModel is a wrapped concept for monaco's textModel
  */
+
 export interface IEditorDocumentModel extends IDisposable {
   /**
    * 文档URI
@@ -692,8 +636,6 @@ export interface IResourceOpenOptions {
    * 当关闭时指定 force 参数，用来跳过 shouldClose 等逻辑
    */
   forceClose?: boolean;
-
-  supportsRevive?: boolean;
 }
 
 export interface IResourceOpenResult {

package/src/common/index.ts

@@ -4,4 +4,3 @@ export * from './resource';
 export * from './language';
 export * from './utils';
 export * from './language-status';
-export * from './components';

package/lib/browser/editor-scrollbar/index.d.ts

@@ -1,69 +0,0 @@
-import React, { MouseEvent, UIEvent } from 'react';
-export interface ScrollAreaProps {
-    className?: string;
-    onScroll?: (position: ScrollPosition) => any;
-    atTopClassName?: string;
-    style?: any;
-    containerStyle?: any;
-    delegate?: (delegate: IScrollDelegate) => void;
-    forwardedRef: (ref: HTMLDivElement) => void;
-    children: any;
-}
-export interface IScrollDelegate {
-    scrollTo(position: ScrollPosition): void;
-}
-export interface ScrollPosition {
-    top: number;
-    left: number;
-}
-export interface ScrollSizes {
-    scrollHeight: number;
-    offsetHeight: number;
-    offsetWidth: number;
-    scrollWidth: number;
-}
-export declare class Scroll extends React.Component<ScrollAreaProps, any> {
-    ref: HTMLDivElement;
-    container: HTMLDivElement;
-    private thumbV;
-    private trackV;
-    private thumbH;
-    private trackH;
-    private decorationL;
-    private decorationR;
-    private size;
-    private position;
-    private dragging;
-    private draggingStart;
-    private draggingStartPos;
-    private requestFrame;
-    private shouldHideThumb;
-    private isAtTop;
-    onScroll(e: UIEvent<HTMLDivElement>): void;
-    scrollTo(position: ScrollPosition): void;
-    onMouseDownHorizontal(e: MouseEvent<HTMLDivElement>): void;
-    onMouseMoveHorizontal: (e: any) => void;
-    onMouseUpHorizontal: (e: any) => void;
-    onMouseDownOnTrack(e: MouseEvent<HTMLDivElement>): void;
-    calculateXToLeft(x: any): number;
-    onMouseDownVertical(e: MouseEvent<HTMLDivElement>): void;
-    onMouseMoveVertical: (e: any) => void;
-    onMouseUpVertical: (e: any) => void;
-    onMouseDownOnTrackVertical(e: MouseEvent<HTMLDivElement>): void;
-    onMousewheel: (e: WheelEvent) => void;
-    calculateYToTop(y: any): number;
-    componentDidUpdate(): void;
-    componentDidMount(): void;
-    onMouseEnter: () => void;
-    componentWillUnmount(): void;
-    handleWindowResize: () => void;
-    sizeEqual(size1: ScrollSizes, size2: ScrollSizes): boolean;
-    update: (callback?: any) => void;
-    _update(): void;
-    updateScrollBar(): void;
-    hideThumb(): void;
-    showThumb(): void;
-    setCss(): void;
-    render(): React.JSX.Element;
-}
-//# sourceMappingURL=index.d.ts.map

package/lib/browser/editor-scrollbar/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/browser/editor-scrollbar/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAInD,MAAM,WAAW,eAAe;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,KAAK,GAAG,CAAC;IAC7C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,eAAe,KAAK,IAAI,CAAC;IAE/C,YAAY,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,CAAC;IAE5C,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CAC1C;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,MAAO,SAAQ,KAAK,CAAC,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;IACxD,GAAG,EAAE,cAAc,CAAC;IAEpB,SAAS,EAAE,cAAc,CAAC;IAEjC,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,MAAM,CAAkB;IAEhC,OAAO,CAAC,WAAW,CAAiB;IACpC,OAAO,CAAC,WAAW,CAAiB;IAEpC,OAAO,CAAC,IAAI,CAAc;IAE1B,OAAO,CAAC,QAAQ,CAGd;IAEF,OAAO,CAAC,QAAQ,CAAS;IAEzB,OAAO,CAAC,aAAa,CAAK;IAE1B,OAAO,CAAC,gBAAgB,CAAK;IAE7B,OAAO,CAAC,YAAY,CAAM;IAE1B,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,OAAO,CAAQ;IAEvB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;IAuCnC,QAAQ,CAAC,QAAQ,EAAE,cAAc;IAKjC,qBAAqB,CAAC,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;IAWnD,qBAAqB,mBAMnB;IAEF,mBAAmB,mBAOjB;IAEF,kBAAkB,CAAC,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;IAYhD,gBAAgB,CAAC,CAAC,KAAA;IAMlB,mBAAmB,CAAC,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;IAWjD,mBAAmB,mBAMjB;IAEF,iBAAiB,mBAOf;IAEF,0BAA0B,CAAC,CAAC,EAAE,UAAU,CAAC,cAAc,CAAC;IAYxD,YAAY,MAAO,UAAU,UAY3B;IAEF,eAAe,CAAC,CAAC,KAAA;IAMjB,kBAAkB;IASlB,iBAAiB;IAcjB,YAAY,aAEV;IAEF,oBAAoB;IAWpB,kBAAkB,aAEhB;IAEF,SAAS,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO;IAW1D,MAAM,2BAUJ;IAEF,OAAO;IAcP,eAAe;IAoBf,SAAS;IAOT,SAAS;IAKT,MAAM;IAeN,MAAM;CAqDP"}