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.

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

Syntax and language configuration fixes and improvements #286

Merged
merged 13 commits into from
May 20, 2022
Merged

Syntax and language configuration fixes and improvements #286

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7c1629
Fix expressions block not having TSX-like highlight on the brackets
Princesseuh May 16, 2022
6dcdef4
Add template literal to surroundingPairs
Princesseuh May 16, 2022
fc51b20
Add grammar test suite
Princesseuh May 16, 2022
cbe581b
Add README to test directory, add tests for style tags
Princesseuh May 17, 2022
3641423
Add support for `is:raw`, maybe?
Princesseuh May 17, 2022
f2198d0
Add is:raw for script and style tags, add support for script tags wit…
Princesseuh May 17, 2022
d94764b
Fix missing dummies, use source.unknown for `is:raw`
Princesseuh May 17, 2022
0e770dd
Add auto indent support, add wordPattern regex
Princesseuh May 20, 2022
f08c276
Add support for more JS-like types, inspired by compiler's TSX
Princesseuh May 20, 2022
ebe92b7
Add spaces in comment completions
Princesseuh May 20, 2022
8fe025a
Add support for is:raw components
Princesseuh May 20, 2022
04d3d62
Add changeset
Princesseuh May 20, 2022
1154e1e
Remove is:raw on script tags and style tags since it doesn't do anyth…
Princesseuh May 20, 2022
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
37 changes: 34 additions & 3 deletions packages/vscode/languages/astro-language-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"brackets": [
["<!--", "-->"],
["<", ">"],
["{", "}"],
["(", ")"]
Copy link
Member Author

@Princesseuh Princesseuh May 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

There's no cases where you want parenthesizes to count as brackets in the source.astro scope, in contexts where they do matter (ex: source.ts, source.js, source.tsx) the languages used there will add them as brackets

["{", "}"]
],
"autoClosingPairs": [
{ "open": "{", "close": "}" },
Expand All @@ -15,8 +14,9 @@
{ "open": "'", "close": "'" },
{ "open": "\"", "close": "\"" },
{ "open": "`", "close": "`" },
{ "open": "{/*", "close": "*/}", "notIn": ["comment", "string"] },
{ "open": "<!--", "close": "-->", "notIn": ["comment", "string"] },
{ "open": "/**", "close": " */", "notIn": ["string"] }
{ "open": "/**", "close": " */", "notIn": ["string", "comment"] }
],
"autoCloseBefore": ";:.,=}])>` \n\t",
"surroundingPairs": [
Expand All @@ -33,5 +33,36 @@
"start": "^\\s*<!--\\s*#region\\b.*-->",
"end": "^\\s*<!--\\s*#endregion\\b.*-->"
}
},
"wordPattern": {
"pattern": "([^\\-\\s]+-[^\\-\\s]+)|(-?\\d*\\.\\d\\w*)|([^\\`\\~\\-\\!\\@\\$\\^\\&\\*\\(\\)\\=\\+\\[\\{\\]\\}\\\\\\|\\;\\:'\"\\,\\.\\<\\>\\/\\s]+)"
},
"onEnterRules": [
{
"beforeText": {
"pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w\\-.\\d]*)([^/>]*(?!/)>)[^<]*$",
"flags": "i"
},
"afterText": {
"pattern": "^<\\/([_:\\w][_:\\w-.\\d]*)\\s*>$",
"flags": "i"
},
"action": {
"indent": "indentOutdent"
}
},
{
"beforeText": {
"pattern": "<(?!(?:area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr))([_:\\w][_:\\w\\-.\\d]*)([^/>]*(?!/)>)[^<]*$",
"flags": "i"
},
"action": {
"indent": "indent"
}
}
],
"indentationRules": {
"increaseIndentPattern": "<(?!\\?|(?:area|base|br|col|frame|hr|html|img|input|keygen|link|menuitem|meta|param|source|track|wbr)\\b|[^>]*\\/>)([-_\\.A-Za-z0-9]+)(?=\\s|>)\\b[^>]*>(?!.*<\\/\\1>)|<!--(?!.*-->)|\\{[^}\"']*$",
"decreaseIndentPattern": "^\\s*(<\\/(?!html)[-_\\.A-Za-z0-9]+\\b[^>]*>|-->|\\})"
}
Comment on lines +64 to 67
Copy link
Member

Choose a reason for hiding this comment

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

Wow, this will be great! Nice job ☺️

}