clean up commanding

dockerExtension.ts

@@ -78,8 +78,7 @@ export async function activate(ctx: vscode.ExtensionContext): Promise<void> {
     
     dockerExplorerProvider = new DockerExplorerProvider(azureAccount);
     vscode.window.registerTreeDataProvider('dockerExplorer', dockerExplorerProvider);
-    vscode.commands.registerCommand('dockerExplorer.refreshExplorer', () => dockerExplorerProvider.refresh());
-    vscode.commands.registerCommand('dockerExplorer.systemPrune', () => systemPrune());
+    vscode.commands.registerCommand('vscode-docker.explorer.refresh', () => dockerExplorerProvider.refresh());
 
     ctx.subscriptions.push(vscode.languages.registerCompletionItemProvider(DOCKERFILE_MODE_ID, new DockerfileCompletionItemProvider(), '.'));
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-docker",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -49,6 +49,7 @@
     "onCommand:vscode-docker.dockerHubLogout",
     "onCommand:vscode-docker.browseDockerHub",
     "onCommand:vscode-docker.browseAzurePortal",
+    "onCommand:vscode-docker.explorer.refresh",
     "onView:dockerExplorer",
     "onDebugInitialConfigurations"
   ],
@@ -94,34 +95,24 @@
       ],
       "explorer/context": [
         {
-          "when": "resourceLangId == dockerfile",
+          "when": "resourceFilename =~ /[dD]ocker[fF]ile/",
           "command": "vscode-docker.image.build",
           "group": "docker"
         },
         {
-          "when": "resourceFilename == docker-compose.yml",
+          "when": "resourceFilename =~ /[dD]ocker-[cC]ompose/",
           "command": "vscode-docker.compose.up",
           "group": "docker"
         },
         {
-          "when": "resourceFilename == docker-compose.yml",
-          "command": "vscode-docker.compose.down",
-          "group": "docker"
-        },
-        {
-          "when": "resourceFilename == docker-compose.debug.yml",
-          "command": "vscode-docker.compose.up",
-          "group": "docker"
-        },
-        {
-          "when": "resourceFilename == docker-compose.debug.yml",
+          "when": "resourceFilename =~ /[dD]ocker-[cC]ompose/",
           "command": "vscode-docker.compose.down",
           "group": "docker"
         }
       ],
       "view/title": [
         {
-          "command": "dockerExplorer.refreshExplorer",
+          "command": "vscode-docker.explorer.refresh",
           "when": "view == dockerExplorer",
           "group": "navigation"
         },
@@ -547,7 +538,6 @@
       {
         "command": "vscode-docker.system.prune",
         "title": "System Prune",
-        "description": "Removes unused data",
         "category": "Docker",
         "icon": {
           "light": "images/light/prune.svg",
@@ -555,8 +545,8 @@
         }
       },
       {
-        "command": "dockerExplorer.refreshExplorer",
-        "title": "Refresh",
+        "command": "vscode-docker.explorer.refresh",
+        "title": "Refresh Explorer",
         "category": "Docker",
         "icon": {
           "light": "images/light/refresh.svg",
@@ -595,7 +585,7 @@
     }
   },
   "engines": {
-    "vscode": "^1.17.0"
+    "vscode": "^1.20.0"
   },
   "scripts": {
     "vscode:prepublish": "tsc -p ./",