Warnings indicated a build failure

vknabel · Sep 25, 2018 · 0701881 · 0701881
1 parent df55f2b
commit 0701881
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.2
+
+- Warnings indicated a build failure
+
 ## 2.5.1
 
 - Resolve `~` to the home dir #30

diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/vknabel"
   },
   "license": "Apache-2.0",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "publisher": "vknabel",
   "icon": "icons/icon.png",
   "galleryBanner": {

diff --git a/src/SwiftTools.ts b/src/SwiftTools.ts
@@ -17,8 +17,8 @@ export function buildPackage(
   pkgPath: string,
   params: string[]
 ) {
-  stdout = null;
-  stderr = null;
+  stdout = "";
+  stderr = "";
   error = null;
   const sb = cp.spawn(swiftBinPath, params, { cwd: pkgPath });
   sb.stdout.on("data", data => {
@@ -45,9 +45,10 @@ export function buildPackage(
     trace(`***swift build command exited*** code: ${code}, signal: ${signal}`);
     dumpInConsole("\n");
     diagnosticCollection.clear();
-    if (stderr && stdout) {
+    if (stderr) {
       dumpDiagnostics();
-    } else if (stderr) {
+    }
+    if (code != 0) {
       makeBuildStatusFailed();
     } else {
       makeBuildStatusSuccessful();
@@ -123,10 +124,6 @@ function dumpDiagnostics() {
   diagnosticMap.forEach((diags, file) => {
     diagnosticCollection.set(Uri.parse(file), diags);
   });
-
-  // trace(stderr)
-  // trace("build failed")
-  makeBuildStatusFailed();
 }
 
 function toVSCodeSeverity(sev: string) {