- Fix extra command constant that's not correctly mapped

- Rename to CONSTANT_CASE for module level enums' value

Author: michael-weng

src/commands.ts

@@ -65,13 +65,12 @@ export function registerToolchainCommands(
 }
 
 export enum Commands {
-    ResolveDependencies = "swift.resolveDependencies",
-    UpdateDependencies = "swift.updateDependencies",
-    RunTestsMultipleTimes = "swift.runTestsMultipleTimes",
-    ResetPackage = "swift.resetPackage",
-    UseLocalDependency = "swift.useLocalDependency",
-    UneditDependency = "swift.uneditDependency",
-    runTestsMultipleTimes = "runTestsMultipleTimes",
+    RESOLVE_DEPENDENCIES = "swift.resolveDependencies",
+    UPDATE_DEPENDENCIES = "swift.updateDependencies",
+    RUN_TESTS_MULTIPLE_TIMES = "swift.runTestsMultipleTimes",
+    RESET_PACKAGE = "swift.resetPackage",
+    USE_LOCAL_DEPENDENCY = "swift.useLocalDependency",
+    UNEDIT_DEPENDENCY = "swift.uneditDependency",
 }
 
 /**
@@ -80,14 +79,16 @@ export enum Commands {
 export function register(ctx: WorkspaceContext): vscode.Disposable[] {
     return [
         vscode.commands.registerCommand("swift.newFile", uri => newSwiftFile(uri)),
-        vscode.commands.registerCommand(Commands.ResolveDependencies, () =>
+        vscode.commands.registerCommand(Commands.RESOLVE_DEPENDENCIES, () =>
             resolveDependencies(ctx)
         ),
-        vscode.commands.registerCommand(Commands.UpdateDependencies, () => updateDependencies(ctx)),
+        vscode.commands.registerCommand(Commands.UPDATE_DEPENDENCIES, () =>
+            updateDependencies(ctx)
+        ),
         vscode.commands.registerCommand("swift.run", () => runBuild(ctx)),
         vscode.commands.registerCommand("swift.debug", () => debugBuild(ctx)),
         vscode.commands.registerCommand("swift.cleanBuild", () => cleanBuild(ctx)),
-        vscode.commands.registerCommand(Commands.RunTestsMultipleTimes, item => {
+        vscode.commands.registerCommand(Commands.RUN_TESTS_MULTIPLE_TIMES, item => {
             if (ctx.currentFolder) {
                 return runTestMultipleTimes(ctx.currentFolder, item, false);
             }
@@ -99,7 +100,7 @@ export function register(ctx: WorkspaceContext): vscode.Disposable[] {
         }),
         // Note: This is only available on macOS (gated in `package.json`) because its the only OS that has the iOS SDK available.
         vscode.commands.registerCommand("swift.switchPlatform", () => switchPlatform()),
-        vscode.commands.registerCommand(Commands.ResetPackage, () => resetPackage(ctx)),
+        vscode.commands.registerCommand(Commands.RESET_PACKAGE, () => resetPackage(ctx)),
         vscode.commands.registerCommand("swift.runScript", () => runSwiftScript(ctx)),
         vscode.commands.registerCommand("swift.openPackage", () => {
             if (ctx.currentFolder) {
@@ -116,7 +117,7 @@ export function register(ctx: WorkspaceContext): vscode.Disposable[] {
         vscode.commands.registerCommand("swift.insertFunctionComment", () =>
             insertFunctionComment(ctx)
         ),
-        vscode.commands.registerCommand(Commands.UseLocalDependency, item => {
+        vscode.commands.registerCommand(Commands.USE_LOCAL_DEPENDENCY, item => {
             if (item instanceof PackageNode) {
                 return useLocalDependency(item.name, ctx);
             }
@@ -126,7 +127,7 @@ export function register(ctx: WorkspaceContext): vscode.Disposable[] {
                 return editDependency(item.name, ctx);
             }
         }),
-        vscode.commands.registerCommand(Commands.UneditDependency, item => {
+        vscode.commands.registerCommand(Commands.UNEDIT_DEPENDENCY, item => {
             if (item instanceof PackageNode) {
                 return uneditDependency(item.name, ctx);
             }

test/integration-tests/commands/dependency.test.ts

@@ -43,12 +43,12 @@ suite("Dependency Commmands Test Suite", function () {
         });
 
         test("Contract: spm resolve", async () => {
-            const result = await vscode.commands.executeCommand(Commands.ResolveDependencies);
+            const result = await vscode.commands.executeCommand(Commands.RESOLVE_DEPENDENCIES);
             expect(result).to.be.true;
         });
 
         test("Contract: spm update", async () => {
-            const result = await vscode.commands.executeCommand(Commands.UpdateDependencies);
+            const result = await vscode.commands.executeCommand(Commands.UPDATE_DEPENDENCIES);
             expect(result).to.be.true;
         });
     });
@@ -97,7 +97,10 @@ suite("Dependency Commmands Test Suite", function () {
             // Contract: spm edit with user supplied local version of dependency
             const windowMock = sinon.stub(vscode.window, "showOpenDialog");
             windowMock.resolves([testAssetUri("Swift-Markdown")]);
-            const result = await vscode.commands.executeCommand(Commands.UseLocalDependency, item);
+            const result = await vscode.commands.executeCommand(
+                Commands.USE_LOCAL_DEPENDENCY,
+                item
+            );
             expect(result).to.be.true;
             windowMock.restore();
 
@@ -112,15 +115,15 @@ suite("Dependency Commmands Test Suite", function () {
             await useLocalDependencyTest();
 
             // Contract: spm reset
-            const result = await vscode.commands.executeCommand(Commands.ResetPackage);
+            const result = await vscode.commands.executeCommand(Commands.RESET_PACKAGE);
             expect(result).to.be.true;
         });
 
         test("Use local dependency - Add to workspace - Unedit", async () => {
             await useLocalDependencyTest();
 
             // Contract: spm unedit
-            const result = await vscode.commands.executeCommand(Commands.UneditDependency, item);
+            const result = await vscode.commands.executeCommand(Commands.UNEDIT_DEPENDENCY, item);
             expect(result).to.be.true;
         });
     });

test/integration-tests/testexplorer/TestExplorerIntegration.test.ts

@@ -304,7 +304,7 @@ suite("Test Explorer Suite", function () {
                     // Stub the showInputBox method to return the input text
                     windowMock.showInputBox.resolves(`${numIterations}`);
 
-                    vscode.commands.executeCommand(Commands.runTestsMultipleTimes, testItems[0]);
+                    vscode.commands.executeCommand(Commands.RUN_TESTS_MULTIPLE_TIMES, testItems[0]);
 
                     const testRun = await eventPromise(testExplorer.onCreateTestRun);
 
@@ -419,7 +419,7 @@ suite("Test Explorer Suite", function () {
                     // Stub the showInputBox method to return the input text
                     windowMock.showInputBox.resolves(`${numIterations}`);
 
-                    vscode.commands.executeCommand(Commands.runTestsMultipleTimes, testItems[0]);
+                    vscode.commands.executeCommand(Commands.RUN_TESTS_MULTIPLE_TIMES, testItems[0]);
 
                     const testRun = await eventPromise(testExplorer.onCreateTestRun);