@codingame/monaco-vscode-api 16.1.0 → 17.0.0

package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js

@@ -33,28 +33,20 @@ class AbstractVariableResolverService {
     }
     async resolveWithEnvironment(environment, folder, value) {
         const expr = ConfigurationResolverExpression.parse(value);
-        const env = {
-            env: this.prepareEnv(environment),
-            userHome: undefined
-        };
         for (const replacement of expr.unresolved()) {
-            const resolvedValue = await this.evaluateSingleVariable(env, replacement, folder?.uri);
+            const resolvedValue = await this.evaluateSingleVariable(replacement, folder?.uri, environment);
             if (resolvedValue !== undefined) {
-                expr.resolve(replacement, resolvedValue);
+                expr.resolve(replacement, String(resolvedValue));
             }
         }
         return expr.toObject();
     }
     async resolveAsync(folder, config) {
         const expr = ConfigurationResolverExpression.parse(config);
-        const environment = {
-            env: await this._envVariablesPromise,
-            userHome: await this._userHomePromise
-        };
         for (const replacement of expr.unresolved()) {
-            const resolvedValue = await this.evaluateSingleVariable(environment, replacement, folder?.uri);
+            const resolvedValue = await this.evaluateSingleVariable(replacement, folder?.uri);
             if (resolvedValue !== undefined) {
-                expr.resolve(replacement, resolvedValue);
+                expr.resolve(replacement, String(resolvedValue));
             }
         }
         return expr.toObject();
@@ -77,7 +69,11 @@ class AbstractVariableResolverService {
     fsPath(displayUri) {
         return this._labelService ? this._labelService.getUriLabel(displayUri, { noPrefix: true }) : displayUri.fsPath;
     }
-    async evaluateSingleVariable(environment, replacement, folderUri, commandValueMapping) {
+    async evaluateSingleVariable(replacement, folderUri, processEnvironment, commandValueMapping) {
+        const environment = {
+            env: (processEnvironment !== undefined) ? this.prepareEnv(processEnvironment) : await this._envVariablesPromise,
+            userHome: (processEnvironment !== undefined) ? undefined : await this._userHomePromise
+        };
         const { name: variable, arg: argument } = replacement;
         const getFilePath = (variableKind) => {
             const filePath = this._context.getFilePath();
@@ -85,7 +81,7 @@ class AbstractVariableResolverService {
                 return normalizeDriveLetter(filePath);
             }
             throw ( new VariableError(variableKind, ( localize(
-                11994,
+                12123,
                 "Variable {0} can not be resolved. Please open an editor.",
                 replacement.id
             ))));
@@ -99,7 +95,7 @@ class AbstractVariableResolverService {
                 }
             }
             throw ( new VariableError(variableKind, ( localize(
-                11995,
+                12124,
                 "Variable {0}: can not find workspace folder of '{1}'.",
                 replacement.id,
                 basename(filePath)
@@ -112,7 +108,7 @@ class AbstractVariableResolverService {
                     return folder;
                 }
                 throw ( new VariableError(variableKind, ( localize(
-                    11996,
+                    12125,
                     "Variable {0} can not be resolved. No such folder '{1}'.",
                     variableKind,
                     argument
@@ -123,13 +119,13 @@ class AbstractVariableResolverService {
             }
             if (this._context.getWorkspaceFolderCount() > 1) {
                 throw ( new VariableError(variableKind, ( localize(
-                    11997,
+                    12126,
                     "Variable {0} can not be resolved in a multi folder workspace. Scope this variable using ':' and a workspace folder name.",
                     variableKind
                 ))));
             }
             throw ( new VariableError(variableKind, ( localize(
-                11998,
+                12127,
                 "Variable {0} can not be resolved. Please open a folder.",
                 variableKind
             ))));
@@ -146,7 +142,7 @@ class AbstractVariableResolverService {
                     return '';
                 }
                 throw ( new VariableError(VariableKind.Env, ( localize(
-                    11999,
+                    12128,
                     "Variable {0} can not be resolved because no environment variable name is given.",
                     replacement.id
                 ))));
@@ -155,7 +151,7 @@ class AbstractVariableResolverService {
                     const config = this._context.getConfigurationValue(folderUri, argument);
                     if (isUndefinedOrNull(config)) {
                         throw ( new VariableError(VariableKind.Config, ( localize(
-                            12000,
+                            12129,
                             "Variable {0} can not be resolved because setting '{1}' not found.",
                             replacement.id,
                             argument
@@ -163,7 +159,7 @@ class AbstractVariableResolverService {
                     }
                     if (isObject(config)) {
                         throw ( new VariableError(VariableKind.Config, ( localize(
-                            12001,
+                            12130,
                             "Variable {0} can not be resolved because '{1}' is a structured value.",
                             replacement.id,
                             argument
@@ -172,7 +168,7 @@ class AbstractVariableResolverService {
                     return config;
                 }
                 throw ( new VariableError(VariableKind.Config, ( localize(
-                    12002,
+                    12131,
                     "Variable {0} can not be resolved because no settings name is given.",
                     replacement.id
                 ))));
@@ -185,7 +181,7 @@ class AbstractVariableResolverService {
                     const ext = await this._context.getExtension(argument);
                     if (!ext) {
                         throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                            12003,
+                            12132,
                             "Variable {0} can not be resolved because the extension {1} is not installed.",
                             replacement.id,
                             argument
@@ -194,7 +190,7 @@ class AbstractVariableResolverService {
                     return this.fsPath(ext.extensionLocation);
                 }
                 throw ( new VariableError(VariableKind.ExtensionInstallFolder, ( localize(
-                    12004,
+                    12133,
                     "Variable {0} can not be resolved because no extension name is given.",
                     replacement.id
                 ))));
@@ -222,7 +218,7 @@ class AbstractVariableResolverService {
                             return environment.userHome;
                         }
                         throw ( new VariableError(VariableKind.UserHome, ( localize(
-                            12005,
+                            12134,
                             "Variable {0} can not be resolved. UserHome path is not defined",
                             replacement.id
                         ))));
@@ -232,7 +228,7 @@ class AbstractVariableResolverService {
                             return lineNumber;
                         }
                         throw ( new VariableError(VariableKind.LineNumber, ( localize(
-                            12006,
+                            12135,
                             "Variable {0} can not be resolved. Make sure to have a line selected in the active editor.",
                             replacement.id
                         ))));
@@ -243,7 +239,7 @@ class AbstractVariableResolverService {
                             return columnNumber;
                         }
                         throw ( new Error(( localize(
-                            12007,
+                            12136,
                             "Variable {0} can not be resolved. Make sure to have a column selected in the active editor.",
                             replacement.id
                         ))));
@@ -254,7 +250,7 @@ class AbstractVariableResolverService {
                             return selectedText;
                         }
                         throw ( new VariableError(VariableKind.SelectedText, ( localize(
-                            12008,
+                            12137,
                             "Variable {0} can not be resolved. Make sure to have some text selected in the active editor.",
                             replacement.id
                         ))));
@@ -326,7 +322,7 @@ class AbstractVariableResolverService {
                 return v;
             }
             throw ( new VariableError(variableKind, ( localize(
-                12009,
+                12138,
                 "Variable {0} can not be resolved because the command has no value.",
                 match
             ))));

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

@@ -8,7 +8,7 @@ import { DisposableStore, IDisposable } from "../../../../base/common/lifecycle.
 import { ContextKeyValue, RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IGroupModelChangeEvent } from "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common/vscode/vs/workbench/common/editor/editorGroupModel";
+import { IGroupModelChangeEvent } from "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel";
 import { IMenuChangeEvent } from "../../../../platform/actions/common/actions.js";
 import { DeepPartial } from "../../../../base/common/types.js";
 export declare enum GroupDirection {
@@ -208,6 +208,9 @@ export interface IEditorGroup {
     copyEditors(editors: EditorInputWithOptions[], target: IEditorGroup): void;
     closeEditor(editor?: EditorInput, options?: ICloseEditorOptions): Promise<boolean>;
     closeEditors(editors: EditorInput[] | ICloseEditorsFilter, options?: ICloseEditorOptions): Promise<boolean>;
+    closeAllEditors(options: {
+        excludeConfirming: true;
+    }): boolean;
     closeAllEditors(options?: ICloseAllEditorsOptions): Promise<boolean>;
     replaceEditors(editors: IEditorReplacement[]): Promise<void>;
     pinEditor(editor?: EditorInput): void;

package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts

@@ -17,6 +17,7 @@ export interface IEditorGroupsService extends IEditorGroupsContainer {
     readonly onDidChangeEditorPartOptions: Event<IEditorPartOptionsChangeEvent>;
     createAuxiliaryEditorPart(options?: {
         bounds?: Partial<IRectangle>;
+        compact?: boolean;
     }): Promise<IAuxiliaryEditorPart>;
     getScopedInstantiationService(part: IEditorPart): IInstantiationService;
     saveWorkingSet(name: string): IEditorWorkingSet;

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

@@ -16,7 +16,7 @@ const editorAssociationsConfigurationNode = {
         'workbench.editorAssociations': {
             type: 'object',
             markdownDescription: ( localize(
-                12062,
+                12191,
                 "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
             )),
             additionalProperties: {

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

@@ -1,7 +1,7 @@
 import { GroupIdentifier, ISaveOptions, IRevertOptions, IUntypedEditorInput } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
 import { IEditorGroup } from "./editorGroupsService.js";
-import { IGroupModelChangeEvent } from "@codingame/monaco-vscode-ad89fae6-94f0-5ac2-a185-22dea4b68ee0-common/vscode/vs/workbench/common/editor/editorGroupModel";
+import { IGroupModelChangeEvent } from "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common/vscode/vs/workbench/common/editor/editorGroupModel";
 export declare const ACTIVE_GROUP = -1;
 export type ACTIVE_GROUP_TYPE = typeof ACTIVE_GROUP;
 export declare const SIDE_GROUP = -2;

package/vscode/src/vs/workbench/services/editor/common/editorService.service.d.ts

@@ -3,7 +3,7 @@ import { DisposableStore } from "../../../../base/common/lifecycle.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IEditor, IDiffEditor } from "../../../../editor/common/editorCommon.js";
 import { IResourceEditorInput, ITextResourceEditorInput, IEditorOptions, IResourceEditorInputIdentifier } from "../../../../platform/editor/common/editor.js";
-import { IEditorWillOpenEvent, IEditorCloseEvent, IVisibleEditorPane, EditorsOrder, IEditorIdentifier, GroupIdentifier, IEditorPane, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane, IUntypedEditorInput, IFindEditorOptions, IRevertOptions } from "../../../common/editor.js";
+import { IEditorWillOpenEvent, IEditorCloseEvent, IVisibleEditorPane, EditorsOrder, IEditorIdentifier, GroupIdentifier, IEditorPane, IUntitledTextResourceEditorInput, ITextResourceDiffEditorInput, IResourceDiffEditorInput, ITextDiffEditorPane, IUntypedEditorInput, IFindEditorOptions, IRevertOptions } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
 import { IEditorGroup, ICloseEditorOptions, IEditorGroupsContainer } from "./editorGroupsService.js";
 import { IEditorsChangeEvent, SIDE_GROUP_TYPE, ACTIVE_GROUP_TYPE, AUX_WINDOW_GROUP_TYPE, IOpenEditorsOptions, IUntypedEditorReplacement, ISaveEditorsOptions, ISaveEditorsResult, ISaveAllEditorsOptions, IRevertAllEditorsOptions } from "./editorService.js";
@@ -30,7 +30,7 @@ export interface IEditorService {
     }): readonly IEditorIdentifier[];
     openEditor(editor: IResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
     openEditor(editor: ITextResourceEditorInput | IUntitledTextResourceEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
-    openEditor(editor: IResourceDiffEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<ITextDiffEditorPane | undefined>;
+    openEditor(editor: ITextResourceDiffEditorInput | IResourceDiffEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<ITextDiffEditorPane | undefined>;
     openEditor(editor: IUntypedEditorInput, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
     openEditor(editor: EditorInput, options?: IEditorOptions, group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE): Promise<IEditorPane | undefined>;
     openEditors(editors: IUntypedEditorInput[], group?: IEditorGroup | GroupIdentifier | SIDE_GROUP_TYPE | ACTIVE_GROUP_TYPE | AUX_WINDOW_GROUP_TYPE, options?: IOpenEditorsOptions): Promise<readonly IEditorPane[]>;

package/vscode/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.service.d.ts

@@ -1,7 +1,7 @@
 import { IStringDictionary } from "../../../../base/common/collections.js";
 import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
-import { IExtensionRecommendationReason, type IgnoredRecommendationChangeNotification } from "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations";
+import { IExtensionRecommendationReason, type IgnoredRecommendationChangeNotification } from "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common/vscode/vs/workbench/services/extensionRecommendations/common/extensionRecommendations";
 export declare const IExtensionRecommendationsService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtensionRecommendationsService>;
 export interface IExtensionRecommendationsService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.service.d.ts

@@ -1,5 +1,5 @@
 import { Event } from "../../../../base/common/event.js";
-import { IExtensionsConfigContent } from "@codingame/monaco-vscode-805e9c2f-56b6-5a43-8b5b-d2dc2d3805fc-common/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig";
+import { IExtensionsConfigContent } from "@codingame/monaco-vscode-ecf3436d-6064-5fbd-a760-37a211ce79c7-common/vscode/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig";
 export declare const IWorkspaceExtensionsConfigService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkspaceExtensionsConfigService>;
 export interface IWorkspaceExtensionsConfigService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.d.ts

@@ -14,7 +14,7 @@ export interface IReadOnlyExtensionDescriptionRegistry {
     getExtensionDescriptionByUUID(uuid: string): IExtensionDescription | undefined;
     getExtensionDescriptionByIdOrUUID(extensionId: ExtensionIdentifier | string, uuid: string | undefined): IExtensionDescription | undefined;
 }
-export declare class ExtensionDescriptionRegistry implements IReadOnlyExtensionDescriptionRegistry {
+export declare class ExtensionDescriptionRegistry extends Disposable implements IReadOnlyExtensionDescriptionRegistry {
     private readonly _activationEventsReader;
     static isHostExtension(extensionId: ExtensionIdentifier | string, myRegistry: ExtensionDescriptionRegistry, globalRegistry: ExtensionDescriptionRegistry): boolean;
     private readonly _onDidChange;

package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js

@@ -11,7 +11,7 @@ class DeltaExtensionsResult {
         this.removedDueToLooping = removedDueToLooping;
     }
 }
-class ExtensionDescriptionRegistry {
+class ExtensionDescriptionRegistry extends Disposable {
     static isHostExtension(extensionId, myRegistry, globalRegistry) {
         if (myRegistry.getExtensionDescription(extensionId)) {
             return false;
@@ -26,8 +26,9 @@ class ExtensionDescriptionRegistry {
         return false;
     }
     constructor(_activationEventsReader, extensionDescriptions) {
+        super();
         this._activationEventsReader = _activationEventsReader;
-        this._onDidChange = ( new Emitter());
+        this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._versionId = 0;
         this._extensionDescriptions = extensionDescriptions;