@codingame/monaco-vscode-task-service-override 4.5.0 → 4.5.2

package/vscode/src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.js

@@ -28,6 +28,7 @@ import { VSCodeSequence } from '../../terminal/browser/terminalEscapeSequences.j
 import { TerminalProcessExtHostProxy } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy';
 import { TERMINAL_VIEW_ID } from 'vscode/vscode/vs/workbench/contrib/terminal/common/terminal';
 
+const _moduleId = "vs/workbench/contrib/tasks/browser/terminalTaskSystem";
 const ReconnectionType = 'Task';
 class VariableResolver {
     static { this._regex = /\$\{(.*?)\}/g; }
@@ -75,7 +76,9 @@ class VerifiedTask {
             return { task: this.task, resolver: this.resolver, trigger: this.trigger, resolvedVariables: this.resolvedVariables, systemInfo: this.systemInfo, workspaceFolder: this.workspaceFolder, shellLaunchConfig: this.shellLaunchConfig };
         }
         else {
-            throw new Error('VerifiedTask was not checked. verify must be checked before getVerifiedTask.');
+            throw ( (new Error(
+                'VerifiedTask was not checked. verify must be checked before getVerifiedTask.'
+            )));
         }
     }
 }
@@ -152,9 +155,9 @@ class TerminalTaskSystem extends Disposable {
         this._activeTasks = Object.create(null);
         this._busyTasks = Object.create(null);
         this._terminals = Object.create(null);
-        this._idleTaskTerminals = ( new LinkedMap());
+        this._idleTaskTerminals = ( (new LinkedMap()));
         this._sameTaskTerminals = Object.create(null);
-        this._onDidStateChange = ( new Emitter());
+        this._onDidStateChange = ( (new Emitter()));
         this._taskSystemInfoResolver = taskSystemInfoResolver;
         this._register(this._terminalStatusManager = instantiationService.createInstance(TaskTerminalStatus));
     }
