@opensumi/ide-editor 2.27.3-next-1711507853.0 → 2.27.3-next-1711595844.0

package/src/browser/preference/converter.ts

@@ -1,5 +1,5 @@
 import { Uri, objects } from '@opensumi/ide-core-browser';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
+import * as monaco from '@opensumi/ide-monaco';
 import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
 
 import { IConvertedMonacoOptions } from '../types';
@@ -42,7 +42,14 @@ export function getConvertedMonacoOptions(
       editorOptions[key] = value;
     } else {
       const converter: IMonacoOptionsConverter = editorOptionsConverters.get(key)! as IMonacoOptionsConverter;
-      editorOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      if (!editorOptions[converter.monaco]) {
+        editorOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      } else {
+        editorOptions[converter.monaco] = {
+          ...editorOptions[converter.monaco],
+          ...(converter.convert ? converter.convert(value) : value),
+        };
+      }
     }
   });
 
@@ -74,7 +81,14 @@ export function getConvertedMonacoOptions(
       editorOptions[key] = value;
     } else {
       const converter: IMonacoOptionsConverter = diffEditorOptionsConverters.get(key)! as IMonacoOptionsConverter;
-      diffOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      if (diffOptions[converter.monaco]) {
+        diffOptions[converter.monaco] = {
+          ...diffOptions[converter.monaco],
+          ...(converter.convert ? converter.convert(value) : value),
+        };
+      } else {
+        diffOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
+      }
     }
   });
 
@@ -728,6 +742,25 @@ export const editorOptionsConverters: Map<KaitianPreferenceKey, NoConverter | IM
    * Controls whether characters are highlighted that can be confused with basic ASCII characters
    */
   ['editor.unicodeHighlight', { monaco: 'unicodeHighlight' }],
+
+  /**
+   * Suggest options.
+   */
+  [
+    'editor.inlineSuggest.showToolbar',
+    {
+      monaco: 'inlineSuggest',
+      convert: (value) => {
+        if (value) {
+          return {
+            showToolbar: value,
+          };
+        } else {
+          return undefined;
+        }
+      },
+    },
+  ],
 ]);
 
 export const textModelUpdateOptionsConverters: Map<KaitianPreferenceKey, NoConverter | IMonacoOptionsConverter> =
@@ -767,7 +800,6 @@ export const diffEditorOptionsConverters: Map<KaitianPreferenceKey, NoConverter
    * Defaults to false.
    */
   ['diffEditor.originalEditable', { monaco: 'originalEditable' }],
-
   [
     'diffEditor.minimap',
     {
@@ -777,6 +809,46 @@ export const diffEditorOptionsConverters: Map<KaitianPreferenceKey, NoConverter
       }),
     },
   ],
