Windows codepage bugfix

src/arduino/arduino.ts

@@ -133,7 +133,7 @@ export class ArduinoApp {
             const prebuildargs = dc.prebuild.split(" ");
             const prebuildCommand = prebuildargs.shift();
             try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, {shell: true, cwd: ArduinoWorkspace.rootPath});
+                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
             } catch (ex) {
                 arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
                 return;
@@ -215,7 +215,7 @@ export class ArduinoApp {
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
         const args = ["--upload", "--board", boardDescriptor, "--port", dc.port, "--useprogrammer",
-                "--pref", "programmer=" + selectProgrammer, appPath];
+            "--pref", "programmer=" + selectProgrammer, appPath];
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
@@ -269,7 +269,7 @@ export class ArduinoApp {
             const prebuildargs = dc.prebuild.split(" ");
             const prebuildCommand = prebuildargs.shift();
             try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, {shell: true, cwd: ArduinoWorkspace.rootPath});
+                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
             } catch (ex) {
                 arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
                 return;
@@ -303,7 +303,12 @@ export class ArduinoApp {
             arduinoChannel.end(`Finished verify sketch - ${dc.sketch}${os.EOL}`);
             return true;
         } catch (reason) {
-            arduinoChannel.error(`Exit with code=${reason.code}${os.EOL}`);
+            const msg = reason.code ?
+                `Exit with code=${reason.code}${os.EOL}` :
+                reason.message ?
+                    reason.message :
+                    JSON.stringify(reason);
+            arduinoChannel.error(msg);
             return false;
         }
 
@@ -315,7 +320,7 @@ export class ArduinoApp {
             return;
         }
         const cppConfigFile = fs.readFileSync(configFilePath, "utf8");
-        const cppConfig = JSON.parse(cppConfigFile) as {configurations: Array<{includePath: string[], forcedInclude: string[]}>};
+        const cppConfig = JSON.parse(cppConfigFile) as { configurations: Array<{ includePath: string[], forcedInclude: string[] }> };
         const libPaths = this.getDefaultPackageLibPaths();
         const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
         const configuration = cppConfig.configurations[0];

src/common/util.ts

@@ -9,6 +9,7 @@ import * as path from "path";
 import * as properties from "properties";
 import * as vscode from "vscode";
 import * as WinReg from "winreg";
+import { arduinoChannel } from "./outputChannel";
 
 const encodingMapping: object = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../misc", "codepageMapping.json"), "utf8"));
 
@@ -208,7 +209,14 @@ export function spawn(command: string, outputChannel: vscode.OutputChannel, args
 
         let codepage = "65001";
         if (os.platform() === "win32") {
-            codepage = childProcess.execSync("chcp").toString().split(":").pop().trim();
+            try {
+                const chcp = childProcess.execSync("chcp");
+                codepage = chcp.toString().split(":").pop().trim();
+            } catch (error) {
+                arduinoChannel.warning(`Defaulting to code page 850 because chcp failed.\
+                \rEnsure your path includes %SystemRoot%\\system32\r${error.message}`);
+                codepage = "850";
+            }
         }
 
         if (outputChannel) {