update

Author: github0null

src/CodeBuilder.ts

@@ -297,12 +297,10 @@ export abstract class CodeBuilder {
             else { shellOption.executable = '/bin/bash'; shellOption.shellArgs = ['-c']; }
             shellOption.env = <any>process.env;
             // setup task
-            const task = new vscode.Task({ type: 'shell' }, vscode.TaskScope.Workspace, title, 'eide');
             if (os.platform() == 'win32') commandLine = `"${commandLine}"`;
-            task.execution = new vscode.ShellExecution(commandLine, shellOption);
-            task.definition['command'] = commandLine;
+            const task = new vscode.Task({ type: 'shell', command: commandLine }, vscode.TaskScope.Workspace,
+                title, 'eide', new vscode.ShellExecution(commandLine, shellOption), []);
             task.group = vscode.TaskGroup.Build;
-            task.problemMatchers = [];
             task.isBackground = false;
             task.presentationOptions = { echo: true, focus: false, clear: true };
             vscode.tasks.executeTask(task);

src/extension.ts

@@ -1180,29 +1180,30 @@ class EideTaskProvider implements vscode.TaskProvider {
     public static TASK_TYPE_MSYS = 'eide.msys';
 
     provideTasks(token: vscode.CancellationToken): vscode.ProviderResult<vscode.Task[]> {
-        return [
-            new vscode.Task({ type: EideTaskProvider.TASK_TYPE_MSYS }, vscode.TaskScope.Workspace, 'msys', EideTaskProvider.TASK_TYPE_MSYS)
-        ];
+        return undefined;
     }
 
-    resolveTask(task: vscode.Task, token: vscode.CancellationToken): vscode.ProviderResult<vscode.Task> {
+    resolveTask(task_: vscode.Task, token: vscode.CancellationToken): vscode.ProviderResult<vscode.Task> {
 
         const workspaceManager = WorkspaceManager.getInstance();
 
-        if (task.definition.type == EideTaskProvider.TASK_TYPE_MSYS) {
+        if (task_.definition.type == EideTaskProvider.TASK_TYPE_MSYS) {
 
-            const definition: EideShellTaskDef = <any>task.definition;
+            const definition: EideShellTaskDef = <any>task_.definition;
 
-            task.name = definition.name || task.name;
+            const task = new vscode.Task(definition, vscode.TaskScope.Workspace,
+                definition.name, EideTaskProvider.TASK_TYPE_MSYS, definition.problemMatchers);
 
-            const shellcommand = platform.osType() == 'win32' ? `"${definition.command}"` : definition.command;
+            const shellcommand = definition.command;
             task.execution = new vscode.ShellExecution(shellcommand, {
                 executable: platform.osType() == 'win32' ? `${process.env['EIDE_MSYS']}/bash.exe` : '/bin/bash',
                 shellArgs: ['-c'],
                 cwd: definition?.options?.cwd || workspaceManager.getCurrentFolder()?.path,
                 env: utility.mergeEnv(process.env, {})
             });
 
+            task.group = definition.group;
+
             return task;
         }
 

src/utility.ts

@@ -220,12 +220,10 @@ export function runShellCommand(title: string, commandLine: string, env?: any, u
             if (platform.osType() == 'win32') { shellOption.executable = 'cmd.exe'; shellOption.shellArgs = ['/C']; }
             else { shellOption.executable = '/bin/bash'; shellOption.shellArgs = ['-c']; }
             // init task
-            const task = new vscode.Task({ type: 'shell' }, vscode.TaskScope.Global, title, 'shell');
             if (platform.osType() == 'win32') commandLine = `"${commandLine}"`;
-            task.execution = new vscode.ShellExecution(commandLine, shellOption);
-            task.definition['command'] = commandLine;
+            const task = new vscode.Task({ type: 'shell', command: commandLine }, vscode.TaskScope.Global,
+                title, 'shell', new vscode.ShellExecution(commandLine, shellOption), []);
             task.isBackground = false;
-            task.problemMatchers = [];
             task.presentationOptions = { echo: true, focus: false, clear: true };
             vscode.tasks.executeTask(task);
         }