@codingame/monaco-vscode-api 16.1.1 → 17.1.0

package/vscode/src/vs/workbench/common/editor.d.ts

@@ -7,7 +7,7 @@ import { IEditorOptions, IResourceEditorInput, ITextResourceEditorInput, IBaseTe
 import type { EditorInput } from "./editor/editorInput.js";
 import { IInstantiationService, ServicesAccessor, BrandedService } from "../../platform/instantiation/common/instantiation.js";
 import { IContextKeyService } from "../../platform/contextkey/common/contextkey.service.js";
-import { IEncodingSupport, ILanguageSupport } from "@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/textfile/common/textfiles";
+import { IEncodingSupport, ILanguageSupport } from "../services/textfile/common/textfiles.js";
 import { IEditorGroup } from "../services/editor/common/editorGroupsService.js";
 import { ICompositeControl, IComposite } from "./composite.js";
 import { IFileReadLimits } from "../../platform/files/common/files.js";
@@ -20,7 +20,7 @@ import { IErrorWithActions } from "../../base/common/errorMessage.js";
 import { IAction } from "../../base/common/actions.js";
 import Severity from "../../base/common/severity.js";
 import { IPreferencesService } from "../services/preferences/common/preferences.service.js";
-import { IReadonlyEditorGroupModel } from "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common/vscode/vs/workbench/common/editor/editorGroupModel";
+import { IReadonlyEditorGroupModel } from "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel";
 export declare const EditorExtensions: {
     EditorPane: string;
     EditorFactory: string;
@@ -133,12 +133,16 @@ export interface IUntitledTextResourceEditorInput extends IBaseTextResourceEdito
     readonly resource: URI | undefined;
 }
 export interface IResourceSideBySideEditorInput extends IBaseUntypedEditorInput {
-    readonly primary: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput;
-    readonly secondary: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput;
+    readonly primary: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
+    readonly secondary: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
 }
 export interface IResourceDiffEditorInput extends IBaseUntypedEditorInput {
-    readonly original: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput;
-    readonly modified: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput;
+    readonly original: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
+    readonly modified: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
+}
+export interface ITextResourceDiffEditorInput extends IBaseTextResourceEditorInput {
+    readonly original: Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
+    readonly modified: Omit<ITextResourceEditorInput, "options"> | Omit<IUntitledTextResourceEditorInput, "options">;
 }
 export interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
     readonly multiDiffSource?: URI;
@@ -148,14 +152,14 @@ export interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
 export interface IMultiDiffEditorResource extends IResourceDiffEditorInput {
     readonly goToFileResource?: URI;
 }
-export type IResourceMergeEditorInputSide = (IResourceEditorInput | ITextResourceEditorInput) & {
+export type IResourceMergeEditorInputSide = (Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options">) & {
     detail?: string;
 };
 export interface IResourceMergeEditorInput extends IBaseUntypedEditorInput {
     readonly input1: IResourceMergeEditorInputSide;
     readonly input2: IResourceMergeEditorInputSide;
-    readonly base: IResourceEditorInput | ITextResourceEditorInput;
-    readonly result: IResourceEditorInput | ITextResourceEditorInput;
+    readonly base: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options">;
+    readonly result: Omit<IResourceEditorInput, "options"> | Omit<ITextResourceEditorInput, "options">;
 }
 export declare function isResourceEditorInput(editor: unknown): editor is IResourceEditorInput;
 export declare function isResourceDiffEditorInput(editor: unknown): editor is IResourceDiffEditorInput;

package/vscode/src/vs/workbench/common/editor.js

@@ -17,8 +17,8 @@ const EditorExtensions = {
 };
 const DEFAULT_EDITOR_ASSOCIATION = {
     id: 'default',
-    displayName: ( localize(3827, "Text Editor")),
-    providerDisplayName: ( localize(3828, "Built-in"))
+    displayName: ( localize(3853, "Text Editor")),
+    providerDisplayName: ( localize(3854, "Built-in"))
 };
 const SIDE_BY_SIDE_EDITOR_ID = 'workbench.editor.sidebysideEditor';
 const TEXT_DIFF_EDITOR_ID = 'workbench.editors.textDiffEditor';
@@ -166,7 +166,7 @@ function isDiffEditorInput(editor) {
 function createTooLargeFileError(group, input, options, message, preferencesService) {
     return createEditorOpenError(message, [
         toAction({
-            id: 'workbench.action.openLargeFile', label: ( localize(3829, "Open Anyway")), run: () => {
+            id: 'workbench.action.openLargeFile', label: ( localize(3855, "Open Anyway")), run: () => {
                 const fileEditorOptions = {
                     ...options,
                     limits: {
@@ -177,7 +177,7 @@ function createTooLargeFileError(group, input, options, message, preferencesServ
             }
         }),
         toAction({
-            id: 'workbench.action.configureEditorLargeFileConfirmation', label: ( localize(3830, "Configure Limit")), run: () => {
+            id: 'workbench.action.configureEditorLargeFileConfirmation', label: ( localize(3856, "Configure Limit")), run: () => {
                 return preferencesService.openUserSettings({ query: 'workbench.editorLargeFileConfirmation' });
             }
         }),