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

Jump to bottom

Add textobject for javascript #3213

Merged
merged 7 commits into from
Jul 28, 2022
Merged

Add textobject for javascript #3213

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e160db4
Add textobject for javascript
erasin Jul 27, 2022
835d38a
Fix function && class
erasin Jul 27, 2022
a7d0b7f
js textobject function and class fix some
erasin Jul 27, 2022
3a8d44a
fix js statement_block , and add ts interface/type as class
erasin Jul 28, 2022
f8e123b
mark function.inside for js
erasin Jul 28, 2022
4a2b560
format ts
erasin Jul 28, 2022
28f0527
add class.inside for typescript
erasin Jul 28, 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
8 changes: 4 additions & 4 deletions book/src/generated/lang-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
| idris | | | | `idris2-lsp` |
| iex | ✓ | | | |
| java | ✓ | | | `jdtls` |
| javascript | ✓ | | ✓ | `typescript-language-server` |
| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
| jsdoc | ✓ | | | |
| json | ✓ | | ✓ | `vscode-json-language-server` |
| jsx | ✓ | | ✓ | `typescript-language-server` |
| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
| julia | ✓ | | | `julia` |
| kotlin | ✓ | | | `kotlin-language-server` |
| latex | ✓ | | | `texlab` |
Expand Down Expand Up @@ -97,9 +97,9 @@
| tfvars | | | | `terraform-ls` |
| toml | ✓ | | | `taplo` |
| tsq | ✓ | | | |
| tsx | ✓ | | | `typescript-language-server` |
| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
| twig | ✓ | | | |
| typescript | ✓ | | ✓ | `typescript-language-server` |
| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
| ungrammar | ✓ | | | |
| v | ✓ | | | `vls` |
| vala | ✓ | | | `vala-language-server` |
Expand Down
36 changes: 36 additions & 0 deletions runtime/queries/javascript/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
(function_declaration
body: (statement_block)) @function.around

(function
body: (statement_block)) @function.around

(export_statement
declaration: (function_declaration) @function.around)
the-mikedavis marked this conversation as resolved.
Show resolved Hide resolved

(arrow_function
body: (statement_block)) @function.around
the-mikedavis marked this conversation as resolved.
Show resolved Hide resolved

(method_definition
body: (statement_block)) @function.around

(generator_function_declaration
body: (_) @function.inside) @function.around

(class_declaration
body: (class_body) @class.inside) @class.around

(class
(class_body) @class.inside) @class.around

(export_statement
declaration: (class_declaration) @class.around)

(formal_parameters
((_) @parameter.inside . ","? @parameter.around) @parameter.around)

(arguments
((_) @parameter.inside . ","? @parameter.around) @parameter.around)

(comment) @comment.inside

(comment)+ @comment.around
1 change: 1 addition & 0 deletions runtime/queries/jsx/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; inherits: javascript
1 change: 1 addition & 0 deletions runtime/queries/tsx/indents.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; inherits: typescript
1 change: 1 addition & 0 deletions runtime/queries/tsx/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; inherits: typescript,jsx
1 change: 1 addition & 0 deletions runtime/queries/typescript/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
; inherits: javascript