+
+  /**
+   * Controls whether the diff editor shows unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.enabled',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ enabled: value }) },
+  ],
+  /**
+   * Controls how many lines are used for unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.revealLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ revealLineCount: value }) },
+  ],
+  /**
+   * Controls how many lines are used as a minimum for unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.minimumLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ minimumLineCount: value }) },
+  ],
+  /**
+   * Controls how many lines are used as context when comparing unchanged regions.
+   */
+  [
+    'diffEditor.hideUnchangedRegions.contextLineCount',
+    { monaco: 'hideUnchangedRegions', convert: (value) => ({ contextLineCount: value }) },
+  ],
+  /**
+   * Controls whether the diff editor should show detected code moves.
+   */
+  ['diffEditor.experimental.showMoves', { monaco: 'experimental', convert: (value) => ({ showMoves: value }) }],
+  /**
+   * Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.
+   */
+  [
+    'diffEditor.experimental.showEmptyDecorations',
+    { monaco: 'experimental', convert: (value) => ({ showEmptyDecorations: value }) },
+  ],
 ]);
 
 function isContainOptionKey(key: string, optionMap: Map<KaitianPreferenceKey, NoConverter | IMonacoOptionsConverter>) {

package/src/browser/preference/schema.ts

@@ -80,6 +80,7 @@ export const EDITOR_SUGGEST_DEFAULTS = {
 
 export const EDITOR_INLINE_SUGGEST_DEFAULTS = {
   enabled: true,
+  showToolbar: 'onHover',
 };
 
 export const enum WrappingIndent {
@@ -136,7 +137,7 @@ export const EDITOR_DEFAULTS = {
     extraEditorClassName: '',
     disableMonospaceOptimizations: false,
     rulers: [],
-    ariaLabel: localize('editorViewAccessibleLabel', 'Editor content'),
+    ariaLabel: localize('editorViewAccessibleLabel', 'Editor Content'),
     renderLineNumbers: 0,
     renderCustomLineNumbers: null,
     renderFinalNewline: true,
@@ -238,6 +239,24 @@ export const EDITOR_DEFAULTS = {
   },
 };
 
+export const DIFF_EDITOR_DEFAULTS = {
+  renderIndicators: true,
+  minimap: false,
+  renderSideBySide: true,
+  ignoreTrimWhitespace: false,
+  hideUnchangedRegions: {
+    enabled: true,
+    revealLineCount: 20,
+    minimumLineCount: 3,
+    contextLineCount: 3,
+  },
+  experimental: {
+    showMoves: false,
+    showEmptyDecorations: true,
+    collapseUnchangedRegions: true,
+  },
+};
+
 const monacoEditorSchema: PreferenceSchemaProperties = {
   'editor.ariaLabel': {
     type: 'string',
@@ -523,6 +542,23 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: EDITOR_INLINE_SUGGEST_DEFAULTS.enabled,
     description: '%editor.configuration.inlineSuggest.enabled%',
   },
+  'editor.inlineSuggest.showToolbar': {
+    type: 'string',
+    default: EDITOR_INLINE_SUGGEST_DEFAULTS.showToolbar,
+    enum: ['always', 'onHover', 'never'],
+    enumDescriptions: [
+      localize(
+        'editor.configuration.inlineSuggest.showToolbar.always',
+        'Show the inline suggestion toolbar whenever an inline suggestion is shown.',
+      ),
+      localize(
+        'editor.configuration.inlineSuggest.showToolbar.onHover',
+        'Show the inline suggestion toolbar when hovering over an inline suggestion.',
+      ),
+      localize('editor.configuration.inlineSuggest.showToolbar.never', 'Never show the inline suggestion toolbar.'),
+    ],
+    description: '%editor.configuration.inlineSuggest.showToolbar%',
+  },
   'editor.experimental.stickyScroll.enabled': {
     type: 'boolean',
     default: true,
@@ -1394,15 +1430,6 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
     description: '%editor.configuration.largeFileOptimizations%',
   },
-  'diffEditor.renderIndicators': {
-    type: 'boolean',
-    default: true,
-    description: '%editor.configuration.renderIndicators%',
-  },
-  'diffEditor.minimap': {
-    type: 'boolean',
-    default: false,
-  },
   'editor.defaultFormatter': {
     type: 'string',
     description: '%editor.configuration.defaultFormatter%',
@@ -1412,6 +1439,15 @@ const monacoEditorSchema: PreferenceSchemaProperties = {
     default: true,
     description: '%editor.configuration.unicodeHighlight.ambiguousCharacters%',
   },
+  'diffEditor.renderIndicators': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.renderIndicators,
+    description: '%editor.configuration.renderIndicators%',
+  },
+  'diffEditor.minimap': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.minimap,
+  },
 };
 
 const customEditorSchema: PreferenceSchemaProperties = {
@@ -1604,25 +1640,64 @@ const customEditorSchema: PreferenceSchemaProperties = {
       type: 'string',
     },
   },
-  'diffEditor.renderSideBySide': {
+  'editor.experimental.stickyScroll.enabled': {
+    type: 'boolean',
+    default: false,
+    description: '%editor.configuration.experimental.stickyScroll.enabled%',
+  },
+  'editor.mouseBackForwardToNavigate': {
     type: 'boolean',
     default: true,
+    description: '%editor.configuration.mouseBackForwardToNavigate%',
+  },
+  'diffEditor.renderSideBySide': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.renderSideBySide,
     description: '%diffEditor.configuration.renderSideBySide%',
   },
   'diffEditor.ignoreTrimWhitespace': {
     type: 'boolean',
-    default: false,
+    default: DIFF_EDITOR_DEFAULTS.ignoreTrimWhitespace,
     description: '%diffEditor.configuration.ignoreTrimWhitespace%',
   },
-  'editor.experimental.stickyScroll.enabled': {
+  'diffEditor.hideUnchangedRegions.enabled': {
     type: 'boolean',
-    default: false,
-    description: '%editor.configuration.experimental.stickyScroll.enabled%',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.enabled,
+    description: 'Controls whether the diff editor shows unchanged regions.',
   },
-  'editor.mouseBackForwardToNavigate': {
+  'diffEditor.hideUnchangedRegions.revealLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.revealLineCount,
+    description: 'Controls how many lines are used for unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.hideUnchangedRegions.minimumLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.minimumLineCount,
+    description: 'Controls how many lines are used as a minimum for unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.hideUnchangedRegions.contextLineCount': {
+    type: 'integer',
+    default: DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.contextLineCount,
+    description: 'Controls how many lines are used as context when comparing unchanged regions.',
+    minimum: 1,
+  },
+  'diffEditor.experimental.showMoves': {
     type: 'boolean',
-    default: true,
-    description: '%editor.configuration.mouseBackForwardToNavigate%',
+    default: DIFF_EDITOR_DEFAULTS.experimental.showMoves,
+    description: 'Controls whether the diff editor should show detected code moves.',
+  },
+  'diffEditor.experimental.showEmptyDecorations': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.experimental.showEmptyDecorations,
+    description:
+      'Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.',
+  },
+  'diffEditor.experimental.collapseUnchangedRegions': {
+    type: 'boolean',
+    default: DIFF_EDITOR_DEFAULTS.experimental.collapseUnchangedRegions,
+    description: 'Controls whether the diff editor shows unchanged regions.',
   },
 };
 

package/src/browser/quick-open/go-to-line.ts

@@ -7,11 +7,11 @@ import {
   withNullAsUndefined,
 } from '@opensumi/ide-core-browser';
 import { Mode, PrefixQuickOpenService, QuickOpenItem, QuickOpenModel } from '@opensumi/ide-core-browser/lib/quick-open';
+import * as monaco from '@opensumi/ide-monaco';
 import { Event as MonacoEvent } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 import { IRange as IMonacoRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
 import { IEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
 import { AbstractGotoLineQuickAccessProvider } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import { WorkbenchEditorService } from '../types';
 

package/src/browser/types.ts

@@ -12,7 +12,7 @@ import {
 } from '@opensumi/ide-core-browser';
 import { IContextMenu } from '@opensumi/ide-core-browser/lib/menu/next';
 import { IThemeColor } from '@opensumi/ide-core-common';
-import { editor } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
+import { editor } from '@opensumi/ide-monaco';
 
 import {
   DragOverPosition,

package/src/browser/view/topPadding.ts

@@ -1,4 +1,4 @@
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
+import * as monaco from '@opensumi/ide-monaco';
 
 import { IEditor } from '../../common';
 import { IEditorFeatureContribution } from '../types';

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

@@ -49,8 +49,8 @@ import {
   makeRandomHexString,
   match,
 } from '@opensumi/ide-core-common';
+import * as monaco from '@opensumi/ide-monaco';
 import { IDialogService, IMessageService } from '@opensumi/ide-overlay';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import {
   CursorStatus,
@@ -1503,6 +1503,8 @@ export class EditorGroup extends WithEventBus implements IGridEditorGroup {
       const query = uri.getParsedQuery();
       this.doDisposeDocRef(new URI(query.original));
       this.doDisposeDocRef(new URI(query.modified));
+    } else if (uri.scheme === 'mergeEditor') {
+      this.mergeEditor.dispose();
     } else {
       this.doDisposeDocRef(uri);
     }

package/src/common/language.ts

@@ -1,8 +1,8 @@
 import LSTypes from 'vscode-languageserver-types';
 
 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 { editor } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 import type { IRelatedInformation } from '@opensumi/monaco-editor-core/esm/vs/platform/markers/common/markers';