@opensumi/ide-editor 2.27.3-rc-1712113547.0 → 2.27.3-rc-1712755288.0

package/src/browser/preference/schema.ts

@@ -7,6 +7,8 @@ import {
   localize,
 } from '@opensumi/ide-core-browser';
 
+import { ShowLightbulbIconMode } from '../types';
+
 export const USUAL_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
 
 const DEFAULT_WINDOWS_FONT_FAMILY = "Consolas, 'Courier New', monospace";
@@ -233,7 +235,7 @@ export const EDITOR_DEFAULTS = {
       addExtraSpaceOnTop: true,
     },
     colorDecorators: true,
-    lightbulbEnabled: true,
+    lightbulbEnabled: ShowLightbulbIconMode.On,
     codeActionsOnSave: {},
     codeActionsOnSaveTimeout: 750,
   },
@@ -1382,8 +1384,10 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     description: '%editor.configuration.colorDecorators%',
   },
   'editor.lightbulb.enabled': {
-    type: 'boolean',
+    type: 'string',
     default: EDITOR_DEFAULTS.contribInfo.lightbulbEnabled,
+    enum: [ShowLightbulbIconMode.Off, ShowLightbulbIconMode.OnCode, ShowLightbulbIconMode.On],
+    enumDescriptions: [],
     description: '%editor.configuration.lightbulb.enabled%',
   },
   'editor.maxTokenizationLineLength': {

package/src/browser/types.ts

@@ -48,6 +48,11 @@ export interface IEditorComponent<MetaData = any> {
 
   // 渲染模式 默认为 ONE_PER_GROUP
   renderMode?: EditorComponentRenderMode;
+
+  /**
+   * 有关该 component 的额外信息
+   */
+  metadata?: Record<string, any>;
 }
 
 export type EditorSide = 'bottom' | 'top';

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

@@ -250,8 +250,10 @@ export class WorkbenchEditorServiceImpl extends WithEventBus implements Workbenc
     return this.editorGroups.reduce((pre, cur) => pre + cur.calcDirtyCount(countedUris), 0);
   }
 
