Skip to content

Commit 34e4d5e

Browse files
committed
Updates linked workspace terminology and messaging
1 parent 624385f commit 34e4d5e

File tree

2 files changed

+28
-30
lines changed

2 files changed

+28
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6974,7 +6974,7 @@
69746974
},
69756975
{
69766976
"command": "gitlens.views.workspaces.changeAutoAddSetting",
6977-
"title": "Change Workspace Auto-Add Setting...",
6977+
"title": "Change Linked Workspace Auto-Add Behavior...",
69786978
"category": "GitLens"
69796979
},
69806980
{

src/plus/workspaces/workspacesService.ts

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -305,18 +305,18 @@ export class WorkspacesService implements Disposable {
305305
}
306306
let chosenRepoPaths: string[] = [];
307307
if (!options?.force && this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Prompt) {
308+
const add = { title: 'Add...' };
309+
const change = { title: 'Change Auto-Add Behavior...' };
310+
const cancel = { title: 'Cancel', isCloseAffordance: true };
308311
const addChoice = await window.showInformationMessage(
309-
'New repositories found in the cloud workspace matching this workspace. Would you like to add them?',
310-
{ title: 'Add' },
311-
{ title: 'Change Auto-Add Setting' },
312-
{ title: 'Cancel', isCloseAffordance: true },
312+
'New repositories found in the linked GitKraken workspace. Would you like to add them to the current VS Code workspace?',
313+
add,
314+
change,
315+
cancel,
313316
);
314317

315-
if (addChoice == null || addChoice.title === 'Cancel') {
316-
return;
317-
}
318-
319-
if (addChoice.title === 'Change Auto-Add Setting') {
318+
if (addChoice == null || addChoice === cancel) return;
319+
if (addChoice === change) {
320320
void this.chooseCodeWorkspaceAutoAddSetting({ current: true });
321321
return;
322322
}
@@ -1169,35 +1169,33 @@ export class WorkspacesService implements Disposable {
11691169
? this._currentWorkspaceAutoAddSetting
11701170
: WorkspaceAutoAddSetting.Disabled;
11711171

1172-
const autoAddOptions = [
1172+
type QuickPickItemWithOption = QuickPickItem & { option: WorkspaceAutoAddSetting };
1173+
1174+
const autoAddOptions: QuickPickItemWithOption[] = [
11731175
{
1174-
label: 'Enable',
1176+
label: 'Add on Workspace (Window) Open',
1177+
description:
1178+
this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Enabled ? 'current' : undefined,
11751179
option: WorkspaceAutoAddSetting.Enabled,
1176-
...(this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Enabled
1177-
? { description: '(current)' }
1178-
: {}),
11791180
},
11801181
{
1181-
label: 'Disable',
1182-
option: WorkspaceAutoAddSetting.Disabled,
1183-
...(this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Disabled
1184-
? { description: '(current)' }
1185-
: {}),
1182+
label: 'Prompt on Workspace (Window) Open',
1183+
description:
1184+
this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Prompt ? 'current' : undefined,
1185+
option: WorkspaceAutoAddSetting.Prompt,
11861186
},
11871187
{
1188-
label: 'Ask every time',
1189-
option: WorkspaceAutoAddSetting.Prompt,
1190-
...(this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Prompt
1191-
? { description: '(current)' }
1192-
: {}),
1188+
label: 'Never',
1189+
description:
1190+
this._currentWorkspaceAutoAddSetting === WorkspaceAutoAddSetting.Disabled ? 'current' : undefined,
1191+
option: WorkspaceAutoAddSetting.Disabled,
11931192
},
11941193
];
11951194

1196-
const newWorkspaceAutoAddOption = await window.showQuickPick<
1197-
QuickPickItem & { option: WorkspaceAutoAddSetting }
1198-
>(autoAddOptions, {
1199-
placeHolder: 'Choose an option to automatically add missing repositories to this workspace',
1200-
title: 'Automatically add repositories',
1195+
const newWorkspaceAutoAddOption = await window.showQuickPick<QuickPickItemWithOption>(autoAddOptions, {
1196+
placeHolder:
1197+
'Choose the behavior of automatically adding missing repositories to the current VS Code workspace',
1198+
title: 'Linked Workspace: Automatically Add Repositories',
12011199
});
12021200
if (newWorkspaceAutoAddOption?.option == null) return defaultOption;
12031201

0 commit comments

Comments
 (0)