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
15 changes: 3 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5662,13 +5662,8 @@
"category": "GitLens"
},
{
"command": "gitlens.plus.simulateSubscriptionState",
"title": "Simulate Subscription State (Debugging)",
"category": "GitLens"
},
{
"command": "gitlens.plus.restoreSubscriptionState",
"title": "Restore Subscription State (Debugging)",
"command": "gitlens.plus.simulateSubscription",
"title": "Simulate Subscription (Debugging)",
"category": "GitLens"
},
{
Expand Down Expand Up @@ -9803,11 +9798,7 @@
"when": "gitlens:enabled"
},
{
"command": "gitlens.plus.simulateSubscriptionState",
"when": "gitlens:enabled && gitlens:debugging"
},
{
"command": "gitlens.plus.restoreSubscriptionState",
"command": "gitlens.plus.simulateSubscription",
"when": "gitlens:enabled && gitlens:debugging"
},
{
Expand Down
19 changes: 0 additions & 19 deletions src/commands/resets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const resetTypes = [
'ai',
'avatars',
'integrations',
'plus',
'repositoryAccess',
'suppressedWarnings',
'usageTracking',
Expand Down Expand Up @@ -74,27 +73,13 @@ export class ResetCommand extends Command {
},
];

if (this.container.debugging) {
items.splice(
0,
0,
{
label: 'Subscription Reset',
detail: 'Resets the stored subscription',
item: 'plus',
},
createQuickPickSeparator(),
);
}

// create a quick pick with options to clear all the different resets that GitLens supports
const pick = await window.showQuickPick<ResetQuickPickItem>(items, {
title: 'Reset Stored Data',
placeHolder: 'Choose which data to reset, will be prompted to confirm',
});

if (pick?.item == null) return;
if (pick.item === 'plus' && !this.container.debugging) return;

const confirm: MessageItem = { title: 'Reset' };
const cancel: MessageItem = { title: 'Cancel', isCloseAffordance: true };
Expand Down Expand Up @@ -170,10 +155,6 @@ export class ResetCommand extends Command {
await this.container.integrations.reset();
break;

case 'plus':
await this.container.subscription.logout(true, undefined);
break;

case 'repositoryAccess':
await this.container.git.clearAllRepoVisibilityCaches();
break;
Expand Down
3 changes: 1 addition & 2 deletions src/constants.commands.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,7 @@ export const enum Commands {
PlusStartPreviewTrial = 'gitlens.plus.startPreviewTrial',
PlusUpgrade = 'gitlens.plus.upgrade',
PlusValidate = 'gitlens.plus.validate',
PlusSimulateSubscriptionState = 'gitlens.plus.simulateSubscriptionState',
PlusRestoreSubscriptionState = 'gitlens.plus.restoreSubscriptionState',
PlusSimulateSubscription = 'gitlens.plus.simulateSubscription',
QuickOpenFileHistory = 'gitlens.quickOpenFileHistory',
RefreshLaunchpad = 'gitlens.launchpad.refresh',
RefreshGraph = 'gitlens.graph.refresh',
Expand Down
Loading
Loading