Add TargetType enum for SwiftPackage.getTargets (#713)

Author: adam-fowler

src/FolderContext.ts

@@ -16,7 +16,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import { LinuxMain } from "./LinuxMain";
 import { PackageWatcher } from "./PackageWatcher";
-import { SwiftPackage, Target } from "./SwiftPackage";
+import { SwiftPackage, Target, TargetType } from "./SwiftPackage";
 import { TestExplorer } from "./TestExplorer/TestExplorer";
 import { WorkspaceContext, FolderEvent } from "./WorkspaceContext";
 import { BackgroundCompilation } from "./BackgroundCompilation";
@@ -179,11 +179,11 @@ export class FolderContext implements vscode.Disposable {
      * @param uri URI to find target for
      * @returns Target
      */
-    getTestTarget(uri: vscode.Uri): Target | undefined {
+    getTestTarget(uri: vscode.Uri, type?: TargetType): Target | undefined {
         if (!isPathInsidePath(uri.fsPath, this.folder.fsPath)) {
             return undefined;
         }
-        const testTargets = this.swiftPackage.getTargets("test");
+        const testTargets = this.swiftPackage.getTargets(type);
         const target = testTargets.find(element => {
             const relativeUri = path.relative(
                 path.join(this.folder.fsPath, element.path),

src/SwiftPackage.ts

@@ -363,8 +363,12 @@ export class SwiftPackage implements PackageContents {
      * @param type Type of target
      * @returns Array of targets
      */
-    getTargets(type: "executable" | "library" | "test"): Target[] {
-        return this.targets.filter(target => target.type === type);
+    getTargets(type?: TargetType): Target[] {
+        if (type === undefined) {
+            return this.targets;
+        } else {
+            return this.targets.filter(target => target.type === type);
+        }
     }
 
     /**
@@ -375,3 +379,9 @@ export class SwiftPackage implements PackageContents {
         return this.targets.find(target => isPathInsidePath(filePath, target.path));
     }
 }
+
+export enum TargetType {
+    executable = "executable",
+    library = "library",
+    test = "test",
+}

src/SwiftTaskProvider.ts

@@ -16,7 +16,7 @@ import * as vscode from "vscode";
 import * as path from "path";
 import { WorkspaceContext } from "./WorkspaceContext";
 import { FolderContext } from "./FolderContext";
-import { Product } from "./SwiftPackage";
+import { Product, TargetType } from "./SwiftPackage";
 import configuration from "./configuration";
 import { swiftRuntimeEnv } from "./utilities/utilities";
 import { Version } from "./utilities/version";
@@ -110,7 +110,7 @@ function getBuildRevealOption(): vscode.TaskRevealKind {
  */
 export function createBuildAllTask(folderContext: FolderContext): vscode.Task {
     let additionalArgs = buildOptions(folderContext.workspaceContext.toolchain);
-    if (folderContext.swiftPackage.getTargets("test").length > 0) {
+    if (folderContext.swiftPackage.getTargets(TargetType.test).length > 0) {
         additionalArgs.push(...testDiscoveryFlag(folderContext));
     }
     let buildTaskName = SwiftTaskProvider.buildAllName;

src/TestExplorer/TestDiscovery.ts

@@ -14,6 +14,7 @@
 
 import * as vscode from "vscode";
 import { FolderContext } from "../FolderContext";
+import { TargetType } from "../SwiftPackage";
 
 /** Test function definition */
 export interface TestFunction {
@@ -49,7 +50,7 @@ export function updateTestsFromClasses(folderContext: FolderContext, testClasses
     if (!testExplorer) {
         return;
     }
-    const targets = folderContext.swiftPackage.getTargets("test").map(target => {
+    const targets = folderContext.swiftPackage.getTargets(TargetType.test).map(target => {
         const classes = testClasses.filter(
             testClass =>
                 testClass.location &&

src/TestExplorer/TestExplorer.ts

@@ -23,6 +23,7 @@ import configuration from "../configuration";
 import { buildOptions, getBuildAllTask } from "../SwiftTaskProvider";
 import { SwiftExecOperation, TaskOperation } from "../TaskQueue";
 import * as TestDiscovery from "./TestDiscovery";
+import { TargetType } from "../SwiftPackage";
 
 /** Build test explorer UI */
 export class TestExplorer {
@@ -67,7 +68,7 @@ export class TestExplorer {
             ) {
                 this.testFileEdited = false;
                 // only run discover tests if the library has tests
-                if (this.folderContext.swiftPackage.getTargets("test").length > 0) {
+                if (this.folderContext.swiftPackage.getTargets(TargetType.test).length > 0) {
                     this.discoverTestsInWorkspace();
                 }
             }
@@ -97,7 +98,7 @@ export class TestExplorer {
             switch (event) {
                 case FolderEvent.add:
                     if (folder) {
-                        if (folder.swiftPackage.getTargets("test").length > 0) {
+                        if (folder.swiftPackage.getTargets(TargetType.test).length > 0) {
                             folder.addTestExplorer();
                             // discover tests in workspace but only if disableAutoResolve is not on.
                             // discover tests will kick off a resolve if required
@@ -109,7 +110,8 @@ export class TestExplorer {
                     break;
                 case FolderEvent.packageUpdated:
                     if (folder) {
-                        const hasTestTargets = folder.swiftPackage.getTargets("test").length > 0;
+                        const hasTestTargets =
+                            folder.swiftPackage.getTargets(TargetType.test).length > 0;
                         if (hasTestTargets && !folder.hasTestExplorer()) {
                             folder.addTestExplorer();
                             // discover tests in workspace but only if disableAutoResolve is not on.

src/debugger/launch.ts

@@ -20,6 +20,7 @@ import { FolderContext } from "../FolderContext";
 import { BuildFlags } from "../toolchain/BuildFlags";
 import { stringArrayInEnglish, swiftLibraryPathKey, swiftRuntimeEnv } from "../utilities/utilities";
 import { DebugAdapter } from "./debugAdapter";
+import { TargetType } from "../SwiftPackage";
 
 /**
  * Edit launch.json based on contents of Swift Package.
@@ -178,7 +179,7 @@ export function createTestConfiguration(
     ctx: FolderContext,
     expandEnvVariables = false
 ): vscode.DebugConfiguration | null {
-    if (ctx.swiftPackage.getTargets("test").length === 0) {
+    if (ctx.swiftPackage.getTargets(TargetType.test).length === 0) {
         return null;
     }
 
@@ -265,7 +266,7 @@ export function createDarwinTestConfiguration(
     ctx: FolderContext,
     args: string
 ): vscode.DebugConfiguration | null {
-    if (ctx.swiftPackage.getTargets("test").length === 0) {
+    if (ctx.swiftPackage.getTargets(TargetType.test).length === 0) {
         return null;
     }
     if (process.platform !== "darwin") {