Merge pull request #47 from Alex079/fix-args-duplication

Fix args duplication

Author: Alex079

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v2.2.1
+- Fix arguments duplication for Atmel version of avr-size
+
 ## v2.2.0
 - Make "Flash" task a custom execution
 - Output generated shell commands

package.json

@@ -17,7 +17,7 @@
 		"url": "https://github.com/Alex079/vscode-avr-helper"
 	},
 	"publisher": "Alex079",
-	"version": "2.2.0",
+	"version": "2.2.1",
 	"engines": {
 		"vscode": "^1.64.2"
 	},

src/main/actions/Builder.ts

@@ -237,10 +237,11 @@ function build(uri: Uri, emitter: PrintEmitter) {
       })
       .then(() => {
         const reporterArgs = C.REPORTER_ARGS.get(uri) ?? [];
+        const mcuArgs = [];
         if (reporterArgs.includes('-C')) {
-          reporterArgs.push(`--mcu=${devType}`);
+          mcuArgs.push(`--mcu=${devType}`);
         }
-        return runCommand(join(dirname(exe), 'avr-size'), [...reporterArgs, buildTarget], uri.fsPath, emitter)
+        return runCommand(join(dirname(exe), 'avr-size'), [...reporterArgs, ...mcuArgs, buildTarget], uri.fsPath, emitter)
           .then(info => {
             if (info.status.exitCode === 0) {
               emitter.fireLine(info.stdout);
@@ -255,9 +256,9 @@ function printInfo(uri: Uri, emitter: PrintEmitter) {
     linkables.forEach((linkable, index) => {
       const search: string = `${uri.fsPath}${sep}`;
       emitter.fireLine(`${index === 0 ? ' ' : '│'} ┌─${linkable.source.replace(search, '')}`);
-      emitter.fireLine(`${index === 0 ? '┌' : '├'}─${linkable.needsRebuilding ? '✖' : '┴'}─${linkable.target.replace(search, '')}`);
+      emitter.fireLine(`${index === 0 ? '┌' : '├'}─${linkable.needsRebuilding ? 'X' : '┴'}─${linkable.target.replace(search, '')}`);
       emitter.fireLine('│');
     });
-    emitter.fireLine(  `└─► Build Target\n`);
+    emitter.fireLine(  `└─> Build Target\n`);
   };
 }