@opensumi/ide-editor 2.27.3-next-1710923688.0 → 2.27.3-next-1711421139.0

package/src/browser/menu/editor.context.ts

@@ -1,5 +1,6 @@
 import { Disposable, IContextKeyService } from '@opensumi/ide-core-browser';
 import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
+import * as monaco from '@opensumi/ide-monaco';
 import { ICodeEditor } from '@opensumi/ide-monaco/lib/common/types';
 import * as dom from '@opensumi/monaco-editor-core/esm/vs/base/browser/dom';
 import { IAnchor } from '@opensumi/monaco-editor-core/esm/vs/base/browser/ui/contextview/contextview';
@@ -8,7 +9,6 @@ import { IEditorMouseEvent, MouseTargetType } from '@opensumi/monaco-editor-core
 import { EditorOption } from '@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
 import { IEditorContribution } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
 import { ContextMenuController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/contextmenu/browser/contextmenu';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 export class EditorContextMenuController extends Disposable implements IEditorContribution {
   public static readonly ID = 'editor.contrib.contextmenu';

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

@@ -17,13 +17,12 @@ import {
   IncomingCall,
   OutgoingCall,
 } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
-import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
+import { ITextModel, Position, ProviderResult } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
 
 import { IEditorDocumentModelService } from '../../doc-model/types';
 
 const { isNonEmptyArray } = arrays;
 
-declare type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
 /* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.

package/src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts

@@ -1,11 +1,11 @@
 import { IGrammar, INITIAL, StackElement } from 'vscode-textmate';
 
 import { Disposable, Emitter, Event } from '@opensumi/ide-core-common/lib/utils';
+import * as monaco from '@opensumi/ide-monaco';
 import {
   MetadataConsts,
   TokenMetadata,
 } from '@opensumi/monaco-editor-core/esm/vs/editor/common/encodedTokenAttributes';
-import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
 
 export class TokenizerState implements monaco.languages.IState {
   constructor(public readonly ruleStack: StackElement) {}

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

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,

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