Skip to content

Commit b91b7a9

Browse files
eamodioeamodio
committed
Inverts plus flag for better perf
1 parent a1e493f commit b91b7a9

File tree

6 files changed

+39
-38
lines changed

6 files changed

+39
-38
lines changed

‎contributions.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3729,50 +3729,50 @@
37293729
"menus": {
37303730
"gitlens/views/grouped/commits": [
37313731
{
3732-
"when": "gitlens:views:scm:grouped:view == commits && gitlens:plus:enabled",
3732+
"when": "gitlens:views:scm:grouped:view == commits && !gitlens:plus:disabled",
37333733
"group": "8_gitlens_toggles",
37343734
"order": 0
37353735
}
37363736
],
37373737
"scm/sourceControl": [
37383738
{
3739-
"when": "scmProvider == git && gitlens:enabled && config.gitlens.menus.scm.graph && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos",
3739+
"when": "scmProvider == git && gitlens:enabled && config.gitlens.menus.scm.graph && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos",
37403740
"group": "6_gitlens",
37413741
"order": 1
37423742
}
37433743
],
37443744
"scm/title": [
37453745
{
3746-
"when": "scmProvider == git && gitlens:enabled && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepositoryInline.graph",
3746+
"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepositoryInline.graph",
37473747
"group": "navigation",
37483748
"order": -1
37493749
},
37503750
{
3751-
"when": "scmProvider == git && gitlens:enabled && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepository.graph",
3751+
"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepository.graph",
37523752
"group": "2_z_gitlens",
37533753
"order": 5
37543754
}
37553755
],
37563756
"view/item/context": [
37573757
{
3758-
"when": "viewItem =~ /gitlens:repo-folder\\b/ && gitlens:plus:enabled",
3758+
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !gitlens:plus:disabled",
37593759
"group": "inline",
37603760
"order": 100
37613761
},
37623762
{
3763-
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !listMultiSelection && gitlens:plus:enabled",
3763+
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !listMultiSelection && !gitlens:plus:disabled",
37643764
"group": "3_gitlens_explore",
37653765
"order": 1
37663766
}
37673767
],
37683768
"view/title": [
37693769
{
3770-
"when": "view == gitlens.views.commits && gitlens:plus:enabled",
3770+
"when": "view == gitlens.views.commits && !gitlens:plus:disabled",
37713771
"group": "navigation",
37723772
"order": 11
37733773
},
37743774
{
3775-
"when": "view == gitlens.views.commits && gitlens:plus:enabled",
3775+
"when": "view == gitlens.views.commits && !gitlens:plus:disabled",
37763776
"group": "8_gitlens_toggles",
37773777
"order": 0
37783778
}
@@ -10665,7 +10665,7 @@
1066510665
"menus": {
1066610666
"view/title": [
1066710667
{
10668-
"when": "!gitlens:hasVirtualFolders && gitlens:plus:enabled && view == gitlens.views.scm.grouped && config.gitlens.views.scm.grouped.views.worktrees && !config.gitlens.views.scm.grouped.hiddenViews.worktrees && (gitlens:views:scm:grouped:view != worktrees || gitlens:views:scm:grouped:welcome)",
10668+
"when": "!gitlens:hasVirtualFolders && !gitlens:plus:disabled && view == gitlens.views.scm.grouped && config.gitlens.views.scm.grouped.views.worktrees && !config.gitlens.views.scm.grouped.hiddenViews.worktrees && (gitlens:views:scm:grouped:view != worktrees || gitlens:views:scm:grouped:welcome)",
1066910669
"group": "navigation",
1067010670
"order": 2,
1067110671
"alt": "gitlens.views.scm.grouped.worktrees.detach"
@@ -10685,7 +10685,7 @@
1068510685
"menus": {
1068610686
"gitlens/views/grouped/attachOrDetach": [
1068710687
{
10688-
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !config.gitlens.views.scm.grouped.views.worktrees",
10688+
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && !config.gitlens.views.scm.grouped.views.worktrees",
1068910689
"group": "2_gitlens",
1069010690
"order": 2
1069110691
}
@@ -10698,7 +10698,7 @@
1069810698
"menus": {
1069910699
"gitlens/views/grouped/attachOrDetach": [
1070010700
{
10701-
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && gitlens:plus:enabled && config.gitlens.views.scm.grouped.views.worktrees",
10701+
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && config.gitlens.views.scm.grouped.views.worktrees",
1070210702
"group": "2_gitlens",
1070310703
"order": 2
1070410704
}
@@ -13792,7 +13792,7 @@
1379213792
"menus": {
1379313793
"view/title": [
1379413794
{
13795-
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !gitlens:views:scm:grouped:welcome && config.gitlens.views.scm.grouped.views.worktrees",
13795+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && !gitlens:views:scm:grouped:welcome && config.gitlens.views.scm.grouped.views.worktrees",
1379613796
"group": "navigation",
1379713797
"order": 2
1379813798
}
@@ -13944,7 +13944,7 @@
1394413944
"gitlens.views.graph": {
1394513945
"type": "webview",
1394613946
"name": "Graph",
13947-
"when": "!gitlens:disabled && gitlens:plus:enabled",
13947+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
1394813948
"contextualTitle": "GitLens",
1394913949
"icon": "$(gitlens-graph)",
1395013950
"initialSize": 4,
@@ -13955,7 +13955,7 @@
1395513955
"gitlens.views.graphDetails": {
1395613956
"type": "webview",
1395713957
"name": "Graph Details",
13958-
"when": "!gitlens:disabled && gitlens:plus:enabled",
13958+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
1395913959
"contextualTitle": "GitLens",
1396013960
"icon": "$(gitlens-commit-view)",
1396113961
"initialSize": 1,
@@ -14236,7 +14236,7 @@
1423614236
"gitlens.views.timeline": {
1423714237
"type": "webview",
1423814238
"name": "Visual File History",
14239-
"when": "!gitlens:disabled && gitlens:plus:enabled",
14239+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
1424014240
"contextualTitle": "GitLens",
1424114241
"icon": "$(graph-scatter)",
1424214242
"initialSize": 1,
@@ -14273,7 +14273,7 @@
1427314273
},
1427414274
"gitlens.views.worktrees": {
1427514275
"name": "Worktrees",
14276-
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !(config.gitlens.views.scm.grouped.views.worktrees || gitlens:views:scm:grouped:views:worktrees)",
14276+
"when": "!gitlens:disabled && !gitlens:plus:disabled && !gitlens:hasVirtualFolders && !(config.gitlens.views.scm.grouped.views.worktrees || gitlens:views:scm:grouped:views:worktrees)",
1427714277
"contextualTitle": "GitLens",
1427814278
"icon": "$(gitlens-worktrees-view)",
1427914279
"visibility": "collapsed",

‎package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14950,12 +14950,12 @@
1495014950
},
1495114951
{
1495214952
"command": "gitlens.views.scm.grouped.worktrees.attach",
14953-
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !config.gitlens.views.scm.grouped.views.worktrees",
14953+
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && !config.gitlens.views.scm.grouped.views.worktrees",
1495414954
"group": "2_gitlens@2"
1495514955
},
1495614956
{
1495714957
"command": "gitlens.views.scm.grouped.worktrees.detach",
14958-
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && gitlens:plus:enabled && config.gitlens.views.scm.grouped.views.worktrees",
14958+
"when": "view == gitlens.views.scm.grouped && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && config.gitlens.views.scm.grouped.views.worktrees",
1495914959
"group": "2_gitlens@2"
1496014960
},
1496114961
{
@@ -15119,7 +15119,7 @@
1511915119
},
1512015120
{
1512115121
"command": "gitlens.showGraph",
15122-
"when": "gitlens:views:scm:grouped:view == commits && gitlens:plus:enabled",
15122+
"when": "gitlens:views:scm:grouped:view == commits && !gitlens:plus:disabled",
1512315123
"group": "8_gitlens_toggles@0"
1512415124
},
1512515125
{
@@ -16221,7 +16221,7 @@
1622116221
"scm/sourceControl": [
1622216222
{
1622316223
"command": "gitlens.showGraph",
16224-
"when": "scmProvider == git && gitlens:enabled && config.gitlens.menus.scm.graph && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos",
16224+
"when": "scmProvider == git && gitlens:enabled && config.gitlens.menus.scm.graph && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos",
1622516225
"group": "6_gitlens@1"
1622616226
}
1622716227
],
@@ -16238,7 +16238,7 @@
1623816238
},
1623916239
{
1624016240
"command": "gitlens.showGraph",
16241-
"when": "scmProvider == git && gitlens:enabled && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepositoryInline.graph",
16241+
"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepositoryInline.graph",
1624216242
"group": "navigation@-1"
1624316243
},
1624416244
{
@@ -16263,7 +16263,7 @@
1626316263
},
1626416264
{
1626516265
"command": "gitlens.showGraph",
16266-
"when": "scmProvider == git && gitlens:enabled && gitlens:plus:enabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepository.graph",
16266+
"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scmRepository.graph",
1626716267
"group": "2_z_gitlens@5"
1626816268
}
1626916269
],
@@ -17523,7 +17523,7 @@
1752317523
},
1752417524
{
1752517525
"command": "gitlens.showGraph",
17526-
"when": "viewItem =~ /gitlens:repo-folder\\b/ && gitlens:plus:enabled",
17526+
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !gitlens:plus:disabled",
1752717527
"group": "inline@100"
1752817528
},
1752917529
{
@@ -17578,7 +17578,7 @@
1757817578
},
1757917579
{
1758017580
"command": "gitlens.showGraph",
17581-
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !listMultiSelection && gitlens:plus:enabled",
17581+
"when": "viewItem =~ /gitlens:repo-folder\\b/ && !listMultiSelection && !gitlens:plus:disabled",
1758217582
"group": "3_gitlens_explore@1"
1758317583
},
1758417584
{
@@ -18297,7 +18297,7 @@
1829718297
},
1829818298
{
1829918299
"command": "gitlens.showGraph",
18300-
"when": "view == gitlens.views.commits && gitlens:plus:enabled",
18300+
"when": "view == gitlens.views.commits && !gitlens:plus:disabled",
1830118301
"group": "navigation@11"
1830218302
},
1830318303
{
@@ -18402,7 +18402,7 @@
1840218402
},
1840318403
{
1840418404
"command": "gitlens.showGraph",
18405-
"when": "view == gitlens.views.commits && gitlens:plus:enabled",
18405+
"when": "view == gitlens.views.commits && !gitlens:plus:disabled",
1840618406
"group": "8_gitlens_toggles@0"
1840718407
},
1840818408
{
@@ -19013,13 +19013,13 @@
1901319013
},
1901419014
{
1901519015
"command": "gitlens.views.scm.grouped.worktrees",
19016-
"when": "!gitlens:hasVirtualFolders && gitlens:plus:enabled && view == gitlens.views.scm.grouped && config.gitlens.views.scm.grouped.views.worktrees && !config.gitlens.views.scm.grouped.hiddenViews.worktrees && (gitlens:views:scm:grouped:view != worktrees || gitlens:views:scm:grouped:welcome)",
19016+
"when": "!gitlens:hasVirtualFolders && !gitlens:plus:disabled && view == gitlens.views.scm.grouped && config.gitlens.views.scm.grouped.views.worktrees && !config.gitlens.views.scm.grouped.hiddenViews.worktrees && (gitlens:views:scm:grouped:view != worktrees || gitlens:views:scm:grouped:welcome)",
1901719017
"group": "navigation@2",
1901819018
"alt": "gitlens.views.scm.grouped.worktrees.detach"
1901919019
},
1902019020
{
1902119021
"submenu": "gitlens/views/grouped/worktrees",
19022-
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !gitlens:views:scm:grouped:welcome && config.gitlens.views.scm.grouped.views.worktrees",
19022+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !gitlens:hasVirtualFolders && !gitlens:plus:disabled && !gitlens:views:scm:grouped:welcome && config.gitlens.views.scm.grouped.views.worktrees",
1902319023
"group": "navigation@2"
1902419024
},
1902519025
{
@@ -21537,7 +21537,7 @@
2153721537
{
2153821538
"id": "gitlens.views.worktrees",
2153921539
"name": "Worktrees",
21540-
"when": "!gitlens:disabled && !gitlens:hasVirtualFolders && gitlens:plus:enabled && !(config.gitlens.views.scm.grouped.views.worktrees || gitlens:views:scm:grouped:views:worktrees)",
21540+
"when": "!gitlens:disabled && !gitlens:plus:disabled && !gitlens:hasVirtualFolders && !(config.gitlens.views.scm.grouped.views.worktrees || gitlens:views:scm:grouped:views:worktrees)",
2154121541
"contextualTitle": "GitLens",
2154221542
"icon": "$(gitlens-worktrees-view)",
2154321543
"visibility": "collapsed"
@@ -21601,7 +21601,7 @@
2160121601
"type": "webview",
2160221602
"id": "gitlens.views.timeline",
2160321603
"name": "Visual File History",
21604-
"when": "!gitlens:disabled && gitlens:plus:enabled",
21604+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
2160521605
"contextualTitle": "GitLens",
2160621606
"icon": "$(graph-scatter)",
2160721607
"initialSize": 1,
@@ -21660,7 +21660,7 @@
2166021660
"type": "webview",
2166121661
"id": "gitlens.views.graph",
2166221662
"name": "Graph",
21663-
"when": "!gitlens:disabled && gitlens:plus:enabled",
21663+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
2166421664
"contextualTitle": "GitLens",
2166521665
"icon": "$(gitlens-graph)",
2166621666
"initialSize": 4,
@@ -21670,7 +21670,7 @@
2167021670
"type": "webview",
2167121671
"id": "gitlens.views.graphDetails",
2167221672
"name": "Graph Details",
21673-
"when": "!gitlens:disabled && gitlens:plus:enabled",
21673+
"when": "!gitlens:disabled && !gitlens:plus:disabled",
2167421674
"contextualTitle": "GitLens",
2167521675
"icon": "$(gitlens-commit-view)",
2167621676
"initialSize": 1,

‎src/constants.context.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ export type ContextKeys = {
2222
/** Indicates that this is the first run after an upgrade of GitLens */
2323
'gitlens:install:upgradedFrom': string;
2424
'gitlens:plus': Exclude<SubscriptionPlanId, SubscriptionPlanId.Community>;
25+
'gitlens:plus:disabled': boolean;
2526
'gitlens:plus:disallowedRepos': string[];
26-
'gitlens:plus:enabled': boolean;
2727
'gitlens:plus:required': boolean;
2828
'gitlens:plus:state': SubscriptionState;
2929
'gitlens:prerelease': boolean;

‎src/plus/gk/subscriptionService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1577,11 +1577,11 @@ export class SubscriptionService implements Disposable {
15771577
if (cancellation.isCancellationRequested) return;
15781578
}
15791579

1580-
const plusFeatures = configuration.get('plusFeatures.enabled') ?? true;
1580+
const plusEnabled = configuration.get('plusFeatures.enabled') ?? true;
15811581

15821582
let disallowedRepos: string[] | undefined;
15831583

1584-
if (!plusFeatures && allowed === 'mixed') {
1584+
if (!plusEnabled && allowed === 'mixed') {
15851585
disallowedRepos = [];
15861586
for (const repo of this.container.git.repositories) {
15871587
if (repo.closed) continue;
@@ -1595,7 +1595,7 @@ export class SubscriptionService implements Disposable {
15951595
}
15961596
}
15971597

1598-
void setContext('gitlens:plus:enabled', Boolean(allowed) || plusFeatures);
1598+
void setContext('gitlens:plus:disabled', !plusEnabled && !allowed);
15991599
void setContext('gitlens:plus:required', allowed === false);
16001600
void setContext('gitlens:plus:disallowedRepos', disallowedRepos);
16011601
}

‎src/plus/gk/utils/-webview/plus.utils.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import { getContext } from '../../../../system/-webview/context';
88
import { isSubscriptionPaidPlan, isSubscriptionPreviewTrialExpired } from '../subscription.utils';
99

1010
export function arePlusFeaturesEnabled(): boolean {
11-
return getContext('gitlens:plus:enabled', configuration.get('plusFeatures.enabled', undefined, true));
11+
const enabled = configuration.get('plusFeatures.enabled', undefined, true);
12+
return enabled ? true : !getContext('gitlens:plus:disabled');
1213
}
1314

1415
export async function ensurePlusFeaturesEnabled(): Promise<boolean> {

‎src/plus/graph/statusbar.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export class GraphStatusBarController implements Disposable {
1818
container.subscription.onDidChange(this.onSubscriptionChanged, this),
1919
once(container.onReady)(() => queueMicrotask(() => this.updateStatusBar())),
2020
onDidChangeContext(key => {
21-
if (key !== 'gitlens:enabled' && key !== 'gitlens:plus:enabled') return;
21+
if (key !== 'gitlens:enabled' && key !== 'gitlens:plus:disabled') return;
2222
this.updateStatusBar();
2323
}),
2424
{ dispose: () => this._statusBarItem?.dispose() },

0 commit comments

Comments
 (0)