Skip to content

Commit 3e428fc

Browse files
committed
Updates SCM menu options
1 parent 397c067 commit 3e428fc

File tree

2 files changed

+43
-19
lines changed

2 files changed

+43
-19
lines changed

contributions.json

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
"order": 2
291291
}
292292
],
293-
"gitlens/scm/title": [
293+
"gitlens/scm/title/ai": [
294294
{
295295
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
296296
"group": "1_gitlens",
@@ -353,7 +353,7 @@
353353
"gitlens.ai.switchProvider:scm": {
354354
"label": "Switch GitLens AI Provider/Model...",
355355
"menus": {
356-
"gitlens/scm/title": [
356+
"gitlens/scm/title/ai": [
357357
{
358358
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
359359
"group": "9_gitlens",
@@ -520,14 +520,14 @@
520520
{
521521
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
522522
"group": "1_gitlens",
523-
"order": 2
523+
"order": 1
524524
}
525525
],
526526
"gitlens/scm/title/ai": [
527527
{
528528
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
529529
"group": "1_gitlens",
530-
"order": 1
530+
"order": 2
531531
}
532532
],
533533
"scm/resourceGroup/context": [
@@ -4078,6 +4078,13 @@
40784078
"icon": "$(gitlens-graph)",
40794079
"commandPalette": "gitlens:enabled",
40804080
"menus": {
4081+
"gitlens/scm/title": [
4082+
{
4083+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
4084+
"group": "8_gitlens",
4085+
"order": 1
4086+
}
4087+
],
40814088
"gitlens/views/grouped/commits": [
40824089
{
40834090
"when": "gitlens:views:scm:grouped:view == commits && !gitlens:plus:disabled",
@@ -16244,6 +16251,13 @@
1624416251
"label": "Visualize Repository History",
1624516252
"icon": "$(graph-scatter)",
1624616253
"menus": {
16254+
"gitlens/scm/title": [
16255+
{
16256+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
16257+
"group": "8_gitlens",
16258+
"order": 2
16259+
}
16260+
],
1624716261
"scm/sourceControl": [
1624816262
{
1624916263
"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scm.visualHistory",
@@ -16725,11 +16739,11 @@
1672516739
},
1672616740
"gitlens/scm/title": {
1672716741
"label": "GitLens",
16728-
"icon": "$(sparkle)",
16742+
"icon": "$(gitlens-gitlens)",
1672916743
"menus": {
1673016744
"scm/title": [
1673116745
{
16732-
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
16746+
"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
1673316747
"group": "navigation",
1673416748
"order": -3
1673516749
}
@@ -16738,11 +16752,11 @@
1673816752
},
1673916753
"gitlens/scm/title/ai": {
1674016754
"label": "GitLens",
16741-
"icon": "$(gitlens-gitlens)",
16755+
"icon": "$(sparkle)",
1674216756
"menus": {
1674316757
"scm/title": [
1674416758
{
16745-
"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
16759+
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1674616760
"group": "navigation",
1674716761
"order": -3
1674816762
}

package.json

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15467,26 +15467,36 @@
1546715467
],
1546815468
"gitlens/scm/title": [
1546915469
{
15470-
"command": "gitlens.ai.generateCommitMessage:scm",
15470+
"command": "gitlens.composeCommits:scm",
1547115471
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
1547215472
"group": "1_gitlens@1"
1547315473
},
1547415474
{
15475-
"command": "gitlens.composeCommits:scm",
15475+
"command": "gitlens.showGraph",
1547615476
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
15477-
"group": "1_gitlens@2"
15477+
"group": "8_gitlens@1"
1547815478
},
1547915479
{
15480-
"command": "gitlens.ai.switchProvider:scm",
15481-
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
15482-
"group": "9_gitlens@1"
15480+
"command": "gitlens.visualizeHistory.repo:scm",
15481+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
15482+
"group": "8_gitlens@2"
1548315483
}
1548415484
],
1548515485
"gitlens/scm/title/ai": [
1548615486
{
15487-
"command": "gitlens.composeCommits:scm",
15487+
"command": "gitlens.ai.generateCommitMessage:scm",
1548815488
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
1548915489
"group": "1_gitlens@1"
15490+
},
15491+
{
15492+
"command": "gitlens.composeCommits:scm",
15493+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
15494+
"group": "1_gitlens@2"
15495+
},
15496+
{
15497+
"command": "gitlens.ai.switchProvider:scm",
15498+
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
15499+
"group": "9_gitlens@1"
1549015500
}
1549115501
],
1549215502
"gitlens/share": [
@@ -17081,12 +17091,12 @@
1708117091
"scm/title": [
1708217092
{
1708317093
"submenu": "gitlens/scm/title",
17084-
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
17094+
"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
1708517095
"group": "navigation@-3"
1708617096
},
1708717097
{
1708817098
"submenu": "gitlens/scm/title/ai",
17089-
"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
17099+
"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1709017100
"group": "navigation@-3"
1709117101
},
1709217102
{
@@ -23796,12 +23806,12 @@
2379623806
{
2379723807
"id": "gitlens/scm/title",
2379823808
"label": "GitLens",
23799-
"icon": "$(sparkle)"
23809+
"icon": "$(gitlens-gitlens)"
2380023810
},
2380123811
{
2380223812
"id": "gitlens/scm/title/ai",
2380323813
"label": "GitLens",
23804-
"icon": "$(gitlens-gitlens)"
23814+
"icon": "$(sparkle)"
2380523815
},
2380623816
{
2380723817
"id": "gitlens/share",

0 commit comments

Comments
 (0)