@opensumi/ide-editor 3.6.5-next-1735009040.0 → 3.6.5-next-1735183968.0

package/package.json

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

package/src/browser/diff/compare.ts

@@ -7,6 +7,7 @@ import {
   Deferred,
   Domain,
   EDITOR_COMMANDS,
+  PreferenceScope,
   PreferenceService,
   URI,
   getIcon,
@@ -109,7 +110,7 @@ export class CompareEditorContribution implements MenuContribution, CommandContr
     commands.registerCommand(DIFF_EDITOR_COMMANDS.TOGGLE_COLLAPSE_UNCHANGED_REGIONS, {
       execute: () => {
         const enabled = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
-        this.preferenceService.set('diffEditor.hideUnchangedRegions.enabled', !enabled);
+        this.preferenceService.set('diffEditor.hideUnchangedRegions.enabled', !enabled, PreferenceScope.User);
       },
     });
   }

package/src/browser/editor.contribution.ts

@@ -35,6 +35,7 @@ import {
   ServiceNames,
   URI,
   formatLocalize,
+  getIcon,
   getLanguageIdFromMonaco,
   localize,
 } from '@opensumi/ide-core-browser';
@@ -61,7 +62,6 @@ import {
   IDocPersistentCacheProvider,
   IEditor,
   ILanguageService,
-  IResource,
   IResourceOpenOptions,
   ResourceService,
   SaveReason,
@@ -1197,6 +1197,13 @@ export class EditorContribution
       execute: () => this.prefixQuickOpenService.open(':'),
     });
 
+    commands.registerCommand(EDITOR_COMMANDS.TOGGLE_COLUMN_SELECTION, {
+      execute: () => {
+        const isColumnSelection = this.preferenceService.get<boolean>('editor.columnSelection');
+        this.preferenceService.set('editor.columnSelection', !isColumnSelection, PreferenceScope.User);
+      },
+    });
+
     commands.registerCommand(EDITOR_COMMANDS.TOGGLE_WORD_WRAP, {
       execute: () => {
         const wordWrap = this.preferenceService.get<string>('editor.wordWrap');
@@ -1321,6 +1328,7 @@ export class EditorContribution
 
     menus.registerMenuItem(MenuId.EditorTitle, {
       command: EDITOR_COMMANDS.SPLIT_TO_RIGHT.id,
+      iconClass: getIcon('embed'),
       group: 'navigation',
       when: 'resource',
       order: 5,

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

@@ -408,10 +408,10 @@ export class MonacoActionRegistry implements IMonacoActionRegistry {
    */
   protected newActionHandler(id: string): MonacoEditorCommandHandler {
     return {
-      execute: (editor) => {
+      execute: (editor, ...args) => {
         const action = editor.getAction(id);
         if (action && action.isSupported()) {
-          return this.runAction(id, editor);
+          return this.runAction(id, editor, ...args);
         }
       },
     };
@@ -422,11 +422,11 @@ export class MonacoActionRegistry implements IMonacoActionRegistry {
    * @param id 要执行的 action
    * @param editor 执行 action 的 editor，默认为当前 editor
    */
-  protected runAction(id: string, editor: ICodeEditor): Promise<void> {
+  protected runAction(id: string, editor: ICodeEditor, ...args: any[]): Promise<void> {
     if (editor) {
       const action = editor.getAction(id);
       if (action) {
-        return action.run();
+        return action.run(...args);
       }
     }
 

package/src/browser/preference/converter.ts

@@ -194,6 +194,12 @@ export const editorOptionsConverters: Map<KaitianPreferenceKey, NoConverter | IM
    */
   ['editor.fontLigatures', { monaco: 'fontLigatures' }],
 
+  /**
+   * Enable that the selection with the mouse and keys is doing column selection.
+   * Defaults to false.
+   */
+  ['editor.columnSelection', { monaco: 'columnSelection' }],
+
   /**
    * Disable the use of `will-change` for the editor margin and lines layers.
    * The usage of `will-change` acts as a hint for browsers to create an extra layer.

package/src/browser/preference/schema.ts

@@ -110,6 +110,7 @@ export const EDITOR_DEFAULTS = {
   lineNumbersMinChars: 3,
   lineDecorationsWidth: 10,
   readOnly: false,
+  columnSelection: false,
   mouseStyle: 'text',
   disableLayerHinting: false,
   automaticLayout: true,
@@ -1179,6 +1180,11 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: EDITOR_DEFAULTS.contribInfo.selectionHighlight,
     description: '%editor.configuration.selectionHighlight%',
   },
+  'editor.columnSelection': {
+    type: 'boolean',
+    default: EDITOR_DEFAULTS.columnSelection,
+    description: '%editor.configuration.columnSelection%',
+  },
   'editor.occurrencesHighlight': {
     type: 'boolean',
     default: EDITOR_DEFAULTS.contribInfo.occurrencesHighlight,
@@ -1446,6 +1452,16 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: true,
     description: '%editor.configuration.unicodeHighlight.ambiguousCharacters%',
   },
+  'editor.unicodeHighlight.allowedCharacters': {
+    type: 'object',
+    default: {},
+    description: '%editor.configuration.unicodeHighlight.allowedCharacters%',
+  },
+  'editor.unicodeHighlight.allowedLocales': {
+    type: 'object',
+    default: {},
+    description: '%editor.configuration.unicodeHighlight.allowedLocales%',
+  },
   'diffEditor.renderIndicators': {
     type: 'boolean',
     default: DIFF_EDITOR_DEFAULTS.renderIndicators,

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

@@ -748,6 +748,8 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
 
   private _editorLangIDContextKey: IContextKey<string>;
 
+  private _activeEditorIsDirtyContextKey: IContextKey<boolean>;
+
   private _isInDiffEditorContextKey: IContextKey<boolean>;
 
   private _diffResourceContextKey: ResourceContextKey;
@@ -905,6 +907,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       );
       this._editorLangIDContextKey = this.contextKeyService.createKey<string>('editorLangId', '');
       this._isInDiffEditorContextKey = this.contextKeyService.createKey<boolean>('isInDiffEditor', false);
+      this._activeEditorIsDirtyContextKey = this.contextKeyService.createKey<boolean>('activeEditorIsDirty', false);
       this._isInDiffRightEditorContextKey = this.contextKeyService.createKey<boolean>('isInDiffRightEditor', false);
       this._isInEditorComponentContextKey = this.contextKeyService.createKey<boolean>('inEditorComponent', false);
     }
@@ -926,6 +929,7 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       }
       this._editorLangIDContextKey.reset();
     }
+    this._activeEditorIsDirtyContextKey.set(this.activeEditorIsDirty());
     this._isInDiffEditorContextKey.set(this.isDiffEditorMode());
     // 没有 focus 的时候默认添加在 RightDiffEditor
     this._isInDiffRightEditorContextKey.set(this.isDiffEditorMode());
@@ -1176,6 +1180,12 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
         editorId: this.codeEditor.getId(),
       }),
     );
+
+    this.toDispose.push(
+      this.codeEditor.monacoEditor.onDidChangeModelContent(() => {
+        this._activeEditorIsDirtyContextKey.set(this.activeEditorIsDirty());
+      }),
+    );
     this.codeEditorReady.ready();
   }
 
@@ -2239,6 +2249,10 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
     return !!this.currentOpenType && this.currentOpenType.type === EditorOpenType.diff;
   }
 
+  activeEditorIsDirty() {
+    return this.hasDirty() && this.workbenchEditorService.currentEditorGroup === this;
+  }
+
   isComponentMode() {
     return !!this.currentOpenType && this.currentOpenType.type === EditorOpenType.component;
   }