Context ID fixes

Author: Tim Etchells

dev/package.json

@@ -217,7 +217,7 @@
                 },
                 {
                     "command": "%cmdID_openInBrowser%",
-                    "when": "viewItem =~ /ext.mc.(projectItem.enabled.*|connectionItem.active)/",
+                    "when": "%isActiveConnectionOrEnabledProject%",
                     "group": "ext.mc.a@0"
                 },
                 {

dev/package.nls.json

@@ -102,10 +102,13 @@
         "See ProjectContextID.ts and Connection.ts for how the Context IDs are set"
     ],
 
-    "isInViewWithNothingSelected": "view == ext\\.mc\\.mcProjectExplorer && !viewItem",
+    "isInViewWithNothingSelected": "view == ext.mc.mcProjectExplorer && !viewItem",
     "isConnectionOrProject": "viewItem =~ /ext\\.mc\\.*/",
     "isConnection": "viewItem =~ /ext\\.mc\\.connectionItem*/",
-    "isActiveConnection": "viewItem == ext\\.mc\\.connectionItem\\.active",
+    "isActiveConnection": "viewItem == ext.mc.connectionItem.active",
+
+    "isActiveConnectionOrEnabledProject":
+        "viewItem =~ /ext.mc.(projectItem.enabled.*|connectionItem.active)/",
 
     "isProject":                "viewItem =~ /ext\\.mc\\.projectItem*/",
     "isEnabledProject":         "viewItem =~ /ext\\.mc\\.projectItem\\.enabled*/",

dev/src/command/CommandUtil.ts

@@ -53,6 +53,7 @@ export function createCommands(): vscode.Disposable[] {
 
         vscode.commands.registerCommand(Commands.REQUEST_BUILD,     (selection) => requestBuildCmd(selection)),
         vscode.commands.registerCommand(Commands.TOGGLE_AUTOBUILD,  (selection) => toggleAutoBuildCmd(selection)),
+        // Enable and disable AB are the same as Toggle AB - they are just presented to the user differently.
         vscode.commands.registerCommand(Commands.ENABLE_AUTOBUILD,  (selection) => toggleAutoBuildCmd(selection)),
         vscode.commands.registerCommand(Commands.DISABLE_AUTOBUILD, (selection) => toggleAutoBuildCmd(selection)),
 
@@ -73,7 +74,7 @@ export function createCommands(): vscode.Disposable[] {
 }
 
 // Some commands require a project or connection to be selected,
-// if they're launched from the command pallet we have to ask which resource they want to run the command on.
+// if they're launched from the command palette we have to ask which resource they want to run the command on.
 // The functions below handle this use case.
 
 /**

dev/src/microclimate/project/ProjectContextID.ts

@@ -14,7 +14,7 @@ const SEPARATOR = ".";
 enum ContextOptions {
     // (en|dis)abled are mutex
     ENABLED = "enabled",
-    // debuggable implies (enabled and not disabled)
+    // debuggable implies enabled
     DISABLED = "disabled",
 
     DEBUGGABLE = "debuggable",

dev/todo.txt

@@ -14,6 +14,7 @@ Important:
         - Restarting again fixes it
 - Should give user a way to remove project logs from output view
 - Add a debug init script to generator https://github.com/ibm-developer/generator-ibm-core-node-express/blob/develop/app/templates/package.json
+- Periods at the ends of popup messages
 
 Annoying Release Stuff:
 - Icons