Skip to content

[JavaScript] fix tagged template string key bindings regression #4022

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.

Sign up for GitHub

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

Merged
deathaxe merged 7 commits into from
Aug 26, 2024
Merged

[JavaScript] fix tagged template string key bindings regression #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
92520a8
[JavaScript] Adjust tagged template string related key bindings
deathaxe Jul 28, 2024
bd82547
[JavaScript] Add binding to auto-indent content whithin backquotes
deathaxe Jul 29, 2024
9e96a3a
[JavaScript] Adjust context key order
deathaxe Jul 29, 2024
d5e31b3
[JavaScript] Add missing `match_all` attribute to selector context ch…
deathaxe Jul 29, 2024
08f69f2
[JavaScrit] Simplify keybindings' context checks
deathaxe Jul 29, 2024
c6b6fc2
[JavaScript] Fix typo
deathaxe Jul 29, 2024
1a1c9cc
[JavaScript] Tweak enter key binding
deathaxe Aug 6, 2024
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
62 changes: 40 additions & 22 deletions JavaScript/Default.sublime-keymap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,71 @@
// Auto-pair backticks
{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`$0`"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "(source.js, source.ts) - string" },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "source.js - source.js meta.string, source.jsx - source.jsx meta.string, source.ts - source.ts meta.string, source.tsx - source.tsx meta.string", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|>|$)", "match_all": true },
]
},
{ "keys": ["`"], "command": "insert_snippet", "args": {"contents": "`${0:$SELECTION}`"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "(source.js, source.ts) - string" },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "operand": false, "match_all": true },
{ "key": "selector", "operand": "source.js - source.js meta.string, source.jsx - source.jsx meta.string, source.ts - source.ts meta.string, source.tsx - source.tsx meta.string", "match_all": true }
]
},
{ "keys": ["`"], "command": "move", "args": {"by": "characters", "forward": true}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "source.js, source.ts" },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "punctuation.definition.string.begin", "match_all": true },
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js - meta.string.template.js punctuation.definition.string.begin", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
]
},
{ "keys": ["backspace"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Delete Left Right.sublime-macro"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "string.quoted.other.js" },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js - meta.string.template.js punctuation.definition.string.begin", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true },
{ "key": "selector", "operator": "not_equal", "operand": "punctuation.definition.string.begin", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
]
},

// Add indented line in backticks
{ "keys": ["enter"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Add Line in Braces.sublime-macro"}, "context":
[
{ "key": "setting.auto_indent" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
]
},
{ "keys": ["keypad_enter"], "command": "run_macro_file", "args": {"file": "res://Packages/Default/Add Line in Braces.sublime-macro"}, "context":
[
{ "key": "setting.auto_indent" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "`$", "match_all": true },
{ "key": "following_text", "operator": "regex_contains", "operand": "^`", "match_all": true }
]
},

// Auto-pair interpolation
{ "keys": ["{"], "command": "insert_snippet", "args": {"contents": "{$0}"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "string.quoted.other.js", "match_all": true },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js", "match_all": true },
{ "key": "preceding_text", "operator": "regex_contains", "operand": "\\$$", "match_all": true }
]
},
{ "keys": ["$"], "command": "insert_snippet", "args": {"contents": "\\${${0:$SELECTION}}"}, "context":
[
{ "key": "selector", "operator": "equal", "operand": "string.quoted.other.js", "match_all": true },
{ "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
{ "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true }
{ "key": "setting.auto_match_enabled" },
{ "key": "selection_empty", "operand": false, "match_all": true },
{ "key": "selector", "operand": "meta.string.template.js", "match_all": true }
]
},
]
30 changes: 15 additions & 15 deletions JavaScript/JavaScript.sublime-syntax
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,62 +1238,62 @@ contexts:
- match: (css)\s*((\`){{trailing_wspace}}?)
captures:
1: variable.function.tagged-template.js
2: meta.string.js string.quoted.other.js
2: meta.string.template.js string.quoted.other.js
3: punctuation.definition.string.begin.js
embed: scope:source.css.js-template
embed_scope: meta.string.js source.css.embedded.js
embed_scope: meta.string.template.js source.css.embedded.js
escape: '{{leading_wspace}}?(\`)'
escape_captures:
0: meta.string.js string.quoted.other.js
0: meta.string.template.js string.quoted.other.js
1: punctuation.definition.string.end.js
pop: 1
- match: (html)\s*((\`){{trailing_wspace}}?)
captures:
1: variable.function.tagged-template.js
2: meta.string.js string.quoted.other.js
2: meta.string.template.js string.quoted.other.js
3: punctuation.definition.string.begin.js
embed: scope:text.html.js-template
embed_scope: meta.string.js text.html.embedded.js
embed_scope: meta.string.template.js text.html.embedded.js
escape: '{{leading_wspace}}?(\`)'
escape_captures:
0: meta.string.js string.quoted.other.js
0: meta.string.template.js string.quoted.other.js
1: punctuation.definition.string.end.js
pop: 1
- match: (js)\s*((\`){{trailing_wspace}}?)
captures:
1: variable.function.tagged-template.js
2: meta.string.js string.quoted.other.js
2: meta.string.template.js string.quoted.other.js
3: punctuation.definition.string.begin.js
embed: scope:source.js.js-template
embed_scope: meta.string.js source.js.embedded.js
embed_scope: meta.string.template.js source.js.embedded.js
escape: '{{leading_wspace}}?(\`)'
escape_captures:
0: meta.string.js string.quoted.other.js
0: meta.string.template.js string.quoted.other.js
1: punctuation.definition.string.end.js
pop: 1
- match: (json)\s*((\`){{trailing_wspace}}?)
captures:
1: variable.function.tagged-template.js
2: meta.string.js string.quoted.other.js
2: meta.string.template.js string.quoted.other.js
3: punctuation.definition.string.begin.js
embed: scope:source.json.js-template
embed_scope: meta.string.js source.json.embedded.js
embed_scope: meta.string.template.js source.json.embedded.js
escape: '{{leading_wspace}}?(\`)'
escape_captures:
0: meta.string.js string.quoted.other.js
0: meta.string.template.js string.quoted.other.js
1: punctuation.definition.string.end.js
pop: 1
- match: (?:({{identifier_name}})\s*)?(\`)
captures:
1: variable.function.tagged-template.js
2: meta.string.js string.quoted.other.js punctuation.definition.string.begin.js
2: meta.string.template.js string.quoted.other.js punctuation.definition.string.begin.js
set: literal-string-template-content

literal-string-template-content:
- meta_include_prototype: false
- meta_content_scope: meta.string.js string.quoted.other.js
- meta_content_scope: meta.string.template.js string.quoted.other.js
- match: \`
scope: meta.string.js string.quoted.other.js punctuation.definition.string.end.js
scope: meta.string.template.js string.quoted.other.js punctuation.definition.string.end.js
pop: 1
- include: string-interpolations
- include: string-content
Expand Down
Loading