diff --git a/extensions/gitpod/package.json b/extensions/gitpod/package.json index e831a7d168332..ada781e7b6da5 100644 --- a/extensions/gitpod/package.json +++ b/extensions/gitpod/package.json @@ -34,9 +34,9 @@ "contributes": { "commands": [ { - "command": "gitpod.collectLogs", + "command": "gitpod.exportLogs", "category": "Gitpod", - "title": "Collect all logs" + "title": "Export all logs" } ] }, diff --git a/extensions/gitpod/src/collectLogs.ts b/extensions/gitpod/src/exportLogs.ts similarity index 97% rename from extensions/gitpod/src/collectLogs.ts rename to extensions/gitpod/src/exportLogs.ts index 9db8971d104c5..274d4112d54ee 100644 --- a/extensions/gitpod/src/collectLogs.ts +++ b/extensions/gitpod/src/exportLogs.ts @@ -55,7 +55,7 @@ async function traverseFolder(folderUri: vscode.Uri, files: IFile[], token: vsco } } -export async function collectLogs(context: vscode.ExtensionContext) { +export async function exportLogs(context: vscode.ExtensionContext) { const saveUri = await vscode.window.showSaveDialog({ title: 'Choose save location ...', defaultUri: vscode.Uri.file(path.posix.join(os.homedir(), `vscode-desktop-logs-${new Date().toISOString().replace(/-|:|\.\d+Z$/g, '')}.zip`)), diff --git a/extensions/gitpod/src/extension.ts b/extensions/gitpod/src/extension.ts index 9485573ab3db6..f0418cd823fef 100644 --- a/extensions/gitpod/src/extension.ts +++ b/extensions/gitpod/src/extension.ts @@ -16,7 +16,7 @@ import * as tmp from 'tmp'; import * as path from 'path'; import * as vscode from 'vscode'; import { grpc } from '@improbable-eng/grpc-web'; -import { collectLogs } from './collectLogs'; +import { exportLogs } from './exportLogs'; interface SSHConnectionParams { workspaceId: string; @@ -435,11 +435,11 @@ export async function activate(context: vscode.ExtensionContext) { } })); - context.subscriptions.push(vscode.commands.registerCommand('gitpod.collectLogs', async () => { + context.subscriptions.push(vscode.commands.registerCommand('gitpod.exportLogs', async () => { try { - await collectLogs(context); + await exportLogs(context); } catch (e) { - const outputMessage = `Error collecting logs: ${e}`; + const outputMessage = `Error exporting logs: ${e}`; vscode.window.showErrorMessage(outputMessage); log(outputMessage); // logger.error(outputMessage); diff --git a/src/vs/gitpod/browser/workbench/contrib/exportLogs.contribution.ts b/src/vs/gitpod/browser/workbench/contrib/exportLogs.contribution.ts index b0f4e3bd37e44..df995fc601aa7 100644 --- a/src/vs/gitpod/browser/workbench/contrib/exportLogs.contribution.ts +++ b/src/vs/gitpod/browser/workbench/contrib/exportLogs.contribution.ts @@ -8,7 +8,6 @@ import { IBrowserWorkbenchEnvironmentService } from 'vs/workbench/services/envir import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteAgentService'; import { IFileService } from 'vs/platform/files/common/files'; import { Action2, MenuId, registerAction2 } from 'vs/platform/actions/common/actions'; -import { CATEGORIES } from 'vs/workbench/common/actions'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { URI } from 'vs/base/common/uri'; import * as resources from 'vs/base/common/resources'; @@ -40,7 +39,7 @@ registerAction2(class ExportLogsAction extends Action2 { super({ id: 'gitpod.workbench.exportLogs', title: { original: 'Export all logs', value: 'Export all logs' }, - category: CATEGORIES.Developer, + category: { original: 'Gitpod', value: 'Gitpod' }, menu: { id: MenuId.CommandPalette }