Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add action IDs to the color selection commands #17821

Merged
merged 1 commit into from
Aug 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 80 additions & 40 deletions src/cascadia/TerminalSettingsModel/enableColorSelection.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,79 +8,89 @@
"action": "experimental.colorSelection"
// default fg and bg (i07 and i00)
},
"keys": "alt+1"
"keys": "alt+1",
"id": "Terminal.ColorSelectionDefaultFgAndBg"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i08"
},
"keys": "alt+2"
"keys": "alt+2",
"id": "Terminal.ColorSelectionFgIndex8"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0c"
},
"keys": "alt+3"
"keys": "alt+3",
"id": "Terminal.ColorSelectionFgIndex12"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0a"
},
"keys": "alt+4"
"keys": "alt+4",
"id": "Terminal.ColorSelectionFgIndex10"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0e"
},
"keys": "alt+5"
"keys": "alt+5",
"id": "Terminal.ColorSelectionFgIndex14"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i09"
},
"keys": "alt+6"
"keys": "alt+6",
"id": "Terminal.ColorSelectionFgIndex9"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0d"
},
"keys": "alt+7"
"keys": "alt+7",
"id": "Terminal.ColorSelectionFgIndex13"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0b"
},
"keys": "alt+8"
"keys": "alt+8",
"id": "Terminal.ColorSelectionFgIndex11"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i0f"
},
"keys": "alt+9"
"keys": "alt+9",
"id": "Terminal.ColorSelectionFgIndex15"
},
{
"command":
{
"action": "experimental.colorSelection",
"foreground": "i03"
},
"keys": "alt+0"
"keys": "alt+0",
"id": "Terminal.ColorSelectionFgIndex3"
},
// background
{
Expand All @@ -90,7 +100,8 @@
"foreground": "i00",
"background": "i07"
},
"keys": "ctrl+1"
"keys": "ctrl+1",
"id": "Terminal.ColorSelectionBgIndex7"
},
{
"command":
Expand All @@ -99,7 +110,8 @@
"foreground": "i00",
"background": "i08"
},
"keys": "ctrl+2"
"keys": "ctrl+2",
"id": "Terminal.ColorSelectionBgIndex8"
},
{
"command":
Expand All @@ -108,7 +120,8 @@
"foreground": "i00",
"background": "i0c"
},
"keys": "ctrl+3"
"keys": "ctrl+3",
"id": "Terminal.ColorSelectionBgIndex12"
},
{
"command":
Expand All @@ -117,7 +130,8 @@
"foreground": "i00",
"background": "i0a"
},
"keys": "ctrl+4"
"keys": "ctrl+4",
"id": "Terminal.ColorSelectionBgIndex10"
},
{
"command":
Expand All @@ -126,7 +140,8 @@
"foreground": "i00",
"background": "i0e"
},
"keys": "ctrl+5"
"keys": "ctrl+5",
"id": "Terminal.ColorSelectionBgIndex14"
},
{
"command":
Expand All @@ -135,7 +150,8 @@
"foreground": "i00",
"background": "i09"
},
"keys": "ctrl+6"
"keys": "ctrl+6",
"id": "Terminal.ColorSelectionBgIndex9"
},
{
"command":
Expand All @@ -144,7 +160,8 @@
"foreground": "i00",
"background": "i0d"
},
"keys": "ctrl+7"
"keys": "ctrl+7",
"id": "Terminal.ColorSelectionBgIndex13"
},
{
"command":
Expand All @@ -153,7 +170,8 @@
"foreground": "i00",
"background": "i0b"
},
"keys": "ctrl+8"
"keys": "ctrl+8",
"id": "Terminal.ColorSelectionBgIndex11"
},
{
"command":
Expand All @@ -162,7 +180,8 @@
"foreground": "i00",
"background": "i0f"
},
"keys": "ctrl+9"
"keys": "ctrl+9",
"id": "Terminal.ColorSelectionBgIndex15"
},
{
"command":
Expand All @@ -171,7 +190,8 @@
"foreground": "i00",
"background": "i03"
},
"keys": "ctrl+0"
"keys": "ctrl+0",
"id": "Terminal.ColorSelectionBgIndex3"
},
// with matching
// Foreground, all matches
Expand All @@ -182,7 +202,8 @@
"matchMode": "all",
// default fg and bg (i07 and i00)
},
"keys": "alt+shift+1"
"keys": "alt+shift+1",
"id": "Terminal.ColorSelectionMatchDefaultFgAndBg"
},
{
"command":
Expand All @@ -191,7 +212,8 @@
"matchMode": "all",
"foreground": "i08"
},
"keys": "alt+shift+2"
"keys": "alt+shift+2",
"id": "Terminal.ColorSelectionMatchFgIndex8"
},
{
"command":
Expand All @@ -200,7 +222,8 @@
"matchMode": "all",
"foreground": "i0c"
},
"keys": "alt+shift+3"
"keys": "alt+shift+3",
"id": "Terminal.ColorSelectionMatchFgIndex12"
},
{
"command":
Expand All @@ -209,7 +232,8 @@
"matchMode": "all",
"foreground": "i0a"
},
"keys": "alt+shift+4"
"keys": "alt+shift+4",
"id": "Terminal.ColorSelectionMatchFgIndex10"
},
{
"command":
Expand All @@ -218,7 +242,8 @@
"matchMode": "all",
"foreground": "i0e"
},
"keys": "alt+shift+5"
"keys": "alt+shift+5",
"id": "Terminal.ColorSelectionMatchFgIndex14"
},
{
"command":
Expand All @@ -227,7 +252,8 @@
"matchMode": "all",
"foreground": "i09"
},
"keys": "alt+shift+6"
"keys": "alt+shift+6",
"id": "Terminal.ColorSelectionMatchFgIndex9"
},
{
"command":
Expand All @@ -236,7 +262,8 @@
"matchMode": "all",
"foreground": "i0d"
},
"keys": "alt+shift+7"
"keys": "alt+shift+7",
"id": "Terminal.ColorSelectionMatchFgIndex13"
},
{
"command":
Expand All @@ -245,7 +272,8 @@
"matchMode": "all",
"foreground": "i0b"
},
"keys": "alt+shift+8"
"keys": "alt+shift+8",
"id": "Terminal.ColorSelectionMatchFgIndex11"
},
{
"command":
Expand All @@ -254,7 +282,8 @@
"matchMode": "all",
"foreground": "i0f"
},
"keys": "alt+shift+9"
"keys": "alt+shift+9",
"id": "Terminal.ColorSelectionMatchFgIndex15"
},
{
"command":
Expand All @@ -263,7 +292,8 @@
"matchMode": "all",
"foreground": "i03"
},
"keys": "alt+shift+0"
"keys": "alt+shift+0",
"id": "Terminal.ColorSelectionMatchFgIndex3"
},
// background, all matches
{
Expand All @@ -274,7 +304,8 @@
"foreground": "i00",
"background": "i07"
},
"keys": "ctrl+shift+1"
"keys": "ctrl+shift+1",
"id": "Terminal.ColorSelectionMatchBgIndex7"
},
{
"command":
Expand All @@ -284,7 +315,8 @@
"foreground": "i00",
"background": "i08"
},
"keys": "ctrl+shift+2"
"keys": "ctrl+shift+2",
"id": "Terminal.ColorSelectionMatchBgIndex8"
},
{
"command":
Expand All @@ -294,7 +326,8 @@
"foreground": "i00",
"background": "i0c"
},
"keys": "ctrl+shift+3"
"keys": "ctrl+shift+3",
"id": "Terminal.ColorSelectionMatchBgIndex12"
},
{
"command":
Expand All @@ -304,7 +337,8 @@
"foreground": "i00",
"background": "i0a"
},
"keys": "ctrl+shift+4"
"keys": "ctrl+shift+4",
"id": "Terminal.ColorSelectionMatchBgIndex10"
},
{
"command":
Expand All @@ -314,7 +348,8 @@
"foreground": "i00",
"background": "i0e"
},
"keys": "ctrl+shift+5"
"keys": "ctrl+shift+5",
"id": "Terminal.ColorSelectionMatchBgIndex14"
},
{
"command":
Expand All @@ -324,7 +359,8 @@
"foreground": "i00",
"background": "i09"
},
"keys": "ctrl+shift+6"
"keys": "ctrl+shift+6",
"id": "Terminal.ColorSelectionMatchBgIndex9"
},
{
"command":
Expand All @@ -334,7 +370,8 @@
"foreground": "i00",
"background": "i0d"
},
"keys": "ctrl+shift+7"
"keys": "ctrl+shift+7",
"id": "Terminal.ColorSelectionMatchBgIndex13"
},
{
"command":
Expand All @@ -344,7 +381,8 @@
"foreground": "i00",
"background": "i0b"
},
"keys": "ctrl+shift+8"
"keys": "ctrl+shift+8",
"id": "Terminal.ColorSelectionMatchBgIndex11"
},
{
"command":
Expand All @@ -354,7 +392,8 @@
"foreground": "i00",
"background": "i0f"
},
"keys": "ctrl+shift+9"
"keys": "ctrl+shift+9",
"id": "Terminal.ColorSelectionMatchBgIndex15"
},
{
"command":
Expand All @@ -364,7 +403,8 @@
"foreground": "i00",
"background": "i03"
},
"keys": "ctrl+shift+0"
"keys": "ctrl+shift+0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, does having keys, command and id in the same settings file -- even though it is a SYSTEM settings file -- result in us changing the user's keys list? (e.g. do we accidentally up-convert these key/command/id triples into key/id and action/id pairs?)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We do convert these into key/id and action/id pairs in our internal maps, but they're still in the InBox layer so they don't show up in the user's settings file

"id": "Terminal.ColorSelectionMatchBgIndex3"
}
]
}
Loading