Skip to content

Commit 628b88f

Browse files
eamodioeamodio
committed
Fixes missing remote sort menu commands
Improves sort when clause to be less fragile
1 parent 4ee816d commit 628b88f

File tree

3 files changed

+73
-23
lines changed

3 files changed

+73
-23
lines changed

‎contributions.json‎

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7235,7 +7235,7 @@
72357235
},
72367236
"gitlens.views.branches.setSortByDate": {
72377237
"label": "Sort by Date",
7238-
"enablement": "config.gitlens.sortBranchesBy =~ /^name:/",
7238+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!date:)/",
72397239
"menus": {
72407240
"gitlens/views/branches/sort": [
72417241
{
@@ -7247,7 +7247,7 @@
72477247
},
72487248
"gitlens.views.branches.setSortByName": {
72497249
"label": "Sort by Name",
7250-
"enablement": "config.gitlens.sortBranchesBy =~ /^date:/",
7250+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!name:)/",
72517251
"menus": {
72527252
"gitlens/views/branches/sort": [
72537253
{
@@ -12350,19 +12350,51 @@
1235012350
},
1235112351
"gitlens.views.remotes.setSortAscending": {
1235212352
"label": "Ascending",
12353-
"enablement": "config.gitlens.sortBranchesBy =~ /:desc$/"
12353+
"enablement": "config.gitlens.sortBranchesBy =~ /:desc$/",
12354+
"menus": {
12355+
"gitlens/views/remotes/sort": [
12356+
{
12357+
"group": "2_direction",
12358+
"order": 1
12359+
}
12360+
]
12361+
}
1235412362
},
1235512363
"gitlens.views.remotes.setSortByDate": {
1235612364
"label": "Sort Branches by Date",
12357-
"enablement": "config.gitlens.sortBranchesBy =~ /^name:/"
12365+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!date:)/",
12366+
"menus": {
12367+
"gitlens/views/remotes/sort": [
12368+
{
12369+
"group": "1_type",
12370+
"order": 0
12371+
}
12372+
]
12373+
}
1235812374
},
1235912375
"gitlens.views.remotes.setSortByName": {
1236012376
"label": "Sort Branches by Name",
12361-
"enablement": "config.gitlens.sortBranchesBy =~ /^date:/"
12377+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!name:)/",
12378+
"menus": {
12379+
"gitlens/views/remotes/sort": [
12380+
{
12381+
"group": "1_type",
12382+
"order": 1
12383+
}
12384+
]
12385+
}
1236212386
},
1236312387
"gitlens.views.remotes.setSortDescending": {
1236412388
"label": "Descending",
12365-
"enablement": "config.gitlens.sortBranchesBy =~ /:asc$/"
12389+
"enablement": "config.gitlens.sortBranchesBy =~ /:asc$/",
12390+
"menus": {
12391+
"gitlens/views/remotes/sort": [
12392+
{
12393+
"group": "2_direction",
12394+
"order": 0
12395+
}
12396+
]
12397+
}
1236612398
},
1236712399
"gitlens.views.remotes.viewOptionsTitle": {
1236812400
"label": "Remotes View Options",
@@ -16418,7 +16450,7 @@
1641816450
},
1641916451
"gitlens.views.tags.setSortByDate": {
1642016452
"label": "Sort by Date",
16421-
"enablement": "config.gitlens.sortTagsBy =~ /^name:/",
16453+
"enablement": "config.gitlens.sortTagsBy =~ /^(?!date:)/",
1642216454
"menus": {
1642316455
"gitlens/views/tags/sort": [
1642416456
{
@@ -16430,7 +16462,7 @@
1643016462
},
1643116463
"gitlens.views.tags.setSortByName": {
1643216464
"label": "Sort by Name",
16433-
"enablement": "config.gitlens.sortTagsBy =~ /^date:/",
16465+
"enablement": "config.gitlens.sortTagsBy =~ /^(?!name:)/",
1643416466
"menus": {
1643516467
"gitlens/views/tags/sort": [
1643616468
{
@@ -17535,7 +17567,7 @@
1753517567
},
1753617568
"gitlens.views.worktrees.setSortByDate": {
1753717569
"label": "Sort by Date",
17538-
"enablement": "config.gitlens.sortWorktreesBy =~ /^name:/",
17570+
"enablement": "config.gitlens.sortWorktreesBy =~ /^(?!date:)/",
1753917571
"menus": {
1754017572
"gitlens/views/worktrees/sort": [
1754117573
{
@@ -17547,7 +17579,7 @@
1754717579
},
1754817580
"gitlens.views.worktrees.setSortByName": {
1754917581
"label": "Sort by Name",
17550-
"enablement": "config.gitlens.sortWorktreesBy =~ /^date:/",
17582+
"enablement": "config.gitlens.sortWorktreesBy =~ /^(?!name:)/",
1755117583
"menus": {
1755217584
"gitlens/views/worktrees/sort": [
1755317585
{

‎package.json‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8756,12 +8756,12 @@
87568756
{
87578757
"command": "gitlens.views.branches.setSortByDate",
87588758
"title": "Sort by Date",
8759-
"enablement": "config.gitlens.sortBranchesBy =~ /^name:/"
8759+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!date:)/"
87608760
},
87618761
{
87628762
"command": "gitlens.views.branches.setSortByName",
87638763
"title": "Sort by Name",
8764-
"enablement": "config.gitlens.sortBranchesBy =~ /^date:/"
8764+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!name:)/"
87658765
},
87668766
{
87678767
"command": "gitlens.views.branches.setSortDescending",
@@ -9888,12 +9888,12 @@
98889888
{
98899889
"command": "gitlens.views.remotes.setSortByDate",
98909890
"title": "Sort Branches by Date",
9891-
"enablement": "config.gitlens.sortBranchesBy =~ /^name:/"
9891+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!date:)/"
98929892
},
98939893
{
98949894
"command": "gitlens.views.remotes.setSortByName",
98959895
"title": "Sort Branches by Name",
9896-
"enablement": "config.gitlens.sortBranchesBy =~ /^date:/"
9896+
"enablement": "config.gitlens.sortBranchesBy =~ /^(?!name:)/"
98979897
},
98989898
{
98999899
"command": "gitlens.views.remotes.setSortDescending",
@@ -10740,12 +10740,12 @@
1074010740
{
1074110741
"command": "gitlens.views.tags.setSortByDate",
1074210742
"title": "Sort by Date",
10743-
"enablement": "config.gitlens.sortTagsBy =~ /^name:/"
10743+
"enablement": "config.gitlens.sortTagsBy =~ /^(?!date:)/"
1074410744
},
1074510745
{
1074610746
"command": "gitlens.views.tags.setSortByName",
1074710747
"title": "Sort by Name",
10748-
"enablement": "config.gitlens.sortTagsBy =~ /^date:/"
10748+
"enablement": "config.gitlens.sortTagsBy =~ /^(?!name:)/"
1074910749
},
1075010750
{
1075110751
"command": "gitlens.views.tags.setSortDescending",
@@ -10983,12 +10983,12 @@
1098310983
{
1098410984
"command": "gitlens.views.worktrees.setSortByDate",
1098510985
"title": "Sort by Date",
10986-
"enablement": "config.gitlens.sortWorktreesBy =~ /^name:/"
10986+
"enablement": "config.gitlens.sortWorktreesBy =~ /^(?!date:)/"
1098710987
},
1098810988
{
1098910989
"command": "gitlens.views.worktrees.setSortByName",
1099010990
"title": "Sort by Name",
10991-
"enablement": "config.gitlens.sortWorktreesBy =~ /^date:/"
10991+
"enablement": "config.gitlens.sortWorktreesBy =~ /^(?!name:)/"
1099210992
},
1099310993
{
1099410994
"command": "gitlens.views.worktrees.setSortDescending",
@@ -18195,6 +18195,24 @@
1819518195
"group": "9_gitlens@3"
1819618196
}
1819718197
],
18198+
"gitlens/views/remotes/sort": [
18199+
{
18200+
"command": "gitlens.views.remotes.setSortByDate",
18201+
"group": "1_type@0"
18202+
},
18203+
{
18204+
"command": "gitlens.views.remotes.setSortByName",
18205+
"group": "1_type@1"
18206+
},
18207+
{
18208+
"command": "gitlens.views.remotes.setSortDescending",
18209+
"group": "2_direction@0"
18210+
},
18211+
{
18212+
"command": "gitlens.views.remotes.setSortAscending",
18213+
"group": "2_direction@1"
18214+
}
18215+
],
1819818216
"gitlens/views/repositories/sort": [
1819918217
{
1820018218
"command": "gitlens.views.repositories.setSortByDiscovered",

‎src/constants.commands.generated.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,10 @@ export type ContributedCommands =
581581
| 'gitlens.views.remotes.setShowAvatarsOn'
582582
| 'gitlens.views.remotes.setShowBranchPullRequestOff'
583583
| 'gitlens.views.remotes.setShowBranchPullRequestOn'
584+
| 'gitlens.views.remotes.setSortAscending'
585+
| 'gitlens.views.remotes.setSortByDate'
586+
| 'gitlens.views.remotes.setSortByName'
587+
| 'gitlens.views.remotes.setSortDescending'
584588
| 'gitlens.views.remotes.viewOptionsTitle'
585589
| 'gitlens.views.removeRemote'
586590
| 'gitlens.views.renameBranch'
@@ -1073,8 +1077,4 @@ export type ContributedKeybindingCommands =
10731077
export type ContributedOrphansOrInternalCommands =
10741078
| 'gitlens.graph.pushWithForce'
10751079
| 'gitlens.openFolderHistoryInGraph'
1076-
| 'gitlens.plus.cloudIntegrations.connect'
1077-
| 'gitlens.views.remotes.setSortAscending'
1078-
| 'gitlens.views.remotes.setSortByDate'
1079-
| 'gitlens.views.remotes.setSortByName'
1080-
| 'gitlens.views.remotes.setSortDescending';
1080+
| 'gitlens.plus.cloudIntegrations.connect';

0 commit comments

Comments
 (0)