@codingame/monaco-vscode-configuration-service-override 37.6.1 → 38.0.0

package/vscode/src/vs/workbench/services/configurationResolver/browser/baseConfigurationResolverService.js

@@ -150,7 +150,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 if (!isUndefinedOrNull(value)) {
                     if (typeof value !== "string") {
                         throw ( new VariableError(VariableKind.Command, ( localize(
-                            21770,
+                            24345,
                             "Cannot substitute command variable '{0}' because command did not return a result of type string.",
                             commandId
                         ))));
@@ -250,7 +250,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
     async showUserInput(section, variable, inputInfos, variableToCommandMap) {
         if (!inputInfos) {
             throw ( new VariableError(VariableKind.Input, ( localize(
-                21771,
+                24346,
                 "Variable '{0}' must be defined in an '{1}' section of the debug or task configuration.",
                 variable,
                 "inputs"
@@ -260,7 +260,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
         if (info) {
             const missingAttribute = attrName => {
                 throw ( new VariableError(VariableKind.Input, ( localize(
-                    21772,
+                    24347,
                     "Input variable '{0}' is of type '{1}' and must include '{2}'.",
                     variable,
                     info.type,
@@ -318,7 +318,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                         };
                         const topValue = variableToCommandMap?.[`input:${variable}`] ?? previousPickedValue ?? info.default;
                         if (value === info.default) {
-                            item.description = ( localize(21773, "(Default)"));
+                            item.description = ( localize(24348, "(Default)"));
                             picks.unshift(item);
                         } else if (value === topValue) {
                             picks.unshift(item);
@@ -356,7 +356,7 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                             };
                         }
                         throw ( new VariableError(VariableKind.Input, ( localize(
-                            21774,
+                            24349,
                             "Cannot substitute input variable '{0}' because command '{1}' did not return a result of type string.",
                             variable,
                             info.command
@@ -365,14 +365,14 @@ class BaseConfigurationResolverService extends AbstractVariableResolverService {
                 }
             default:
                 throw ( new VariableError(VariableKind.Input, ( localize(
-                    21775,
+                    24350,
                     "Input variable '{0}' can only be of type 'promptString', 'pickString', or 'command'.",
                     variable
                 ))));
             }
         }
         throw ( new VariableError(VariableKind.Input, ( localize(
-            21776,
+            24351,
             "Undefined input variable '{0}' encountered. Remove or define '{0}' to continue.",
             variable
         ))));

package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.d.ts

@@ -7,7 +7,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { BaseConfigurationResolverService } from "./baseConfigurationResolverService.js";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
-import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service";
+import { IPathService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService";
 export declare class ConfigurationResolverService extends BaseConfigurationResolverService {
     constructor(editorService: IEditorService, configurationService: IConfigurationService, commandService: ICommandService, workspaceContextService: IWorkspaceContextService, quickInputService: IQuickInputService, labelService: ILabelService, pathService: IPathService, extensionService: IExtensionService, storageService: IStorageService);
 }

package/vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js

@@ -11,7 +11,8 @@ import { BaseConfigurationResolverService } from './baseConfigurationResolverSer
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService';
+import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/platform/path/common/pathService.service';
 
 let ConfigurationResolverService = class ConfigurationResolverService extends BaseConfigurationResolverService {
     constructor(

package/vscode/src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.js

@@ -92,8 +92,8 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
             availableFileSystems.unshift(Schemas.vscodeRemote);
         }
         let workspacePath = await this.fileDialogService.showSaveDialog({
-            saveLabel: ( localize(22688, "Save")),
-            title: ( localize(22689, "Save Workspace")),
+            saveLabel: ( localize(25284, "Save")),
+            title: ( localize(25285, "Save Workspace")),
             filters: WORKSPACE_FILTER,
             defaultUri: joinPath(
                 await this.fileDialogService.defaultWorkspacePath(),
@@ -323,14 +323,14 @@ let AbstractWorkspaceEditingService = class AbstractWorkspaceEditingService exte
     }
     onInvalidWorkspaceConfigurationFileError() {
         const message = ( localize(
-            22690,
+            25286,
             "Unable to write into workspace configuration file. Please open the file to correct errors/warnings in it and try again."
         ));
         this.askToOpenWorkspaceConfigurationFile(message);
     }
     askToOpenWorkspaceConfigurationFile(message) {
         this.notificationService.prompt(Severity.Error, message, [{
-            label: ( localize(22691, "Open Workspace Configuration")),
+            label: ( localize(25287, "Open Workspace Configuration")),
             run: () => this.commandService.executeCommand("workbench.action.openWorkspaceConfigFile")
         }]);
     }