Encapsulate swift toolchain

- add other build-related commands
  - build on deman
  - run
  - run TARGET
  - clean
- clean up diagnostic parsing

Author: clayreimann

package.json

@@ -36,13 +36,16 @@
   "activationEvents": [
     "onLanguage:swift",
     "workspaceContains:**/*swift",
-    "onCommand:sde.commands.buildPackage"
+    "onCommand:sde.commands.build",
+    "onCommand:sde.commands.run",
+    "onCommand:sde.commands.clean",
+    "onCommand:sde.commands.selectRun"
   ],
   "main": "./out/clientMain",
   "contributes": {
     "commands": [
       {
-        "command": "sde.commands.buildPackage",
+        "command": "sde.commands.build",
         "title": "Build Package",
         "category": "SDE"
       },
@@ -52,16 +55,55 @@
         "category": "SDE"
       },
       {
-        "command": "sde.commands.runPackage",
-        "title": "Run Package",
+        "command": "sde.commands.run",
+        "title": "Run Default Target",
+        "category": "SDE",
+        "enablement": "sde:running == false"
+      },
+      {
+        "command": "sde.commands.selectRun",
+        "title": "Run Target…",
+        "category": "SDE",
+        "enablement": "sde:running == false"
+      },
+      {
+        "command": "sde.commands.restartRun",
+        "title": "Restart Target",
+        "category": "SDE",
+        "enablement": "sde:running == true"
+      },
+      {
+        "command": "sde.commands.stop",
+        "title": "Stop Running Target",
+        "category": "SDE",
+        "enablement": "sde:running == true"
+      },
+      {
+        "command": "sde.commands.clean",
+        "title": "Clean Package",
         "category": "SDE"
       }
     ],
     "keybindings": [
       {
-        "command": "sde.commands.buildPackage",
-        "key": "alt+b",
-        "mac": "alt+b"
+        "command": "sde.commands.build",
+        "key": "alt+b"
+      },
+      {
+        "command": "sde.commands.run",
+        "key": "alt+r"
+      },
+      {
+        "command": "sde.commands.selectRun",
+        "key": "alt+shift+r"
+      },
+      {
+        "command": "sde.commands.restart",
+        "key": "alt+shift+r"
+      },
+      {
+        "command": "sde.commands.stop",
+        "key": "alt+s"
       }
     ],
     "configuration": {

src/clientMain.ts

@@ -1,57 +1,78 @@
 "use strict";
 
 import * as fs from "fs";
-import * as tools from "./SwiftTools";
 import * as path from "path";
-import {
-  commands,
-  DiagnosticCollection,
-  ExtensionContext,
-  languages,
-  TextDocument,
-  window,
-  workspace,
-} from "vscode";
+import { commands, DiagnosticCollection, ExtensionContext, window, workspace } from "vscode";
 import { absolutePath } from "./helpers/AbsolutePath";
+import * as tools from "./toolchain/SwiftTools";
 import * as config from "./vscode/config-helpers";
 import lsp from "./vscode/lsp-interop";
 import output from "./vscode/output-channels";
 import { statusBarItem } from "./vscode/status-bar";
 
 let swiftBinPath: string | null = null;
 let swiftBuildParams: string[] = ["build"];
-let swiftPackageManifestPath: string | null = null;
 let skProtocolProcess: string | null = null;
 let skProtocolProcessAsShellCmd: string | null = null;
 export let diagnosticCollection: DiagnosticCollection;
 
+let mostRecentRunTarget = "";
+
 export function activate(context: ExtensionContext) {
   output.init(context);
 
   if (workspace.getConfiguration().get<boolean>("sde.enable") === false) {
     output.build.log("SDE Disabled", false);
     return;
   }
+  tools.setRunning(false);
   output.build.log("Activating SDE");
 
   initConfig();
   lsp.startLSPClient(context);
 
-  diagnosticCollection = languages.createDiagnosticCollection("swift");
-  context.subscriptions.push(diagnosticCollection);
-
   //commands
+  let toolchain = new tools.Toolchain(
+    swiftBinPath,
+    workspace.workspaceFolders[0].uri.fsPath,
+    swiftBuildParams
+  );
+  context.subscriptions.push(toolchain.diagnostics);
+  context.subscriptions.push(toolchain.start());
   context.subscriptions.push(
-    commands.registerCommand("sde.commands.buildPackage", buildSPMPackage),
+    commands.registerCommand("sde.commands.build", () => toolchain.build()),
     commands.registerCommand("sde.commands.restartLanguageServer", () =>
       lsp.restartLSPClient(context)
     ),
-    commands.registerCommand("sde.commands.runPackage", () => {
-      output.build.log("sde.commands.runPackage");
-    })
+    commands.registerCommand("sde.commands.run", () => toolchain.runStart()),
+    commands.registerCommand("sde.commands.selectRun", () => {
+      window
+        .showInputBox({ prompt: "Run which target?", value: mostRecentRunTarget })
+        .then(target => {
+          if (!target) {
+            return;
+          }
+          mostRecentRunTarget = target;
+          toolchain.runStart(target);
+        });
+    }),
+    commands.registerCommand("sde.commands.restart", () => {
+      toolchain.runStop();
+      toolchain.runStart(mostRecentRunTarget);
+    }),
+    commands.registerCommand("sde.commands.stop", () => toolchain.runStop()),
+    commands.registerCommand("sde.commands.clean", () => toolchain.clean())
   );
 
-  workspace.onDidSaveTextDocument(onSave, null, context.subscriptions);
+  workspace.onDidSaveTextDocument(
+    document => {
+      if (tools.shouldBuildOnSave() && document.languageId === "swift") {
+        toolchain.build();
+      }
+    },
+    null,
+    context.subscriptions
+  );
 
   // respond to settings changes
   workspace.onDidChangeConfiguration(event => {
@@ -61,33 +82,11 @@ export function activate(context: ExtensionContext) {
   });
 
   // build on startup
-  buildSPMPackage();
+  toolchain.build();
 }
 
 function initConfig() {
   checkToolsAvailability();
-
-  //FIXME rootPath may be undefined for adhoc file editing mode???
-  swiftPackageManifestPath = workspace.workspaceFolders[0]
-    ? path.join(workspace.workspaceFolders[0].uri.fsPath, "Package.swift")
-    : null;
-}
-
-function buildSPMPackage() {
-  if (isSPMProject()) {
-    statusBarItem.start();
-    tools.buildPackage(swiftBinPath, workspace.rootPath, swiftBuildParams);
-  }
-}
-
-function onSave(document: TextDocument) {
-  if (config.buildOnSave() && document.languageId === "swift") {
-    buildSPMPackage();
-  }
-}
-
-function isSPMProject(): boolean {
-  return swiftPackageManifestPath ? fs.existsSync(swiftPackageManifestPath) : false;
 }
 
 function checkToolsAvailability() {
@@ -105,7 +104,7 @@ function checkToolsAvailability() {
 
   if (!swiftBinPath || !fs.existsSync(swiftBinPath)) {
     window.showErrorMessage(
-      'missing dependent swift tool, please configure correct "swift.path.swift_driver_bin"'
+      'missing dependent `swift` tool, please configure correct "swift.path.swift_driver_bin"'
     );
   }
   if (!sourcekitePathEnableShCmd) {