+  private editorGroupIdGen = 0;
+
   createEditorGroup(): EditorGroup {
-    const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName()]);
+    const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName(), this.editorGroupIdGen++]);
     this.editorGroups.push(editorGroup);
     const currentWatchDisposer = new Disposable(
       editorGroup.onDidEditorGroupBodyChanged(() => {
@@ -661,6 +663,12 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   _onDidEditorGroupTabChanged = new EventEmitter<void>();
   onDidEditorGroupTabChanged: Event<void> = this._onDidEditorGroupTabChanged.event;
 
+  /**
+   * 当编辑器的tab部分发生变更
+   */
+  _onDidEditorGroupTabOperation = new EventEmitter<IResourceTabOperation>();
+  onDidEditorGroupTabOperation: Event<IResourceTabOperation> = this._onDidEditorGroupTabOperation.event;
+
   /**
    * 当编辑器的主体部分发生变更
    */
@@ -758,7 +766,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
 
   private _currentOrPreviousFocusedEditor: IEditor | null;
 
-  constructor(public readonly name: string) {
+  constructor(public readonly name: string, public readonly groupId: number) {
     super();
     this.eventBus.on(ResizeEvent, (e: ResizeEvent) => {
       if (e.payload.slotLocation === getSlotLocation('@opensumi/ide-editor', this.config.layoutConfig)) {
@@ -1351,6 +1359,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       } else {
         const oldOpenType = this._currentOpenType;
         const oldResource = this._currentResource;
+        let tabOperationToFire: IResourceTabOperation | null = null;
         let resource: IResource | null | undefined = this.resources.find((r) => r.uri.toString() === uri.toString());
         if (!resource) {
           // open new resource
@@ -1372,13 +1381,28 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
           if (options && options.index !== undefined && options.index < this.resources.length) {
             replaceResource = this.resources[options.index];
             this.resources.splice(options.index, 0, resource);
+            tabOperationToFire = {
+              type: 'open',
+              resource,
+              index: options.index,
+            };
           } else {
             if (this.currentResource) {
               const currentIndex = this.resources.indexOf(this.currentResource);
               this.resources.splice(currentIndex + 1, 0, resource);
+              tabOperationToFire = {
+                type: 'open',
+                resource,
+                index: currentIndex + 1,
+              };
               replaceResource = this.currentResource;
             } else {
               this.resources.push(resource);
+              tabOperationToFire = {
+                type: 'open',
+                resource,
+                index: this.resources.length - 1,
+              };
             }
           }
           if (previewMode) {
@@ -1418,7 +1442,13 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
         }, 60);
         this.notifyTabChanged();
         this.notifyBodyChanged();
-        await this.displayResourceComponent(resource, options);
+        try {
+          await this.displayResourceComponent(resource, options);
+        } finally {
+          if (tabOperationToFire) {
+            this._onDidEditorGroupTabOperation.fire(tabOperationToFire);
+          }
+        }
         this._currentOrPreviousFocusedEditor = this.currentEditor;
 
         clearTimeout(delayTimer);
@@ -1765,6 +1795,10 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     }
   }
 
+  public getLastOpenType(resource: IResource) {
+    return this.cachedResourcesActiveOpenTypes.get(resource.uri.toString());
+  }
+
   private async resolveOpenType(
     resource: IResource,
     options: IResourceOpenOptions,
@@ -1793,16 +1827,21 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       treatAsNotCurrent?: boolean;
       force?: boolean;
     } = {},
-  ) {
+  ): Promise<boolean> {
     const index = this.resources.findIndex((r) => r.uri.toString() === uri.toString());
     if (index !== -1) {
       const resource = this.resources[index];
       if (!force) {
         if (!(await this.shouldClose(resource))) {
-          return;
+          return false;
         }
       }
       this.resources.splice(index, 1);
+      this._onDidEditorGroupTabOperation.fire({
+        type: 'close',
+        resource,
+        index,
+      });
       this.eventBus.fire(
         new EditorGroupCloseEvent({
           group: this,
@@ -1853,6 +1892,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       }
       this.availableOpenTypes = [];
     }
+    return true;
   }
 
   private removeResouceFromActiveComponents(resource: IResource) {
@@ -1914,15 +1954,21 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
   /**
    * 关闭全部
    */
-  async closeAll() {
+  async closeAll(): Promise<boolean> {
     for (const resource of this.resources) {
       if (!(await this.shouldClose(resource))) {
-        return;
+        return false;
       }
     }
     const closed = this.resources.splice(0, this.resources.length);
-    closed.forEach((resource) => {
+    // reverse， 发送事件需要从后往前
+    closed.reverse().forEach((resource, index) => {
       this.clearResourceOnClose(resource);
+      this._onDidEditorGroupTabOperation.fire({
+        type: 'close',
+        resource,
+        index,
+      });
     });
     this.activeComponents.clear();
     if (this.workbenchEditorService.editorGroups.length > 1) {
@@ -1930,6 +1976,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     }
     this.previewURI = null;
     this.backToEmpty();
+    return true;
   }
 
   /**
@@ -1966,6 +2013,13 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
         }
       }
       this.resources.splice(index + 1);
+      resourcesToClose.reverse().forEach((resource, i) => {
+        this._onDidEditorGroupTabOperation.fire({
+          type: 'close',
+          resource,
+          index: index + 1 + (resourcesToClose.length - 1 - i),
+        });
+      });
       for (const resource of resourcesToClose) {
         this.clearResourceOnClose(resource);
       }
@@ -1992,7 +2046,15 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
           return;
         }
       }
+      const oldResources = this.resources;
       this.resources = [this.resources[index]];
+      resourcesToClose.reverse().forEach((resource) => {
+        this._onDidEditorGroupTabOperation.fire({
+          type: 'close',
+          resource,
+          index: oldResources.indexOf(resource),
+        });
+      });
       for (const resource of resourcesToClose) {
         this.clearResourceOnClose(resource);
       }
@@ -2063,10 +2125,22 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
             if (sourceIndex > targetIndex) {
               this.resources.splice(sourceIndex, 1);
               this.resources.splice(targetIndex, 0, sourceResource);
+              this._onDidEditorGroupTabOperation.fire({
+                type: 'move',
+                resource: sourceResource,
+                oldIndex: sourceIndex,
+                index: targetIndex,
+              });
               await this.open(uri, { preview: false });
             } else if (sourceIndex < targetIndex) {
               this.resources.splice(targetIndex + 1, 0, sourceResource);
               this.resources.splice(sourceIndex, 1);
+              this._onDidEditorGroupTabOperation.fire({
+                type: 'move',
+                resource: sourceResource,
+                oldIndex: sourceIndex,
+                index: targetIndex,
+              });
               await this.open(uri, { preview: false });
             }
           }
@@ -2318,3 +2392,10 @@ function findSuitableOpenType(
 function openTypeSimilar(a: IEditorOpenType, b: IEditorOpenType) {
   return a.type === b.type && (a.type !== EditorOpenType.component || a.componentId === b.componentId);
 }
+
+export interface IResourceTabOperation {
+  type: 'open' | 'close' | 'move';
+  resource: IResource;
+  oldIndex?: number;
+  index: number;
+}

package/src/common/editor.ts

@@ -27,7 +27,7 @@ import type { EOL, ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco
 import type { IEditorOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
 import type { ITextModel, ITextModelUpdateOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';
 
-// eslint-disable-next-line import/no-restricted-paths
+export { ShowLightbulbIconMode } from '@opensumi/ide-monaco';
 
 /**
  * editorDocumentModel is a wrapped concept for monaco's textModel
@@ -386,8 +386,9 @@ export interface IEditorGroup {
   /**
    * 关闭指定的 uri 的 tab， 如果存在的话
    * @param uri
+   * @return 是否成功关闭，不存在的话返回 true
    */
-  close(uri: URI): Promise<void>;
+  close(uri: URI): Promise<boolean>;
 
   getState(): IEditorGroupState;
 
@@ -395,7 +396,11 @@ export interface IEditorGroup {
 
   saveAll(): Promise<void>;
 
-  closeAll(): Promise<void>;
+  /**
+   * 关闭指定所有的 tab
+   * @return 是否成功关闭
+   */
+  closeAll(): Promise<boolean>;
 
   /**
    * 保存当前的 tab 的文件 (如果它能被保存的话)