Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions extension/loc/xlf/aspire-vscode.xlf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

129 changes: 87 additions & 42 deletions extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,30 @@
"views": {
"aspire-panel": [
{
"id": "aspire-vscode.runningAppHosts",
"name": "%views.runningAppHosts.name%"
"id": "aspire-vscode.appHosts",
"name": "%views.appHosts.name%"
}
]
},
"viewsWelcome": [
{
"view": "aspire-vscode.runningAppHosts",
"contents": "%views.runningAppHosts.loading%",
"view": "aspire-vscode.appHosts",
"contents": "%views.appHosts.loading%",
"when": "aspire.loading"
},
{
"view": "aspire-vscode.runningAppHosts",
"contents": "%views.runningAppHosts.welcome%",
"when": "aspire.noRunningAppHosts && !aspire.fetchAppHostsError && !aspire.loading && aspire.viewMode != 'global'"
"view": "aspire-vscode.appHosts",
"contents": "%views.appHosts.welcome%",
"when": "aspire.noAppHosts && !aspire.fetchAppHostsError && !aspire.loading && aspire.viewMode != 'global'"
},
{
"view": "aspire-vscode.runningAppHosts",
"contents": "%views.runningAppHosts.globalWelcome%",
"when": "aspire.noRunningAppHosts && !aspire.fetchAppHostsError && !aspire.loading && aspire.viewMode == 'global'"
"view": "aspire-vscode.appHosts",
"contents": "%views.appHosts.globalWelcome%",
"when": "aspire.noAppHosts && !aspire.fetchAppHostsError && !aspire.loading && aspire.viewMode == 'global'"
},
{
"view": "aspire-vscode.runningAppHosts",
"contents": "%views.runningAppHosts.errorWelcome%",
"view": "aspire-vscode.appHosts",
"contents": "%views.appHosts.errorWelcome%",
"when": "aspire.fetchAppHostsError && !aspire.loading"
}
],
Expand Down Expand Up @@ -261,8 +261,26 @@
"icon": "$(debug-all)"
},
{
"command": "aspire-vscode.refreshRunningAppHosts",
"title": "%command.refreshRunningAppHosts%",
"command": "aspire-vscode.runAppHostCommand",
"title": "%command.runAppHost%",
"category": "Aspire",
"icon": "$(run-all)"
},
{
"command": "aspire-vscode.debugAppHostCommand",
"title": "%command.debugAppHost%",
"category": "Aspire",
"icon": "$(debug-all)"
},
{
"command": "aspire-vscode.globalRefreshAppHosts",
"title": "%command.globalRefreshAppHosts%",
"category": "Aspire",
"icon": "$(refresh)"
},
{
"command": "aspire-vscode.refreshAppHosts",
"title": "%command.refreshAppHosts%",
"category": "Aspire",
"icon": "$(refresh)"
},
Expand Down Expand Up @@ -443,24 +461,24 @@
"menus": {
"explorer/context": [
{
"command": "aspire-vscode.runAppHost",
"command": "aspire-vscode.runAppHostCommand",
"when": "resourceFilename =~ /apphost\\.(cs|ts|js)$/i",
"group": "aspire_actions@1"
},
{
"command": "aspire-vscode.debugAppHost",
"command": "aspire-vscode.debugAppHostCommand",
"when": "resourceFilename =~ /apphost\\.(cs|ts|js)$/i",
"group": "aspire_actions@2"
}
],
"editor/title/run": [
{
"command": "aspire-vscode.runAppHost",
"command": "aspire-vscode.runAppHostCommand",
"when": "(aspire.fileIsAppHost || aspire.workspaceHasAppHost) && aspire.editorSupportsRunDebug",
"group": "navigation@-4"
},
{
"command": "aspire-vscode.debugAppHost",
"command": "aspire-vscode.debugAppHostCommand",
"when": "(aspire.fileIsAppHost || aspire.workspaceHasAppHost) && aspire.editorSupportsRunDebug",
"group": "navigation@-3"
}
Expand All @@ -475,7 +493,19 @@
"when": "false"
},
{
"command": "aspire-vscode.refreshRunningAppHosts",
"command": "aspire-vscode.runAppHostCommand",
Comment thread
adamint marked this conversation as resolved.
"when": "false"
},
{
"command": "aspire-vscode.debugAppHostCommand",
"when": "false"
},
{
"command": "aspire-vscode.globalRefreshAppHosts",
"when": "false"
},
{
"command": "aspire-vscode.refreshAppHosts",
"when": "false"
},
{
Expand Down Expand Up @@ -582,104 +612,119 @@
"view/title": [
{
"command": "aspire-vscode.switchToGlobalView",
"when": "view == 'aspire-vscode.runningAppHosts' && aspire.viewMode != 'global'",
"when": "view == 'aspire-vscode.appHosts' && aspire.viewMode != 'global'",
"group": "navigation"
},
{
"command": "aspire-vscode.switchToWorkspaceView",
"when": "view == 'aspire-vscode.runningAppHosts' && aspire.viewMode == 'global'",
"when": "view == 'aspire-vscode.appHosts' && aspire.viewMode == 'global'",
"group": "navigation"
},
{
"command": "aspire-vscode.refreshRunningAppHosts",
"when": "view == 'aspire-vscode.runningAppHosts'",
"command": "aspire-vscode.globalRefreshAppHosts",
"when": "view == 'aspire-vscode.appHosts' && aspire.viewMode == 'global'",
"group": "navigation"
},
{
"command": "aspire-vscode.refreshAppHosts",
"when": "view == 'aspire-vscode.appHosts' && aspire.viewMode != 'global'",
"group": "navigation"
}
],
"view/item/context": [
{
"command": "aspire-vscode.openDashboard",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^(appHost$|workspaceResources(:|$))/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost$|workspaceResources(:|$))/",
"group": "inline"
},
{
"command": "aspire-vscode.expandAll",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^(appHost$|workspaceResources(:|$))/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost$|workspaceResources(:|$))/",
"group": "inline"
},
{
"command": "aspire-vscode.openAppHostSource",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^(appHost$|workspaceResources(:|$))/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost$|workspaceResources(:hasAppHost)?|workspaceAppHost)$/",
"group": "1_open@1"
},
{
"command": "aspire-vscode.runAppHost",
"when": "view == aspire-vscode.appHosts && viewItem == workspaceAppHost",
"group": "2_actions@1"
},
{
"command": "aspire-vscode.debugAppHost",
"when": "view == aspire-vscode.appHosts && viewItem == workspaceAppHost",
"group": "2_actions@2"
},
{
"command": "aspire-vscode.stopAppHost",
"when": "view == aspire-vscode.runningAppHosts && viewItem == appHost",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost$|workspaceResources:hasAppHost)$/",
"group": "2_actions@1"
},
{
"command": "aspire-vscode.copyAppHostPath",
"when": "view == aspire-vscode.runningAppHosts && viewItem == appHost",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost$|workspaceResources(:hasAppHost)?|workspaceAppHost)$/",
"group": "3_clipboard@1"
},
{
"command": "aspire-vscode.stopResource",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource.*:canStop/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource.*:canStop/",
"group": "2_actions@1"
},
{
"command": "aspire-vscode.startResource",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource.*:canStart/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource.*:canStart/",
"group": "2_actions@2"
},
{
"command": "aspire-vscode.restartResource",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource.*:canRestart/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource.*:canRestart/",
"group": "2_actions@3"
},
{
"command": "aspire-vscode.executeResourceCommand",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource(:|$)/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource(:|$)/",
"group": "2_actions@4"
},
{
"command": "aspire-vscode.viewResourceLogs",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource(:|$)/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource(:|$)/",
"group": "3_info@1"
},
{
"command": "aspire-vscode.openInExternalBrowser",
"when": "view == aspire-vscode.runningAppHosts && viewItem == endpointUrl",
"when": "view == aspire-vscode.appHosts && viewItem == endpointUrl",
"group": "1_open@1"
},
{
"command": "aspire-vscode.openInIntegratedBrowser",
"when": "view == aspire-vscode.runningAppHosts && viewItem == endpointUrl",
"when": "view == aspire-vscode.appHosts && viewItem == endpointUrl",
"group": "1_open@2"
},
{
"command": "aspire-vscode.copyEndpointUrl",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^endpointUrl/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^endpointUrl/",
"group": "3_clipboard@1"
},
{
"command": "aspire-vscode.copyResourceName",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^resource(:|$)/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^resource(:|$)/",
"group": "3_info@2"
},
{
"command": "aspire-vscode.viewAppHostSource",
"when": "view == aspire-vscode.runningAppHosts && viewItem =~ /^(appHost|workspaceResources:hasAppHost)$/",
"when": "view == aspire-vscode.appHosts && viewItem =~ /^(appHost|workspaceResources:hasAppHost)$/",
"group": "1_open@2"
},
{
"command": "aspire-vscode.viewAppHostLogFile",
"when": "view == aspire-vscode.runningAppHosts && viewItem == logFileItem",
"when": "view == aspire-vscode.appHosts && viewItem == logFileItem",
"group": "1_open@1"
},
{
"command": "aspire-vscode.copyLogFilePath",
"when": "view == aspire-vscode.runningAppHosts && viewItem == logFileItem",
"when": "view == aspire-vscode.appHosts && viewItem == logFileItem",
"group": "3_clipboard@1"
}
]
Expand Down Expand Up @@ -855,8 +900,8 @@
"markdown": "walkthrough/runApp.md"
},
"completionEvents": [
"onCommand:aspire-vscode.runAppHost",
"onCommand:aspire-vscode.debugAppHost"
"onCommand:aspire-vscode.runAppHostCommand",
"onCommand:aspire-vscode.debugAppHostCommand"
]
},
{
Expand Down
Loading
Loading