Skip to content

Commit af42f6c

Browse files
Reorders pull request marker options in commit graph
1 parent 3e475a1 commit af42f6c

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16329,33 +16329,33 @@
1632916329
"group": "4_settings@2"
1633016330
},
1633116331
{
16332-
"command": "gitlens.graph.scrollMarkerStashOn",
16333-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:stashes:disabled\\b/",
16332+
"command": "gitlens.graph.scrollMarkerPullRequestOn",
16333+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:pullRequests:disabled\\b/",
1633416334
"group": "4_settings@3"
1633516335
},
1633616336
{
16337-
"command": "gitlens.graph.scrollMarkerStashOff",
16338-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:stashes:enabled\\b/",
16337+
"command": "gitlens.graph.scrollMarkerPullRequestOff",
16338+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:pullRequests:enabled\\b/",
1633916339
"group": "4_settings@3"
1634016340
},
1634116341
{
16342-
"command": "gitlens.graph.scrollMarkerTagOn",
16343-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:tags:disabled\\b/",
16342+
"command": "gitlens.graph.scrollMarkerStashOn",
16343+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:stashes:disabled\\b/",
1634416344
"group": "4_settings@4"
1634516345
},
1634616346
{
16347-
"command": "gitlens.graph.scrollMarkerTagOff",
16348-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:tags:enabled\\b/",
16347+
"command": "gitlens.graph.scrollMarkerStashOff",
16348+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:stashes:enabled\\b/",
1634916349
"group": "4_settings@4"
1635016350
},
1635116351
{
16352-
"command": "gitlens.graph.scrollMarkerPullRequestOn",
16353-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:pullRequests:disabled\\b/",
16352+
"command": "gitlens.graph.scrollMarkerTagOn",
16353+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:tags:disabled\\b/",
1635416354
"group": "4_settings@5"
1635516355
},
1635616356
{
16357-
"command": "gitlens.graph.scrollMarkerPullRequestOff",
16358-
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:pullRequests:enabled\\b/",
16357+
"command": "gitlens.graph.scrollMarkerTagOff",
16358+
"when": "webviewItem =~ /gitlens:graph:settings\\b/ && webviewItemValue =~ /\\bscrollMarker:tags:enabled\\b/",
1635916359
"group": "4_settings@5"
1636016360
}
1636116361
],

src/webviews/apps/plus/graph/GraphWrapper.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,45 +1440,45 @@ export function GraphWrapper({
14401440
</MenuItem>
14411441
<MenuItem role="none">
14421442
<VSCodeCheckbox
1443-
value="stashes"
1443+
value="pullRequests"
14441444
onChange={handleOnMinimapAdditionalTypesChange}
14451445
defaultChecked={
1446-
graphConfig?.minimapMarkerTypes?.includes('stashes') ?? false
1446+
graphConfig?.minimapMarkerTypes?.includes('pullRequests') ??
1447+
true
14471448
}
14481449
>
14491450
<span
14501451
className="minimap-marker-swatch"
1451-
data-marker="stashes"
1452+
data-marker="pullRequests"
14521453
></span>
1453-
Stashes
1454+
Pull Requests
14541455
</VSCodeCheckbox>
14551456
</MenuItem>
14561457
<MenuItem role="none">
14571458
<VSCodeCheckbox
1458-
value="tags"
1459+
value="stashes"
14591460
onChange={handleOnMinimapAdditionalTypesChange}
14601461
defaultChecked={
1461-
graphConfig?.minimapMarkerTypes?.includes('tags') ?? true
1462+
graphConfig?.minimapMarkerTypes?.includes('stashes') ?? false
14621463
}
14631464
>
1464-
<span className="minimap-marker-swatch" data-marker="tags"></span>
1465-
Tags
1465+
<span
1466+
className="minimap-marker-swatch"
1467+
data-marker="stashes"
1468+
></span>
1469+
Stashes
14661470
</VSCodeCheckbox>
14671471
</MenuItem>
14681472
<MenuItem role="none">
14691473
<VSCodeCheckbox
1470-
value="pullRequests"
1474+
value="tags"
14711475
onChange={handleOnMinimapAdditionalTypesChange}
14721476
defaultChecked={
1473-
graphConfig?.minimapMarkerTypes?.includes('pullRequests') ??
1474-
true
1477+
graphConfig?.minimapMarkerTypes?.includes('tags') ?? true
14751478
}
14761479
>
1477-
<span
1478-
className="minimap-marker-swatch"
1479-
data-marker="pullRequests"
1480-
></span>
1481-
Pull Requests
1480+
<span className="minimap-marker-swatch" data-marker="tags"></span>
1481+
Tags
14821482
</VSCodeCheckbox>
14831483
</MenuItem>
14841484
</MenuList>

0 commit comments

Comments
 (0)