Skip to content

Commit 4bcf75a

Browse files
eamodioeamodio
committed
Updates menu visibility for grouped SCM views
1 parent 3c32133 commit 4bcf75a

File tree

2 files changed

+230
-38
lines changed

2 files changed

+230
-38
lines changed

‎contributions.json‎

Lines changed: 112 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,12 @@
900900
"order": 4
901901
},
902902
{
903-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/ && !listMultiSelection",
903+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory)/ && !listMultiSelection",
904+
"group": "7_gitlens_cutcopypaste",
905+
"order": 98
906+
},
907+
{
908+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/ && !listMultiSelection",
904909
"group": "7_gitlens_cutcopypaste",
905910
"order": 98
906911
}
@@ -997,7 +1002,7 @@
9971002
{
9981003
"when": "viewItem =~ /gitlens:file($|\\b(?=.*?\\b\\+(committed|stashed|staged|unstaged)\\b)|:results)/ && !gitlens:untrusted && !gitlens:hasVirtualFolders",
9991004
"group": "7_gitlens_cutcopypaste",
1000-
"order": 3
1005+
"order": 100
10011006
},
10021007
{
10031008
"when": "viewItem =~ /gitlens:uncommitted:files\\b/ && !listMultiSelection && !gitlens:untrusted && !gitlens:hasVirtualFolders",
@@ -1344,7 +1349,18 @@
13441349
"alt": "gitlens.copyMessageToClipboard"
13451350
},
13461351
{
1347-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(file|line)History/ && !listMultiSelection",
1352+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/",
1353+
"group": "inline",
1354+
"order": 98,
1355+
"alt": "gitlens.copyMessageToClipboard"
1356+
},
1357+
{
1358+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory)/ && !listMultiSelection",
1359+
"group": "7_gitlens_cutcopypaste",
1360+
"order": 97
1361+
},
1362+
{
1363+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/ && !listMultiSelection",
13481364
"group": "7_gitlens_cutcopypaste",
13491365
"order": 97
13501366
}
@@ -4719,7 +4735,7 @@
47194735
"menus": {
47204736
"gitlens/commit/file/commit": [
47214737
{
4722-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/",
4738+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
47234739
"group": "navigation",
47244740
"order": 4
47254741
}
@@ -4976,7 +4992,7 @@
49764992
"menus": {
49774993
"gitlens/commit/file/commit": [
49784994
{
4979-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)\\b/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/",
4995+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)\\b/",
49804996
"group": "navigation",
49814997
"order": 2
49824998
}
@@ -5006,7 +5022,7 @@
50065022
"menus": {
50075023
"gitlens/commit/file/commit": [
50085024
{
5009-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/",
5025+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/",
50105026
"group": "navigation",
50115027
"order": 1
50125028
}
@@ -5021,6 +5037,11 @@
50215037
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /gitlens\\.views\\.(fileHistory|lineHistory\\b)/ && !listMultiSelection",
50225038
"group": "2_gitlens_quickopen",
50235039
"order": 3
5040+
},
5041+
{
5042+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/ && !listMultiSelection",
5043+
"group": "2_gitlens_quickopen",
5044+
"order": 3
50245045
}
50255046
]
50265047
}
@@ -8272,6 +8293,11 @@
82728293
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && !listMultiSelection",
82738294
"group": "4_gitlens_compare",
82748295
"order": 2
8296+
},
8297+
{
8298+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/ && !listMultiSelection",
8299+
"group": "4_gitlens_compare",
8300+
"order": 2
82758301
}
82768302
]
82778303
}
@@ -8343,6 +8369,11 @@
83438369
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && !listMultiSelection && !gitlens:hasVirtualFolders",
83448370
"group": "4_gitlens_compare",
83458371
"order": 3
8372+
},
8373+
{
8374+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/ && !listMultiSelection && !gitlens:hasVirtualFolders",
8375+
"group": "4_gitlens_compare",
8376+
"order": 3
83468377
}
83478378
]
83488379
}
@@ -11099,7 +11130,7 @@
1109911130
"menus": {
1110011131
"gitlens/commit/file/commit": [
1110111132
{
11102-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && gitlens:repos:withRemotes",
11133+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && gitlens:repos:withRemotes",
1110311134
"group": "navigation",
1110411135
"order": 3,
1110511136
"alt": "gitlens.copyRemoteCommitUrl"
@@ -11167,6 +11198,11 @@
1116711198
"group": "inline",
1116811199
"order": 96
1116911200
},
11201+
{
11202+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+conflicted\\b)/ && view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/",
11203+
"group": "inline",
11204+
"order": 96
11205+
},
1117011206
{
1117111207
"when": "viewItem =~ /gitlens:(file|history:(file|line)|status:file)\\b/ && !listMultiSelection",
1117211208
"group": "2_gitlens_quickopen_file",
@@ -15462,6 +15498,16 @@
1546215498
"group": "5_gitlens",
1546315499
"order": 2
1546415500
},
15501+
{
15502+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == fileHistory && config.gitlens.views.showRelativeDateMarkers",
15503+
"group": "5_gitlens",
15504+
"order": 2
15505+
},
15506+
{
15507+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == lineHistory && config.gitlens.views.showRelativeDateMarkers",
15508+
"group": "5_gitlens",
15509+
"order": 2
15510+
},
1546515511
{
1546615512
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == tags && config.gitlens.views.showRelativeDateMarkers",
1546715513
"group": "5_gitlens",
@@ -15540,7 +15586,12 @@
1554015586
"order": 2
1554115587
},
1554215588
{
15543-
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == repositories && config.gitlens.views.showRelativeDateMarkers",
15589+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == fileHistory && config.gitlens.views.showRelativeDateMarkers",
15590+
"group": "5_gitlens",
15591+
"order": 2
15592+
},
15593+
{
15594+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == lineHistory && config.gitlens.views.showRelativeDateMarkers",
1554415595
"group": "5_gitlens",
1554515596
"order": 2
1554615597
},
@@ -15564,6 +15615,11 @@
1556415615
"group": "5_gitlens",
1556515616
"order": 4
1556615617
},
15618+
{
15619+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == repositories && config.gitlens.views.showRelativeDateMarkers",
15620+
"group": "5_gitlens",
15621+
"order": 4
15622+
},
1556715623
{
1556815624
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == worktrees && config.gitlens.views.showRelativeDateMarkers",
1556915625
"group": "5_gitlens",
@@ -15614,15 +15670,20 @@
1561415670
{
1561515671
"when": "view == gitlens.views.repositories && config.gitlens.views.showRelativeDateMarkers",
1561615672
"group": "5_gitlens",
15617-
"order": 2
15673+
"order": 4
1561815674
},
1561915675
{
1562015676
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == contributors && config.gitlens.views.showRelativeDateMarkers",
1562115677
"group": "5_gitlens",
1562215678
"order": 2
1562315679
},
1562415680
{
15625-
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && config.gitlens.views.showRelativeDateMarkers",
15681+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == fileHistory && config.gitlens.views.showRelativeDateMarkers",
15682+
"group": "5_gitlens",
15683+
"order": 2
15684+
},
15685+
{
15686+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == lineHistory && config.gitlens.views.showRelativeDateMarkers",
1562615687
"group": "5_gitlens",
1562715688
"order": 2
1562815689
},
@@ -15646,6 +15707,11 @@
1564615707
"group": "5_gitlens",
1564715708
"order": 4
1564815709
},
15710+
{
15711+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && config.gitlens.views.showRelativeDateMarkers",
15712+
"group": "5_gitlens",
15713+
"order": 4
15714+
},
1564915715
{
1565015716
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && config.gitlens.views.showRelativeDateMarkers",
1565115717
"group": "5_gitlens",
@@ -15674,7 +15740,12 @@
1567415740
"order": 2
1567515741
},
1567615742
{
15677-
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15743+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == fileHistory && !config.gitlens.views.showRelativeDateMarkers",
15744+
"group": "5_gitlens",
15745+
"order": 2
15746+
},
15747+
{
15748+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == lineHistory && !config.gitlens.views.showRelativeDateMarkers",
1567815749
"group": "5_gitlens",
1567915750
"order": 2
1568015751
},
@@ -15698,6 +15769,11 @@
1569815769
"group": "5_gitlens",
1569915770
"order": 4
1570015771
},
15772+
{
15773+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15774+
"group": "5_gitlens",
15775+
"order": 4
15776+
},
1570115777
{
1570215778
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !config.gitlens.views.showRelativeDateMarkers",
1570315779
"group": "5_gitlens",
@@ -15738,15 +15814,20 @@
1573815814
{
1573915815
"when": "viewItem == gitlens:views:repositories && !config.gitlens.views.showRelativeDateMarkers",
1574015816
"group": "5_gitlens",
15741-
"order": 2
15817+
"order": 4
1574215818
},
1574315819
{
1574415820
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == contributors && !config.gitlens.views.showRelativeDateMarkers",
1574515821
"group": "5_gitlens",
1574615822
"order": 2
1574715823
},
1574815824
{
15749-
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15825+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == fileHistory && !config.gitlens.views.showRelativeDateMarkers",
15826+
"group": "5_gitlens",
15827+
"order": 2
15828+
},
15829+
{
15830+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == lineHistory && !config.gitlens.views.showRelativeDateMarkers",
1575015831
"group": "5_gitlens",
1575115832
"order": 2
1575215833
},
@@ -15770,6 +15851,11 @@
1577015851
"group": "5_gitlens",
1577115852
"order": 4
1577215853
},
15854+
{
15855+
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15856+
"group": "5_gitlens",
15857+
"order": 4
15858+
},
1577315859
{
1577415860
"when": "viewItem == gitlens:views:scm.grouped && gitlens:views:scm:grouped:view == worktrees && !config.gitlens.views.showRelativeDateMarkers",
1577515861
"group": "5_gitlens",
@@ -15820,15 +15906,20 @@
1582015906
{
1582115907
"when": "view == gitlens.views.repositories && !config.gitlens.views.showRelativeDateMarkers",
1582215908
"group": "5_gitlens",
15823-
"order": 2
15909+
"order": 4
1582415910
},
1582515911
{
1582615912
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == contributors && !config.gitlens.views.showRelativeDateMarkers",
1582715913
"group": "5_gitlens",
1582815914
"order": 2
1582915915
},
1583015916
{
15831-
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15917+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == fileHistory && !config.gitlens.views.showRelativeDateMarkers",
15918+
"group": "5_gitlens",
15919+
"order": 2
15920+
},
15921+
{
15922+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == lineHistory && !config.gitlens.views.showRelativeDateMarkers",
1583215923
"group": "5_gitlens",
1583315924
"order": 2
1583415925
},
@@ -15852,6 +15943,11 @@
1585215943
"group": "5_gitlens",
1585315944
"order": 4
1585415945
},
15946+
{
15947+
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == repositories && !config.gitlens.views.showRelativeDateMarkers",
15948+
"group": "5_gitlens",
15949+
"order": 4
15950+
},
1585515951
{
1585615952
"when": "view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view == worktrees && !config.gitlens.views.showRelativeDateMarkers",
1585715953
"group": "5_gitlens",
@@ -18000,7 +18096,7 @@
1800018096
"menus": {
1800118097
"view/item/context": [
1800218098
{
18003-
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ && !listMultiSelection",
18099+
"when": "viewItem =~ /gitlens:file\\b(?=.*?\\b\\+committed\\b)/ && (view =~ /^gitlens\\.views\\.(fileHistory|lineHistory)/ || (view == gitlens.views.scm.grouped && gitlens:views:scm:grouped:view =~ /fileHistory|lineHistory/)) && !listMultiSelection",
1800418100
"group": "3_gitlens_explore",
1800518101
"order": 1
1800618102
}

0 commit comments

Comments
 (0)