@opensumi/ide-editor 3.6.5-next-1734949468.0 → 3.6.5-next-1735177632.0

package/package.json

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

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/doc-model/editor-document-model.ts

@@ -39,11 +39,11 @@ import { createTextBuffer } from '@opensumi/monaco-editor-core/esm/vs/editor/com
 
 import {
   IDocCache,
+  IDocCacheValue,
   IDocPersistentCacheProvider,
   IEditorDocumentModelContentChange,
   SaveReason,
   isDocContentCache,
-  parseRangeFrom,
 } from '../../common';
 import { AUTO_SAVE_MODE, IEditorDocumentModel } from '../../common/editor';
 import { EditorPreferences } from '../preference/schema';
@@ -265,6 +265,17 @@ export class EditorDocumentModel extends Disposable implements IEditorDocumentMo
       return;
     }
 
+    const parseRangeFrom = (cacheValue: IDocCacheValue): Range => {
+      const [_text, startLineNumber, startColumn, endLineNumber, endColumn] = cacheValue;
+
+      return Range.lift({
+        startLineNumber,
+        startColumn,
+        endLineNumber,
+        endColumn,
+      });
+    };
+
     if (isDocContentCache(cache)) {
       this.monacoModel.setValue(cache.content);
     } else {

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

@@ -16,6 +16,11 @@ import {
 } from '@opensumi/ide-core-browser';
 import { IProgressService } from '@opensumi/ide-core-browser/lib/progress';
 import * as monaco from '@opensumi/ide-monaco';
+import {
+  CodeActionItem,
+  CodeActionKind,
+  CodeActionTriggerSource,
+} from '@opensumi/ide-monaco/lib/browser/contrib/codeAction';
 import { ResourceEdit } from '@opensumi/ide-monaco/lib/browser/monaco-api';
 import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
 import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
@@ -27,11 +32,6 @@ import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/ra
 import * as languages from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 import { CodeActionProvider } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
 import { getCodeActions } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction';
-import {
-  CodeActionItem,
-  CodeActionKind,
-  CodeActionTriggerSource,
-} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/common/types';
 
 import { MonacoCodeService } from '../editor.override';
 import { SaveReason } from '../types';

package/src/browser/editor.contribution.ts

@@ -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');

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/common/doc-cache.ts

@@ -1,5 +1,4 @@
 import { MaybePromise, URI } from '@opensumi/ide-core-common';
-import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 
 import type { IModelContentChange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/textModelEvents';
 
@@ -105,14 +104,3 @@ export function parseCacheValueFrom(change: IModelContentChange): IDocCacheValue
 
   return [text, startLineNumber, startColumn, endLineNumber, endColumn];
 }
-
-export function parseRangeFrom(cacheValue: IDocCacheValue): Range {
-  const [_text, startLineNumber, startColumn, endLineNumber, endColumn] = cacheValue;
-
-  return Range.lift({
-    startLineNumber,
-    startColumn,
-    endLineNumber,
-    endColumn,
-  });
-}

package/src/common/editor.ts

@@ -15,7 +15,6 @@ import {
   MaybeNull,
   URI,
 } from '@opensumi/ide-core-common';
-import { IDimension } from '@opensumi/ide-monaco';
 
 import { IResource } from './resource';
 import { IDocModelUpdateOptions } from './types';
@@ -24,6 +23,7 @@ import type {
   EOL,
   ICodeEditorViewState,
   IDiffEditorViewState,
+  IDimension,
   IEditorOptions,
   ICodeEditor as IMonacoCodeEditor,
   ITextModel,

package/src/common/language.ts

@@ -1,8 +1,7 @@
 import LSTypes from 'vscode-languageserver-types';
 
-import { CancellationToken, IDisposable, IRelativePattern, MarkerSeverity } from '@opensumi/ide-core-common';
+import { CancellationToken, IDisposable, IRelativePattern, MarkerSeverity, Uri } from '@opensumi/ide-core-common';
 import { editor } from '@opensumi/ide-monaco';
-import { URI as Uri } from '@opensumi/monaco-editor-core/esm/vs/base/common/uri';
 
 import type { IRelatedInformation } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';