Merge pull request #189 from github0null/dev

v3.10.4 revision

Author: github0null

CHANGELOG.md

@@ -6,6 +6,16 @@ All notable version changes will be recorded in this file.
 
 ***
 
+### [v3.10.4] revision
+
+**Fix**:
+  - `Task type: 'eide.msys'`: The `env` property does not work.
+
+**Change**:
+  - `Task type: 'eide.msys'`: Use `label` property for task title, not `name`
+
+***
+
 ### [v3.10.3] revision
 
 **New**:

package.json

@@ -35,7 +35,7 @@
     "homepage": "https://em-ide.com",
     "license": "MIT",
     "description": "A mcu development environment for 8051/AVR/STM8/Cortex-M/RISC-V",
-    "version": "3.10.3",
+    "version": "3.10.4",
     "preview": false,
     "engines": {
         "vscode": "^1.63.0"
@@ -1569,14 +1569,18 @@
             {
                 "type": "eide.msys",
                 "required": [
-                    "name",
+                    "label",
                     "command"
                 ],
                 "properties": {
-                    "name": {
+                    "label": {
                         "type": "string",
                         "description": "Task Name. A human-readable name for this task"
                     },
+                    "name": {
+                        "type": "string",
+                        "description": "**Deprecated !!!** Task Name. A human-readable name for this task"
+                    },
                     "command": {
                         "type": "string",
                         "description": "Command. A shell command will be executed."

res/data/.clang-format

@@ -35,4 +35,4 @@ SortIncludes: false
 
 AlignConsecutiveMacros: AcrossEmptyLines
 
-#AlignConsecutiveAssignments: AcrossEmptyLines
+AlignConsecutiveAssignments: Consecutive

res/html/builder_options/js/app.js

@@ -4176,6 +4176,10 @@ export class ProjectExplorer implements CustomConfigurationProvider {
                 throw new Error(`Not found any reference for this source file !, [path]: '${srcPath}'`);
             }
 
+            if (!File.IsFile(objPath)) {
+                throw new Error(`Object file is not existed !, [path]: '${objPath}'`);
+            }
+
             // prepare command
             let exeFile: File;
             let cmds: string[];

src/EIDEProjectExplorer.ts

@@ -1164,7 +1164,9 @@ function RegisterGlobalEvent() {
 
 interface EideShellTaskDef extends vscode.TaskDefinition {
 
-    name: string;
+    label: string;
+
+    name?: string;
 
     command: string;
 
@@ -1192,14 +1194,14 @@ class EideTaskProvider implements vscode.TaskProvider {
             const definition: EideShellTaskDef = <any>task_.definition;
 
             const task = new vscode.Task(definition, vscode.TaskScope.Workspace,
-                definition.name, EideTaskProvider.TASK_TYPE_MSYS, definition.problemMatchers);
+                definition.name || definition.label, EideTaskProvider.TASK_TYPE_MSYS, definition.problemMatchers);
 
             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, {})
+                env: utility.mergeEnv(process.env, definition.env || {})
             });
 
             task.group = definition.group;