@@ -176,7 +179,7 @@ class TerminalTaskSystem extends Disposable {
         const instances = InMemoryTask.is(task) || this._isTaskEmpty(task) ? [] : this._getInstances(task);
         const validInstance = instances.length < ((task.runOptions && task.runOptions.instanceLimit) ?? 1);
         const instance = instances[0]?.count?.count ?? 0;
-        this._currentTask = ( new VerifiedTask(task, resolver, trigger));
+        this._currentTask = ( (new VerifiedTask(task, resolver, trigger)));
         if (instance > 0) {
             task.instance = instance;
         }
@@ -186,7 +189,7 @@ class TerminalTaskSystem extends Disposable {
             return { kind: 2 , task: terminalData.task, active: { same: true, background: task.configurationProperties.isBackground }, promise: terminalData.promise };
         }
         try {
-            const executeResult = { kind: 1 , task, started: {}, promise: this._executeTask(task, resolver, trigger, ( new Set()), ( new Map()), undefined) };
+            const executeResult = { kind: 1 , task, started: {}, promise: this._executeTask(task, resolver, trigger, ( (new Set())), ( (new Map())), undefined) };
             executeResult.promise.then(summary => {
                 this._lastTask = this._currentTask;
             });
@@ -198,11 +201,15 @@ class TerminalTaskSystem extends Disposable {
             }
             else if (error instanceof Error) {
                 this._log(error.message);
-                throw new TaskError(Severity$1.Error, error.message, 7 );
+                throw ( (new TaskError(Severity$1.Error, error.message, 7 )));
             }
             else {
-                this._log(( error.toString()));
-                throw new TaskError(Severity$1.Error, localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', 'TerminalTaskSystem.unknownError', 'A unknown error has occurred while executing a task. See task output log for details.'), 7 );
+                this._log(( (error.toString())));
+                throw ( (new TaskError(Severity$1.Error, localizeWithPath(
+                    _moduleId,
+                    0,
+                    'A unknown error has occurred while executing a task. See task output log for details.'
+                ), 7 )));
             }
         }
     }
@@ -228,8 +235,8 @@ class TerminalTaskSystem extends Disposable {
             });
             const openOutput = 'Show Output';
             this._notificationService.prompt(Severity$1.Warning, ( localizeWithPath(
-                'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                'TerminalTaskSystem.taskLoadReporting',
+                _moduleId,
+                1,
                 "There are issues with task \"{0}\". See the output for more details.",
                 task._label
             )), [{
@@ -284,33 +291,39 @@ class TerminalTaskSystem extends Disposable {
         return Promise.resolve(this.isActiveSync());
     }
     isActiveSync() {
-        return ( ( Object.values(this._activeTasks)).some(value => !!value.terminal));
+        return (
+             (( (Object.values(this._activeTasks))).some(value => !!value.terminal))
+        );
     }
     canAutoTerminate() {
-        return ( Object.values(this._activeTasks)).every(value => !value.task.configurationProperties.promptOnClose);
+        return ( (Object.values(this._activeTasks))).every(value => !value.task.configurationProperties.promptOnClose);
     }
     getActiveTasks() {
-        return ( Object.values(this._activeTasks)).flatMap(value => value.terminal ? value.task : []);
+        return ( (Object.values(this._activeTasks))).flatMap(value => value.terminal ? value.task : []);
     }
     getLastInstance(task) {
         const recentKey = task.getKey();
-        return ( Object.values(this._activeTasks)).reverse().find((value) => recentKey && recentKey === value.task.getKey())?.task;
+        return ( (Object.values(this._activeTasks))).reverse().find((value) => recentKey && recentKey === value.task.getKey())?.task;
     }
     getBusyTasks() {
-        return ( ( Object.keys(this._busyTasks)).map(key => this._busyTasks[key]));
+        return (
+             (( (Object.keys(this._busyTasks))).map(key => this._busyTasks[key]))
+        );
     }
     customExecutionComplete(task, result) {
         const activeTerminal = this._activeTasks[task.getMapKey()];
         if (!activeTerminal?.terminal) {
-            return Promise.reject(( new Error('Expected to have a terminal for a custom execution task')));
+            return Promise.reject(( (new Error('Expected to have a terminal for a custom execution task'))));
         }
-        return ( new Promise((resolve) => {
-            resolve();
-        }));
+        return (
+             (new Promise((resolve) => {
+                resolve();
+            }))
+        );
     }
     _getInstances(task) {
         const recentKey = task.getKey();
-        return ( Object.values(this._activeTasks)).filter((value) => recentKey && recentKey === value.task.getKey());
+        return ( (Object.values(this._activeTasks))).filter((value) => recentKey && recentKey === value.task.getKey());
     }
     _removeFromActiveTasks(task) {
         const key = typeof task === 'string' ? task : task.getMapKey();
@@ -335,29 +348,31 @@ class TerminalTaskSystem extends Disposable {
         if (!terminal) {
             return Promise.resolve({ success: false, task: undefined });
         }
-        return ( new Promise((resolve, reject) => {
-            terminal.onDisposed(terminal => {
-                this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
-            });
-            const onExit = terminal.onExit(() => {
-                const task = activeTerminal.task;
-                try {
-                    onExit.dispose();
+        return (
+             (new Promise((resolve, reject) => {
+                terminal.onDisposed(terminal => {
                     this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
-                }
-                catch (error) {
-                }
-                resolve({ success: true, task: task });
-            });
-            terminal.dispose();
-        }));
+                });
+                const onExit = terminal.onExit(() => {
+                    const task = activeTerminal.task;
+                    try {
+                        onExit.dispose();
+                        this._fireTaskEvent(TaskEvent.terminated(task, terminal.instanceId, terminal.exitReason));
+                    }
+                    catch (error) {
+                    }
+                    resolve({ success: true, task: task });
+                });
+                terminal.dispose();
+            }))
+        );
     }
     terminateAll() {
         const promises = [];
         for (const [key, terminalData] of Object.entries(this._activeTasks)) {
             const terminal = terminalData.terminal;
             if (terminal) {
-                promises.push(( new Promise((resolve, reject) => {
+                promises.push(( (new Promise((resolve, reject) => {
                     const onExit = terminal.onExit(() => {
                         const task = terminalData.task;
                         try {
@@ -371,36 +386,31 @@ class TerminalTaskSystem extends Disposable {
                         }
                         resolve({ success: true, task: terminalData.task });
                     });
-                })));
+                }))));
                 terminal.dispose();
             }
         }
         return Promise.all(promises);
     }
     _showDependencyCycleMessage(task) {
-        this._log(( localizeWithPath(
-            'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-            'dependencyCycle',
-            'There is a dependency cycle. See task "{0}".',
-            task._label
-        )));
+        this._log(( localizeWithPath(_moduleId, 2, 'There is a dependency cycle. See task "{0}".', task._label)));
         this._showOutput();
     }
     _executeTask(task, resolver, trigger, liveDependencies, encounteredTasks, alreadyResolved) {
         this._showTaskLoadErrors(task);
         const mapKey = task.getMapKey();
         const promise = Promise.resolve().then(async () => {
-            alreadyResolved = alreadyResolved ?? ( new Map());
+            alreadyResolved = alreadyResolved ?? ( (new Map()));
             const promises = [];
             if (task.configurationProperties.dependsOn) {
-                const nextLiveDependencies = ( new Set(liveDependencies)).add(task.getCommonTaskId());
+                const nextLiveDependencies = ( (new Set(liveDependencies))).add(task.getCommonTaskId());
                 for (const dependency of task.configurationProperties.dependsOn) {
                     const dependencyTask = await resolver.resolve(dependency.uri, dependency.task);
                     if (dependencyTask) {
                         this._adoptConfigurationForDependencyTask(dependencyTask, task);
                         let taskResult;
                         const commonKey = dependencyTask.getCommonTaskId();
-                        if (( nextLiveDependencies.has(commonKey))) {
+                        if (( (nextLiveDependencies.has(commonKey)))) {
                             this._showDependencyCycleMessage(dependencyTask);
                             taskResult = Promise.resolve({});
                         }
@@ -426,11 +436,11 @@ class TerminalTaskSystem extends Disposable {
                     }
                     else {
                         this._log(( localizeWithPath(
-                            'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                            'dependencyFailed',
+                            _moduleId,
+                            3,
                             'Couldn\'t resolve dependent task \'{0}\' in workspace folder \'{1}\'',
                             isString(dependency.task) ? dependency.task : JSON.stringify(dependency.task, undefined, 0),
-                            ( dependency.uri.toString())
+                             (dependency.uri.toString())
                         )));
                         this._showOutput();
                     }
@@ -465,14 +475,16 @@ class TerminalTaskSystem extends Disposable {
         return promise;
     }
     _createInactiveDependencyPromise(task) {
-        return ( new Promise(resolve => {
-            const taskInactiveDisposable = this.onDidStateChange(taskEvent => {
-                if (((taskEvent.kind === "inactive") ) && (taskEvent.__task === task)) {
-                    taskInactiveDisposable.dispose();
-                    resolve({ exitCode: 0 });
-                }
-            });
-        }));
+        return (
+             (new Promise(resolve => {
+                const taskInactiveDisposable = this.onDidStateChange(taskEvent => {
+                    if (((taskEvent.kind === "inactive") ) && (taskEvent.__task === task)) {
+                        taskInactiveDisposable.dispose();
+                        resolve({ exitCode: 0 });
+                    }
+                });
+            }))
+        );
     }
     _adoptConfigurationForDependencyTask(dependencyTask, task) {
         if (dependencyTask.configurationProperties.icon) {
@@ -505,7 +517,7 @@ class TerminalTaskSystem extends Disposable {
     async _resolveAndFindExecutable(systemInfo, workspaceFolder, task, cwd, envPath) {
         const command = await this._configurationResolverService.resolveAsync(workspaceFolder, CommandString.value(task.command.name));
         cwd = cwd ? await this._configurationResolverService.resolveAsync(workspaceFolder, cwd) : undefined;
-        const paths = envPath ? await Promise.all(( envPath.split(delimiter).map(p => this._configurationResolverService.resolveAsync(workspaceFolder, p)))) : undefined;
+        const paths = envPath ? await Promise.all(( (envPath.split(delimiter).map(p => this._configurationResolverService.resolveAsync(workspaceFolder, p))))) : undefined;
         let foundExecutable = await systemInfo?.findExecutable(command, cwd, paths);
         if (!foundExecutable) {
             foundExecutable = join(cwd ?? '', command);
@@ -516,9 +528,9 @@ class TerminalTaskSystem extends Disposable {
         if (alreadyResolved.size === 0) {
             return variables;
         }
-        const unresolved = ( new Set());
+        const unresolved = ( (new Set()));
         for (const variable of variables) {
-            if (!( alreadyResolved.has(variable.substring(2, variable.length - 1)))) {
+            if (!( (alreadyResolved.has(variable.substring(2, variable.length - 1))))) {
                 unresolved.add(variable);
             }
         }
@@ -526,7 +538,7 @@ class TerminalTaskSystem extends Disposable {
     }
     _mergeMaps(mergeInto, mergeFrom) {
         for (const entry of mergeFrom) {
-            if (!( mergeInto.has(entry[0]))) {
+            if (!( (mergeInto.has(entry[0])))) {
                 mergeInto.set(entry[0], entry[1]);
             }
         }
@@ -542,7 +554,7 @@ class TerminalTaskSystem extends Disposable {
         const cwd = options ? options.cwd : undefined;
         let envPath = undefined;
         if (options && options.env) {
-            for (const key of ( Object.keys(options.env))) {
+            for (const key of ( (Object.keys(options.env)))) {
                 if (key.toLowerCase() === 'path') {
                     if (isString(options.env[key])) {
                         envPath = options.env[key];
@@ -571,7 +583,7 @@ class TerminalTaskSystem extends Disposable {
                     return undefined;
                 }
                 this._mergeMaps(alreadyResolved, resolved.variables);
-                resolved.variables = ( new Map(alreadyResolved));
+                resolved.variables = ( (new Map(alreadyResolved)));
                 if (isProcess) {
                     let process = CommandString.value(task.command.name);
                     if (taskSystemInfo.platform === 3 ) {
@@ -584,35 +596,37 @@ class TerminalTaskSystem extends Disposable {
             return resolvedVariables;
         }
         else {
-            const variablesArray = ( new Array());
+            const variablesArray = ( (new Array()));
             unresolved.forEach(variable => variablesArray.push(variable));
-            return ( new Promise((resolve, reject) => {
-                this._configurationResolverService.resolveWithInteraction(workspaceFolder, variablesArray, 'tasks', undefined, TaskSourceKind.toConfigurationTarget(task._source.kind)).then(async (resolvedVariablesMap) => {
-                    if (resolvedVariablesMap) {
-                        this._mergeMaps(alreadyResolved, resolvedVariablesMap);
-                        resolvedVariablesMap = ( new Map(alreadyResolved));
-                        if (isProcess) {
-                            let processVarValue;
-                            if (isWindows) {
-                                processVarValue = await this._resolveAndFindExecutable(taskSystemInfo, workspaceFolder, task, cwd, envPath);
+            return (
+                 (new Promise((resolve, reject) => {
+                    this._configurationResolverService.resolveWithInteraction(workspaceFolder, variablesArray, 'tasks', undefined, TaskSourceKind.toConfigurationTarget(task._source.kind)).then(async (resolvedVariablesMap) => {
+                        if (resolvedVariablesMap) {
+                            this._mergeMaps(alreadyResolved, resolvedVariablesMap);
+                            resolvedVariablesMap = ( (new Map(alreadyResolved)));
+                            if (isProcess) {
+                                let processVarValue;
+                                if (isWindows) {
+                                    processVarValue = await this._resolveAndFindExecutable(taskSystemInfo, workspaceFolder, task, cwd, envPath);
+                                }
+                                else {
+                                    processVarValue = await this._configurationResolverService.resolveAsync(workspaceFolder, CommandString.value(task.command.name));
+                                }
+                                resolvedVariablesMap.set(TerminalTaskSystem.ProcessVarName, processVarValue);
                             }
-                            else {
-                                processVarValue = await this._configurationResolverService.resolveAsync(workspaceFolder, CommandString.value(task.command.name));
-                            }
-                            resolvedVariablesMap.set(TerminalTaskSystem.ProcessVarName, processVarValue);
+                            const resolvedVariablesResult = {
+                                variables: resolvedVariablesMap,
+                            };
+                            resolve(resolvedVariablesResult);
                         }
-                        const resolvedVariablesResult = {
-                            variables: resolvedVariablesMap,
-                        };
-                        resolve(resolvedVariablesResult);
-                    }
-                    else {
-                        resolve(undefined);
-                    }
-                }, reason => {
-                    reject(reason);
-                });
-            }));
+                        else {
+                            resolve(undefined);
+                        }
+                    }, reason => {
+                        reject(reason);
+                    });
+                }))
+            );
         }
     }
     _executeCommand(task, trigger, alreadyResolved) {
@@ -626,18 +640,18 @@ class TerminalTaskSystem extends Disposable {
             workspaceFolder = folders.length > 0 ? folders[0] : undefined;
         }
         const systemInfo = this._currentTask.systemInfo = this._taskSystemInfoResolver(workspaceFolder);
-        const variables = ( new Set());
+        const variables = ( (new Set()));
         this._collectTaskVariables(variables, task);
         const resolvedVariables = this._acquireInput(systemInfo, workspaceFolder, task, variables, alreadyResolved);
         return resolvedVariables.then((resolvedVariables) => {
             if (resolvedVariables && !this._isTaskEmpty(task)) {
                 this._currentTask.resolvedVariables = resolvedVariables;
-                return this._executeInTerminal(task, trigger, ( new VariableResolver(
+                return this._executeInTerminal(task, trigger, ( (new VariableResolver(
                     workspaceFolder,
                     systemInfo,
                     resolvedVariables.variables,
                     this._configurationResolverService
-                )), workspaceFolder);
+                ))), workspaceFolder);
             }
             else {
                 this._fireTaskEvent(TaskEvent.general("end" , task));
@@ -654,10 +668,10 @@ class TerminalTaskSystem extends Disposable {
     _reexecuteCommand(task, trigger, alreadyResolved) {
         const lastTask = this._lastTask;
         if (!lastTask) {
-            return Promise.reject(( new Error('No task previously run')));
+            return Promise.reject(( (new Error('No task previously run'))));
         }
         const workspaceFolder = this._currentTask.workspaceFolder = lastTask.workspaceFolder;
-        const variables = ( new Set());
+        const variables = ( (new Set()));
         this._collectTaskVariables(variables, task);
         let hasAllVariables = true;
         variables.forEach(value => {
@@ -672,24 +686,24 @@ class TerminalTaskSystem extends Disposable {
                     return { exitCode: 0 };
                 }
                 this._currentTask.resolvedVariables = resolvedVariables;
-                return this._executeInTerminal(task, trigger, ( new VariableResolver(
+                return this._executeInTerminal(task, trigger, ( (new VariableResolver(
                     lastTask.getVerifiedTask().workspaceFolder,
                     lastTask.getVerifiedTask().systemInfo,
                     resolvedVariables.variables,
                     this._configurationResolverService
-                )), workspaceFolder);
+                ))), workspaceFolder);
             }, reason => {
                 return Promise.reject(reason);
             });
         }
         else {
             this._currentTask.resolvedVariables = lastTask.getVerifiedTask().resolvedVariables;
-            return this._executeInTerminal(task, trigger, ( new VariableResolver(
+            return this._executeInTerminal(task, trigger, ( (new VariableResolver(
                 lastTask.getVerifiedTask().workspaceFolder,
                 lastTask.getVerifiedTask().systemInfo,
                 lastTask.getVerifiedTask().resolvedVariables.variables,
                 this._configurationResolverService
-            )), workspaceFolder);
+            ))), workspaceFolder);
         }
     }
     async _executeInTerminal(task, trigger, resolver, workspaceFolder) {
@@ -698,22 +712,22 @@ class TerminalTaskSystem extends Disposable {
         let promise = undefined;
         if (task.configurationProperties.isBackground) {
             const problemMatchers = await this._resolveMatchers(resolver, task.configurationProperties.problemMatchers);
-            const watchingProblemMatcher = ( new WatchingProblemCollector(
+            const watchingProblemMatcher = ( (new WatchingProblemCollector(
                 problemMatchers,
                 this._markerService,
                 this._modelService,
                 this._fileService
-            ));
+            )));
             if ((problemMatchers.length > 0) && !watchingProblemMatcher.isWatching()) {
                 this._appendOutput(( localizeWithPath(
-                    'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                    'TerminalTaskSystem.nonWatchingMatcher',
+                    _moduleId,
+                    4,
                     'Task {0} is a background task but uses a problem matcher without a background pattern',
                     task._label
                 )));
                 this._showOutput();
             }
-            const toDispose = ( new DisposableStore());
+            const toDispose = ( (new DisposableStore()));
             let eventCounter = 0;
             const mapKey = task.getMapKey();
             toDispose.add(watchingProblemMatcher.onDidStateChange((event) => {
@@ -748,10 +762,10 @@ class TerminalTaskSystem extends Disposable {
             let delayer = undefined;
             [terminal, error] = await this._createTerminal(task, resolver, workspaceFolder);
             if (error) {
-                return Promise.reject(( new Error(error.message)));
+                return Promise.reject(( (new Error(error.message))));
             }
             if (!terminal) {
-                return Promise.reject(( new Error(`Failed to create terminal for task ${task._label}`)));
+                return Promise.reject(( (new Error(`Failed to create terminal for task ${task._label}`))));
             }
             this._terminalStatusManager.addTerminal(task, terminal, watchingProblemMatcher);
             let processStartedSignaled = false;
@@ -777,7 +791,7 @@ class TerminalTaskSystem extends Disposable {
                     });
                 });
             }
-            promise = ( new Promise((resolve, reject) => {
+            promise = ( (new Promise((resolve, reject) => {
                 const onExit = terminal.onExit((terminalLaunchResult) => {
                     const exitCode = typeof terminalLaunchResult === 'number' ? terminalLaunchResult : terminalLaunchResult?.code;
                     onData?.dispose();
@@ -791,10 +805,10 @@ class TerminalTaskSystem extends Disposable {
                     if (terminalLaunchResult !== undefined) {
                         switch (task.command.presentation.panel) {
                             case PanelKind.Dedicated:
-                                this._sameTaskTerminals[key] = ( terminal.instanceId.toString());
+                                this._sameTaskTerminals[key] = ( (terminal.instanceId.toString()));
                                 break;
                             case PanelKind.Shared:
-                                this._idleTaskTerminals.set(key, ( terminal.instanceId.toString()), 1 );
+                                this._idleTaskTerminals.set(key, ( (terminal.instanceId.toString())), 1 );
                                 break;
                         }
                     }
@@ -823,11 +837,13 @@ class TerminalTaskSystem extends Disposable {
                     toDispose.dispose();
                     resolve({ exitCode: exitCode ?? undefined });
                 });
-            }));
+            })));
             if (trigger === Triggers.reconnect && !!terminal.xterm) {
                 const bufferLines = [];
                 const bufferReverseIterator = terminal.xterm.getBufferReverseIterator();
-                const startRegex = ( new RegExp(( watchingProblemMatcher.beginPatterns.map(pattern => pattern.source)).join('|')));
+                const startRegex = ( (new RegExp(
+                    ( (watchingProblemMatcher.beginPatterns.map(pattern => pattern.source))).join('|')
+                )));
                 for (const nextLine of bufferReverseIterator) {
                     bufferLines.push(nextLine);
                     if (startRegex.test(nextLine)) {
@@ -850,23 +866,23 @@ class TerminalTaskSystem extends Disposable {
         else {
             [terminal, error] = await this._createTerminal(task, resolver, workspaceFolder);
             if (error) {
-                return Promise.reject(( new Error(error.message)));
+                return Promise.reject(( (new Error(error.message))));
             }
             if (!terminal) {
-                return Promise.reject(( new Error(`Failed to create terminal for task ${task._label}`)));
+                return Promise.reject(( (new Error(`Failed to create terminal for task ${task._label}`))));
             }
             this._fireTaskEvent(TaskEvent.start(task, terminal.instanceId, resolver.values));
             const mapKey = task.getMapKey();
             this._busyTasks[mapKey] = task;
             this._fireTaskEvent(TaskEvent.general("active" , task, terminal.instanceId));
             const problemMatchers = await this._resolveMatchers(resolver, task.configurationProperties.problemMatchers);
-            const startStopProblemMatcher = ( new StartStopProblemCollector(
+            const startStopProblemMatcher = ( (new StartStopProblemCollector(
                 problemMatchers,
                 this._markerService,
                 this._modelService,
                 0 ,
                 this._fileService
-            ));
+            )));
             this._terminalStatusManager.addTerminal(task, terminal, startStopProblemMatcher);
             let processStartedSignaled = false;
             terminal.processReady.then(() => {
@@ -879,7 +895,7 @@ class TerminalTaskSystem extends Disposable {
             const onData = terminal.onLineData((line) => {
                 startStopProblemMatcher.processLine(line);
             });
-            promise = ( new Promise((resolve, reject) => {
+            promise = ( (new Promise((resolve, reject) => {
                 const onExit = terminal.onExit((terminalLaunchResult) => {
                     const exitCode = typeof terminalLaunchResult === 'number' ? terminalLaunchResult : terminalLaunchResult?.code;
                     onExit.dispose();
@@ -889,10 +905,10 @@ class TerminalTaskSystem extends Disposable {
                     if (terminalLaunchResult !== undefined) {
                         switch (task.command.presentation.panel) {
                             case PanelKind.Dedicated:
-                                this._sameTaskTerminals[key] = ( terminal.instanceId.toString());
+                                this._sameTaskTerminals[key] = ( (terminal.instanceId.toString()));
                                 break;
                             case PanelKind.Shared:
-                                this._idleTaskTerminals.set(key, ( terminal.instanceId.toString()), 1 );
+                                this._idleTaskTerminals.set(key, ( (terminal.instanceId.toString())), 1 );
                                 break;
                         }
                     }
@@ -928,7 +944,7 @@ class TerminalTaskSystem extends Disposable {
                     this._fireTaskEvent(TaskEvent.general("end" , task, terminal?.instanceId));
                     resolve({ exitCode: exitCode ?? undefined });
                 });
-            }));
+            })));
         }
         const showProblemPanel = task.command.presentation && (task.command.presentation.revealProblems === RevealProblemKind.Always);
         if (showProblemPanel) {
@@ -964,7 +980,7 @@ class TerminalTaskSystem extends Disposable {
                     cwd = join(workspaceFolder.uri.fsPath, cwd);
                 }
             }
-            cwd = isUNC(cwd) ? cwd : toLocalResource(( URI.from({ scheme: Schemas.file, path: cwd })), this._environmentService.remoteAuthority, this._pathService.defaultUriScheme);
+            cwd = isUNC(cwd) ? cwd : toLocalResource(( (URI.from({ scheme: Schemas.file, path: cwd }))), this._environmentService.remoteAuthority, this._pathService.defaultUriScheme);
         }
         if (isShellCommand) {
             let os;
@@ -1065,16 +1081,10 @@ class TerminalTaskSystem extends Disposable {
             if (task.command.presentation && task.command.presentation.echo) {
                 if (needsFolderQualification && workspaceFolder) {
                     const folder = cwd && typeof cwd === 'object' && 'path' in cwd ? basename(cwd.path) : workspaceFolder.name;
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
-                        key: 'task.executingInFolder',
-                        comment: ['The workspace folder the task is running in', 'The task command line or label']
-                    }, 'Executing task in folder {0}: {1}', folder, commandLine)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath(_moduleId, 5, 'Executing task in folder {0}: {1}', folder, commandLine)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
                 }
                 else {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
-                        key: 'task.executing.shellIntegration',
-                        comment: ['The task command line or label']
-                    }, 'Executing task: {0}', commandLine)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath(_moduleId, 6, 'Executing task: {0}', commandLine)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
                 }
             }
             else {
@@ -1095,7 +1105,7 @@ class TerminalTaskSystem extends Disposable {
                 icon: task.configurationProperties.icon?.id ? ThemeIcon.fromId(task.configurationProperties.icon.id) : undefined,
                 color: task.configurationProperties.icon?.color || undefined,
                 executable: executable,
-                args: ( args.map(a => isString(a) ? a : a.value)),
+                args: ( (args.map(a => isString(a) ? a : a.value))),
                 waitOnExit
             };
             if (task.command.presentation && task.command.presentation.echo) {
@@ -1109,16 +1119,21 @@ class TerminalTaskSystem extends Disposable {
                     return args.join(' ');
                 };
                 if (needsFolderQualification && workspaceFolder) {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
-                        key: 'task.executingInFolder',
-                        comment: ['The workspace folder the task is running in', 'The task command line or label']
-                    }, 'Executing task in folder {0}: {1}', workspaceFolder.name, `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath(
+                        _moduleId,
+                        5,
+                        'Executing task in folder {0}: {1}',
+                        workspaceFolder.name,
+                        `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
+                    )), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
                 }
                 else {
-                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
-                        key: 'task.executing.shell-integration',
-                        comment: ['The task command line or label']
-                    }, 'Executing task: {0}', `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`)), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
+                    shellLaunchConfig.initialText = this.taskShellIntegrationStartSequence(cwd) + formatMessageForTerminal(( localizeWithPath(
+                        _moduleId,
+                        7,
+                        'Executing task: {0}',
+                        `${shellLaunchConfig.executable} ${getArgsToEcho(shellLaunchConfig.args)}`
+                    )), { excludeLeadingNewLine: true }) + this.taskShellIntegrationOutputSequence;
                 }
             }
             else {
@@ -1185,7 +1200,7 @@ class TerminalTaskSystem extends Disposable {
             return reconnectedTerminal;
         }
         if (group) {
-            for (const terminal of ( Object.values(this._terminals))) {
+            for (const terminal of ( (Object.values(this._terminals)))) {
                 if (terminal.group === group) {
                     this._logService.trace(`Found terminal to split for group ${group}`);
                     const originalInstance = terminal.terminal;
@@ -1239,7 +1254,7 @@ class TerminalTaskSystem extends Disposable {
         const options = await this._resolveOptions(resolver, task.command.options);
         const presentationOptions = task.command.presentation;
         if (!presentationOptions) {
-            throw new Error('Task presentation options should not be undefined here.');
+            throw ( (new Error('Task presentation options should not be undefined here.')));
         }
         const waitOnExit = getWaitOnExitValue(presentationOptions, task.configurationProperties);
         let command;
@@ -1247,13 +1262,10 @@ class TerminalTaskSystem extends Disposable {
         let launchConfigs;
         if (task.command.runtime === RuntimeType.CustomExecution) {
             this._currentTask.shellLaunchConfig = launchConfigs = {
-                customPtyImplementation: (id, cols, rows) => ( new TerminalProcessExtHostProxy(id, cols, rows, this._terminalService)),
+                customPtyImplementation: (id, cols, rows) => ( (new TerminalProcessExtHostProxy(id, cols, rows, this._terminalService))),
                 waitOnExit,
                 name: this._createTerminalName(task),
-                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localizeWithPath('vs/workbench/contrib/tasks/browser/terminalTaskSystem', {
-                    key: 'task.executing',
-                    comment: ['The task command line or label']
-                }, 'Executing task: {0}', task._label)), { excludeLeadingNewLine: true }) : undefined,
+                initialText: task.command.presentation && task.command.presentation.echo ? formatMessageForTerminal(( localizeWithPath(_moduleId, 8, 'Executing task: {0}', task._label)), { excludeLeadingNewLine: true }) : undefined,
                 isFeatureTerminal: true,
                 icon: task.configurationProperties.icon?.id ? ThemeIcon.fromId(task.configurationProperties.icon.id) : undefined,
                 color: task.configurationProperties.icon?.color || undefined
@@ -1265,11 +1277,11 @@ class TerminalTaskSystem extends Disposable {
             args = resolvedResult.args;
             this._currentTask.shellLaunchConfig = launchConfigs = await this._createShellLaunchConfig(task, workspaceFolder, resolver, platform$1, options, command, args, waitOnExit);
             if (launchConfigs === undefined) {
-                return [undefined, ( new TaskError(Severity$1.Error, ( localizeWithPath(
-                    'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                    'TerminalTaskSystem',
+                return [undefined, ( (new TaskError(Severity$1.Error, ( localizeWithPath(
+                    _moduleId,
+                    9,
                     'Can\'t execute a shell command on an UNC drive using cmd.exe.'
-                )), 7 ))];
+                )), 7 )))];
             }
         }
         const prefersSameTerminal = presentationOptions.panel === PanelKind.Dedicated;
@@ -1287,7 +1299,7 @@ class TerminalTaskSystem extends Disposable {
         else if (allowsSharedTerminal) {
             let terminalId = this._idleTaskTerminals.remove(taskKey);
             if (!terminalId) {
-                for (const taskId of ( this._idleTaskTerminals.keys())) {
+                for (const taskId of ( (this._idleTaskTerminals.keys()))) {
                     const idleTerminalId = this._idleTaskTerminals.get(taskId);
                     if (idleTerminalId && this._terminals[idleTerminalId] && this._terminals[idleTerminalId].group === group) {
                         terminalId = this._idleTaskTerminals.remove(taskId);
@@ -1301,7 +1313,7 @@ class TerminalTaskSystem extends Disposable {
         }
         if (terminalToReuse) {
             if (!launchConfigs) {
-                throw new Error('Task shell launch configuration should not be undefined here.');
+                throw ( (new Error('Task shell launch configuration should not be undefined here.')));
             }
             terminalToReuse.terminal.scrollToBottom();
             if (task.configurationProperties.isBackground) {
@@ -1311,7 +1323,7 @@ class TerminalTaskSystem extends Disposable {
             if (task.command.presentation && task.command.presentation.clear) {
                 terminalToReuse.terminal.clearBuffer();
             }
-            this._terminals[( terminalToReuse.terminal.instanceId.toString())].lastTask = taskKey;
+            this._terminals[( (terminalToReuse.terminal.instanceId.toString()))].lastTask = taskKey;
             return [terminalToReuse.terminal, undefined];
         }
         this._terminalCreationQueue = this._terminalCreationQueue.then(() => this._doCreateTerminal(task, group, launchConfigs));
@@ -1319,7 +1331,7 @@ class TerminalTaskSystem extends Disposable {
         if (task.configurationProperties.isBackground) {
             terminal.shellLaunchConfig.reconnectionProperties = { ownerId: ReconnectionType, data: { lastTask: task.getCommonTaskId(), group, label: task._label, id: task._id } };
         }
-        const terminalKey = ( terminal.instanceId.toString());
+        const terminalKey = ( (terminal.instanceId.toString()));
         const terminalData = { terminal: terminal, lastTask: taskKey, group };
         terminal.onDisposed(() => this._deleteTaskAndTerminal(terminal, terminalData));
         this._terminals[terminalKey] = terminalData;
@@ -1372,7 +1384,7 @@ class TerminalTaskSystem extends Disposable {
                     for (const ch of shellQuoteOptions.escape.charsToEscape) {
                         buffer.push(`\\${ch}`);
                     }
-                    const regexp = ( new RegExp('[' + buffer.join(',') + ']', 'g'));
+                    const regexp = ( (new RegExp('[' + buffer.join(',') + ']', 'g')));
                     const escapeChar = shellQuoteOptions.escape.escapeChar;
                     return [value.replace(regexp, (match) => escapeChar + match), true];
                 }
@@ -1461,7 +1473,7 @@ class TerminalTaskSystem extends Disposable {
             return;
         }
         if (command.name === undefined) {
-            throw new Error('Command name should never be undefined here.');
+            throw ( (new Error('Command name should never be undefined here.')));
         }
         this._collectVariables(variables, command.name);
         command.args?.forEach(arg => this._collectVariables(variables, arg));
@@ -1476,7 +1488,7 @@ class TerminalTaskSystem extends Disposable {
             }
             const optionsEnv = options.env;
             if (optionsEnv) {
-                ( Object.keys(optionsEnv)).forEach((key) => {
+                ( (Object.keys(optionsEnv))).forEach((key) => {
                     const value = optionsEnv[key];
                     if (isString(value)) {
                         this._collectVariables(variables, value);
@@ -1538,7 +1550,7 @@ class TerminalTaskSystem extends Disposable {
         return { command, args };
     }
     async _resolveVariables(resolver, value) {
-        return Promise.all(( value.map(s => this._resolveVariable(resolver, s))));
+        return Promise.all(( (value.map(s => this._resolveVariable(resolver, s)))));
     }
     async _resolveMatchers(resolver, values) {
         if (values === undefined || values === null || values.length === 0) {
@@ -1560,8 +1572,8 @@ class TerminalTaskSystem extends Disposable {
             }
             if (!matcher) {
                 this._appendOutput(( localizeWithPath(
-                    'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                    'unknownProblemMatcher',
+                    _moduleId,
+                    10,
                     'Problem matcher {0} can\'t be resolved. The matcher will be ignored'
                 )));
                 continue;
@@ -1585,12 +1597,12 @@ class TerminalTaskSystem extends Disposable {
                     else if (filePrefix !== undefined) {
                         if (filePrefix.include) {
                             filePrefix.include = Array.isArray(filePrefix.include)
-                                ? await Promise.all(( filePrefix.include.map(x => this._resolveVariable(resolver, x))))
+                                ? await Promise.all(( (filePrefix.include.map(x => this._resolveVariable(resolver, x)))))
                                 : await this._resolveVariable(resolver, filePrefix.include);
                         }
                         if (filePrefix.exclude) {
                             filePrefix.exclude = Array.isArray(filePrefix.exclude)
-                                ? await Promise.all(( filePrefix.exclude.map(x => this._resolveVariable(resolver, x))))
+                                ? await Promise.all(( (filePrefix.exclude.map(x => this._resolveVariable(resolver, x)))))
                                 : await this._resolveVariable(resolver, filePrefix.exclude);
                         }
                     }
@@ -1611,7 +1623,7 @@ class TerminalTaskSystem extends Disposable {
             };
         }
         else {
-            throw new Error('Should never try to resolve undefined.');
+            throw ( (new Error('Should never try to resolve undefined.')));
         }
     }
     async _resolveOptions(resolver, options) {
@@ -1629,13 +1641,13 @@ class TerminalTaskSystem extends Disposable {
             : { cwd: await this._resolveVariable(resolver, '${workspaceFolder}') };
         if (options.env) {
             result.env = Object.create(null);
-            for (const key of ( Object.keys(options.env))) {
+            for (const key of ( (Object.keys(options.env)))) {
                 const value = options.env[key];
                 if (isString(value)) {
                     result.env[key] = await this._resolveVariable(resolver, value);
                 }
                 else {
-                    result.env[key] = ( value.toString());
+                    result.env[key] = ( (value.toString()));
                 }
             }
         }
@@ -1681,16 +1693,12 @@ function getWaitOnExitValue(presentationOptions, configurationProperties) {
     if ((presentationOptions.close === undefined) || (presentationOptions.close === false)) {
         if ((presentationOptions.reveal !== RevealKind.Never) || !configurationProperties.isBackground || (presentationOptions.close === false)) {
             if (presentationOptions.panel === PanelKind.New) {
-                return taskShellIntegrationWaitOnExitSequence(( localizeWithPath(
-                    'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                    'closeTerminal',
-                    'Press any key to close the terminal.'
-                )));
+                return taskShellIntegrationWaitOnExitSequence(( localizeWithPath(_moduleId, 11, 'Press any key to close the terminal.')));
             }
             else if (presentationOptions.showReuseMessage) {
                 return taskShellIntegrationWaitOnExitSequence(( localizeWithPath(
-                    'vs/workbench/contrib/tasks/browser/terminalTaskSystem',
-                    'reuseTerminal',
+                    _moduleId,
+                    12,
                     'Terminal will be reused by tasks, press any key to close it.'
                 )));
             }
@@ -1703,7 +1711,7 @@ function getWaitOnExitValue(presentationOptions, configurationProperties) {
 }
 function taskShellIntegrationWaitOnExitSequence(message) {
     return (exitCode) => {
-        return `${VSCodeSequence("D" , ( exitCode.toString()))}${message}`;
+        return `${VSCodeSequence("D" , ( (exitCode.toString())))}${message}`;
     };
 }
 function getReconnectionData(terminal) {