@opensumi/ide-editor 3.6.5-next-1736242999.0 → 3.6.5-next-1766140030.0

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,17 +265,6 @@ 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,11 +16,6 @@ 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';
@@ -32,6 +27,11 @@ 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

@@ -35,7 +35,6 @@ import {
   ServiceNames,
   URI,
   formatLocalize,
-  getIcon,
   getLanguageIdFromMonaco,
   localize,
 } from '@opensumi/ide-core-browser';
@@ -62,6 +61,7 @@ import {
   IDocPersistentCacheProvider,
   IEditor,
   ILanguageService,
+  IResource,
   IResourceOpenOptions,
   ResourceService,
   SaveReason,
@@ -1197,13 +1197,6 @@ 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');
@@ -1328,7 +1321,6 @@ 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, ...args) => {
+      execute: (editor) => {
         const action = editor.getAction(id);
         if (action && action.isSupported()) {
-          return this.runAction(id, editor, ...args);
+          return this.runAction(id, editor);
         }
       },
     };
@@ -422,11 +422,11 @@ export class MonacoActionRegistry implements IMonacoActionRegistry {
    * @param id 要执行的 action
    * @param editor 执行 action 的 editor，默认为当前 editor
    */
-  protected runAction(id: string, editor: ICodeEditor, ...args: any[]): Promise<void> {
+  protected runAction(id: string, editor: ICodeEditor): Promise<void> {
     if (editor) {
       const action = editor.getAction(id);
       if (action) {
-        return action.run(...args);
+        return action.run();
       }
     }
 

package/src/browser/preference/converter.ts

@@ -194,12 +194,6 @@ 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,7 +110,6 @@ export const EDITOR_DEFAULTS = {
   lineNumbersMinChars: 3,
   lineDecorationsWidth: 10,
   readOnly: false,
-  columnSelection: false,
   mouseStyle: 'text',
   disableLayerHinting: false,
   automaticLayout: true,
@@ -1180,11 +1179,6 @@ 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,
@@ -1452,16 +1446,6 @@ 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,8 +748,6 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
 
   private _editorLangIDContextKey: IContextKey<string>;
 
-  private _activeEditorIsDirtyContextKey: IContextKey<boolean>;
-
   private _isInDiffEditorContextKey: IContextKey<boolean>;
 
   private _diffResourceContextKey: ResourceContextKey;
@@ -907,7 +905,6 @@ 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);
     }
@@ -929,7 +926,6 @@ 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());
@@ -1180,12 +1176,6 @@ 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();
   }
 
@@ -2249,10 +2239,6 @@ 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;
   }

package/src/common/doc-cache.ts

@@ -1,4 +1,5 @@
 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';
 
@@ -104,3 +105,14 @@ 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,6 +15,7 @@ import {
   MaybeNull,
   URI,
 } from '@opensumi/ide-core-common';
+import { IDimension } from '@opensumi/ide-monaco';
 
 import { IResource } from './resource';
 import { IDocModelUpdateOptions } from './types';
@@ -23,7 +24,6 @@ import type {
   EOL,
   ICodeEditorViewState,
   IDiffEditorViewState,
-  IDimension,
   IEditorOptions,
   ICodeEditor as IMonacoCodeEditor,
   ITextModel,

package/src/common/language.ts

@@ -1,7 +1,8 @@
 import LSTypes from 'vscode-languageserver-types';
 
-import { CancellationToken, IDisposable, IRelativePattern, MarkerSeverity, Uri } from '@opensumi/ide-core-common';
+import { CancellationToken, IDisposable, IRelativePattern, MarkerSeverity } 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';