diff options
| author | Benjamin Streit | 2022-09-16 07:51:19 +0000 |
|---|---|---|
| committer | GitHub | 2022-09-16 07:51:19 +0000 |
| commit | 714db9c66665133e599c6d494b7fb46fcaee1da1 (patch) | |
| tree | 5b1e9e7e102ad7d85850dbc2e0951619445d8706 | |
| parent | 111d2dafd3bbbacff68e1f9f21e4106db560b28f (diff) | |
fix: Improving JSX and TSX indents (#3853)
| -rw-r--r-- | languages.toml | 4 | ||||
| -rw-r--r-- | runtime/queries/jsx/indents.scm | 8 | ||||
| -rw-r--r-- | runtime/queries/tsx/indents.scm | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/languages.toml b/languages.toml index 5e563178..0b46cc49 100644 --- a/languages.toml +++ b/languages.toml @@ -332,7 +332,7 @@ source = { git = "https://github.com/omertuc/tree-sitter-go-work", rev = "6dd9dd name = "javascript" scope = "source.js" injection-regex = "(js|javascript)" -file-types = ["js", "jsx", "mjs", "cjs"] +file-types = ["js", "mjs", "cjs"] shebangs = ["node"] roots = [] comment-token = "//" @@ -363,7 +363,7 @@ injection-regex = "jsx" file-types = ["jsx"] roots = [] comment-token = "//" -language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascript" } +language-server = { command = "typescript-language-server", args = ["--stdio"], language-id = "javascriptreact" } indent = { tab-width = 2, unit = " " } grammar = "javascript" diff --git a/runtime/queries/jsx/indents.scm b/runtime/queries/jsx/indents.scm index 04328f09..6cb82545 100644 --- a/runtime/queries/jsx/indents.scm +++ b/runtime/queries/jsx/indents.scm @@ -1 +1,9 @@ +[ + (jsx_fragment) + (jsx_element) + (jsx_self_closing_element) +] @indent + +(parenthesized_expression) @indent + ; inherits: ecma diff --git a/runtime/queries/tsx/indents.scm b/runtime/queries/tsx/indents.scm index 1b61e36d..07391231 100644 --- a/runtime/queries/tsx/indents.scm +++ b/runtime/queries/tsx/indents.scm @@ -1 +1 @@ -; inherits: typescript +; inherits: typescript,jsx |