Skip to content

Commit dfc9a0d

Browse files
author
Tim Etchells
committed
Re-case and re-order commands
1 parent 249c30e commit dfc9a0d

File tree

2 files changed

+72
-58
lines changed

2 files changed

+72
-58
lines changed

‎dev/package.json‎

Lines changed: 49 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -201,40 +201,59 @@
201201
"command": "%cmdID_newDefaultConn%",
202202
"when": "%isInViewWithNothingSelected%"
203203
},
204+
205+
204206
{
205-
"command": "%cmdID_newMCProject%",
207+
"command": "%cmdID_openInBrowser%",
206208
"when": "%isActiveConnection%",
207-
"group": "ext.mc.za"
209+
"group": "ext.mc.conn.a@0"
208210
},
209211
{
210-
"command": "%cmdID_refreshConnection%",
212+
"command": "%cmdID_newMCProject%",
211213
"when": "%isActiveConnection%",
212-
"group": "ext.mc.zb"
214+
"group": "ext.mc.conn.a@1"
215+
},
216+
{
217+
"command": "%cmdID_openFolder%",
218+
"when": "%isConnection%",
219+
"group": "ext.mc.conn.b"
213220
},
214221
{
215222
"command": "%cmdID_removeConn%",
216223
"when": "%isConnection%",
217-
"group": "ext.mc.zc"
224+
"group": "ext.mc.conn.c@0"
225+
},
226+
{
227+
"command": "%cmdID_refreshConnection%",
228+
"when": "%isActiveConnection%",
229+
"group": "ext.mc.conn.c@1"
218230
},
231+
232+
219233
{
220234
"command": "%cmdID_openInBrowser%",
221-
"when": "%isActiveConnectionOrEnabledProject%",
235+
"when": "%isEnabledProject%",
222236
"group": "ext.mc.a@0"
223237
},
224238
{
225-
"command": "%cmdID_openAppMonitor%",
226-
"when": "%isEnabledProject%",
239+
"command": "%cmdID_projectInfo%",
240+
"when": "%isProject%",
227241
"group": "ext.mc.a@1"
228242
},
229243
{
230-
"command": "%cmdID_openFolder%",
231-
"when": "%isConnectionOrProject%",
232-
"group": "ext.mc.b"
244+
"command": "%cmdID_containerShell%",
245+
"when": "%isEnabledProject%",
246+
"group": "ext.mc.a@2"
233247
},
234248
{
235-
"command": "%cmdID_projectInfo%",
249+
"command": "%cmdID_openAppMonitor%",
250+
"when": "%isEnabledProject%",
251+
"group": "ext.mc.a@3"
252+
},
253+
{
254+
"command": "%cmdID_openFolder%",
236255
"when": "%isProject%",
237-
"group": "ext.mc.c@0"
256+
"group": "ext.mc.b"
238257
},
239258
{
240259
"command": "%cmdID_openAppLog%",
@@ -247,44 +266,39 @@
247266
"group": "ext.mc.c@2"
248267
},
249268
{
250-
"command": "%cmdID_requestBuild%",
269+
"command": "%cmdID_restartRun%",
251270
"when": "%isEnabledProject%",
252271
"group": "ext.mc.d@0"
253272
},
254273
{
255-
"command": "%cmdID_validate%",
256-
"when": "%isEnabledAutoBuildOff%",
274+
"command": "%cmdID_restartDebug%",
275+
"when": "%isEnabledProject%",
257276
"group": "ext.mc.d@1"
258277
},
259-
{
260-
"command": "%cmdID_enableAutoBuild%",
261-
"when": "%isEnabledAutoBuildOff%",
262-
"group": "ext.mc.d@2"
263-
},
264-
{
265-
"command": "%cmdID_disableAutoBuild%",
266-
"when": "%isEnabledAutoBuildOn%",
267-
"group": "ext.mc.d@2"
268-
},
269278
{
270279
"command": "%cmdID_attachDebugger%",
271280
"when": "%isDebuggableProject%",
272-
"group": "ext.mc.e"
281+
"group": "ext.mc.d@2"
273282
},
274283
{
275-
"command": "%cmdID_restartRun%",
284+
"command": "%cmdID_requestBuild%",
276285
"when": "%isEnabledProject%",
277-
"group": "ext.mc.e"
286+
"group": "ext.mc.e@0"
278287
},
279288
{
280-
"command": "%cmdID_restartDebug%",
281-
"when": "%isEnabledProject%",
282-
"group": "ext.mc.e"
289+
"command": "%cmdID_validate%",
290+
"when": "%isEnabledAutoBuildOff%",
291+
"group": "ext.mc.e@1"
283292
},
284293
{
285-
"command": "%cmdID_containerShell%",
286-
"when": "%isEnabledProject%",
287-
"group": "ext.mc.f"
294+
"command": "%cmdID_enableAutoBuild%",
295+
"when": "%isEnabledAutoBuildOff%",
296+
"group": "ext.mc.e@2"
297+
},
298+
{
299+
"command": "%cmdID_disableAutoBuild%",
300+
"when": "%isEnabledAutoBuildOn%",
301+
"group": "ext.mc.e@2"
288302
},
289303
{
290304
"command": "%cmdID_enable%",

‎dev/package.nls.json‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,87 +10,87 @@
1010
"commandCategory": "Microclimate",
1111

1212
"cmdID_newConnection": "ext.mc.newConnection",
13-
"cmdTitle_newConnection": "New Microclimate connection",
13+
"cmdTitle_newConnection": "New Microclimate Connection",
1414
"cmdDescr_newConnection": "Connect to a Microclimate instance",
1515

1616
"cmdID_newDefaultConn": "ext.mc.newDefaultConnection",
17-
"cmdTitle_newDefaultConn": "New default local Microclimate connection",
17+
"cmdTitle_newDefaultConn": "New Default Local Microclimate Connection",
1818
"cmdDescr_newDefaultConn": "Connect to Microclimate at the default local URL http://localhost:9090",
1919

2020
"cmdID_removeConn": "ext.mc.removeConnection",
21-
"cmdTitle_removeConn": "Remove connection",
21+
"cmdTitle_removeConn": "Remove Connection",
2222
"cmdDescr_removeConn": "Remove a Microclimate connection",
2323

2424
"cmdID_refreshConnection": "ext.mc.refreshConnection",
25-
"cmdTitle_refreshConnection": "Refresh connection",
25+
"cmdTitle_refreshConnection": "Refresh Connection",
2626
"cmdDescr_refreshConnection": "Refresh a Microclimate connection",
2727

2828
"cmdID_newMCProject": "ext.mc.createMCProject",
29-
"cmdTitle_newMCProject": "Create new project",
29+
"cmdTitle_newMCProject": "Create New Project",
3030
"cmdDescr_newMCProject": "Create a new Microclimate project",
3131

3232
"cmdID_openFolder": "ext.mc.openWorkspaceFolder",
33-
"cmdTitle_openFolder": "Open folder as workspace",
33+
"cmdTitle_openFolder": "Open Folder as Workspace",
3434
"cmdDescr_openFolder": "Open a folder as your VSCode workspace",
3535

3636
"cmdID_openInBrowser": "ext.mc.openInBrowser",
37-
"cmdTitle_openInBrowser": "Open in browser",
37+
"cmdTitle_openInBrowser": "Open in Browser",
3838
"cmdDescr_openInBrowser": "Open a Microclimate instance or project in a browser",
3939

4040
"cmdID_attachDebugger": "ext.mc.attachDebugger",
41-
"cmdTitle_attachDebugger": "Attach debugger",
41+
"cmdTitle_attachDebugger": "Attach Debugger",
4242
"cmdDescr_attachDebugger": "Attach the VSCode debugger to a Microclimate project",
4343

4444
"cmdID_restartRun": "ext.mc.restartProjectRun",
45-
"cmdTitle_restartRun": "Restart in Run mode",
45+
"cmdTitle_restartRun": "Restart in Run Mode",
4646
"cmdDescr_restartRun": "Restart a Microclimate project in Run (normal) mode",
4747

4848
"cmdID_restartDebug": "ext.mc.restartProjectDebug",
49-
"cmdTitle_restartDebug": "Restart in Debug mode",
49+
"cmdTitle_restartDebug": "Restart in Debug Mode",
5050
"cmdDescr_restartDebug": "Restart a Microclimate project in Debug mode",
5151

5252
"cmdID_requestBuild": "ext.mc.requestBuild",
5353
"cmdTitle_requestBuild": "Build",
5454
"cmdDescr_requestBuild": "Manually start a project build in Microclimate",
5555

5656
"cmdID_openBuildLog": "ext.mc.openBuildLog",
57-
"cmdTitle_openBuildLog": "Show build log",
57+
"cmdTitle_openBuildLog": "Show Build Log",
5858
"cmdDescr_openBuildLog": "Show a project's Microclimate build logs in the Output view",
5959

6060
"cmdID_openAppLog": "ext.mc.openAppLog",
61-
"cmdTitle_openAppLog": "Show application log",
61+
"cmdTitle_openAppLog": "Show Application Log",
6262
"cmdDescr_openAppLog": "Show a project's Microclimate application logs in the Output view",
6363

6464
"cmdID_hideLogs": "ext.mc.hideLogs",
65-
"cmdTitle_hideLogs": "Hide logs",
65+
"cmdTitle_hideLogs": "Hide Logs",
6666

6767
"cmdID_projectInfo": "ext.mc.viewProjectInfo",
68-
"cmdTitle_projectInfo": "Show project info",
69-
"cmdDescr_projectInfo": "Show a project's Microclimate information",
68+
"cmdTitle_projectInfo": "Open Project Overview",
69+
"cmdDescr_projectInfo": "Open a project's Microclimate information",
7070

7171
"cmdID_enable": "ext.mc.enable",
72-
"cmdTitle_enable": "Enable project",
72+
"cmdTitle_enable": "Enable Project",
7373
"cmdDescr_enable": "Enable a project in Microclimate",
7474

7575
"cmdID_disable": "ext.mc.disable",
76-
"cmdTitle_disable": "Disable project",
76+
"cmdTitle_disable": "Disable Project",
7777
"cmdDescr_disable": "Disable a project in Microclimate",
7878

7979
"cmdID_containerShell": "ext.mc.containerShell",
80-
"cmdTitle_containerShell": "Open container shell",
80+
"cmdTitle_containerShell": "Open Container Shell",
8181
"cmdDescr_containerShell": "Open a shell inside a project's application container",
8282

8383
"cmdID_toggleAutoBuild": "ext.mc.toggleAutoBuild",
84-
"cmdTitle_toggleAutoBuild": "Toggle auto build",
84+
"cmdTitle_toggleAutoBuild": "Toggle Auto Build",
8585

8686
"cmdID_enableAutoBuild": "ext.mc.enableAutoBuild",
87-
"cmdTitle_enableAutoBuild": "Enable auto build",
87+
"cmdTitle_enableAutoBuild": "Enable Auto Build",
8888

8989
"cmdID_disableAutoBuild": "ext.mc.disableAutoBuild",
90-
"cmdTitle_disableAutoBuild": "Disable auto build",
90+
"cmdTitle_disableAutoBuild": "Disable Auto Build",
9191

9292
"cmdID_openAppMonitor": "ext.mc.openAppMonitor",
93-
"cmdTitle_openAppMonitor": "Open app monitor",
93+
"cmdTitle_openAppMonitor": "Open Application Monitor",
9494
"cmdDescr_openAppMonitor": "Open a project's Application Monitor page in a browser",
9595

9696
"cmdID_validate": "ext.mc.validate",
@@ -110,7 +110,7 @@
110110
"isConnection": "viewItem =~ /ext\\.mc\\.connectionItem*/",
111111
"isActiveConnection": "viewItem == ext.mc.connectionItem.active",
112112

113-
"isActiveConnectionOrEnabledProject":
113+
"notused-isActiveConnectionOrEnabledProject":
114114
"viewItem =~ /ext.mc.(projectItem.enabled.*|connectionItem.active)/",
115115

116116
"isProject": "viewItem =~ /ext\\.mc\\.projectItem*/",

0 commit comments

Comments
 (0)