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

replace new lsp for vlang #7760

Merged
merged 6 commits into from
Jul 30, 2023
Merged

replace new lsp for vlang #7760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b4da44
fix vlang grammar fetch and build fail
lydiandy Jul 27, 2023
0440c24
update highlights.scm for v-analyzer
lydiandy Jul 27, 2023
9ea7946
Update languages.toml
lydiandy Jul 28, 2023
220cf7b
Update runtime/queries/v/highlights.scm
lydiandy Jul 28, 2023
6dba4da
update scm for new lsp
lydiandy Jul 29, 2023
d202c9f
gen doc lang-support.md
lydiandy Jul 29, 2023
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
2 changes: 1 addition & 1 deletion book/src/generated/lang-support.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
| ungrammar | ✓ | | | |
| uxntal | ✓ | | | |
| v | ✓ | ✓ | ✓ | `v` |
| v | ✓ | ✓ | ✓ | `v-analyzer` |
| vala | ✓ | | | `vala-language-server` |
| verilog | ✓ | ✓ | | `svlangserver` |
| vhdl | ✓ | | | `vhdl_ls` |
Expand Down
4 changes: 2 additions & 2 deletions languages.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ terraform-ls = { command = "terraform-ls", args = ["serve"] }
texlab = { command = "texlab" }
vala-language-server = { command = "vala-language-server" }
vhdl_ls = { command = "vhdl_ls", args = [] }
vlang-language-server = { command = "v", args = ["ls"] }
vlang-language-server = { command = "v-analyzer" }
vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { "provideFormatter" = true }}
vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true } }
Expand Down Expand Up @@ -1826,7 +1826,7 @@ indent = { tab-width = 4, unit = "\t" }

[[grammar]]
name = "v"
source = { git = "https://github.com/vlang/vls", subpath = "tree_sitter_v", rev = "66cf9d3086fb5ecc827cb32c64c5d812ab17d2c6" }
source = {git = "https://github.com/v-analyzer/v-analyzer", subpath = "tree_sitter_v", rev = "e14fdf6e661b10edccc744102e4ccf0b187aa8ad"}

[[language]]
name = "verilog"
Expand Down
136 changes: 85 additions & 51 deletions runtime/queries/v/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +1,112 @@
(comment) @comment

(module_clause
(identifier) @namespace)

(import_path
(import_name) @namespace)

(import_alias
(import_name) @namespace)

(enum_fetch
(reference_expression) @constant)

(enum_field_definition
(identifier) @constant)

(global_var_definition
(identifier) @constant)

(compile_time_if_expression
condition: (reference_expression) @constant)

(compile_time_if_expression
condition: (binary_expression
left: (reference_expression) @constant
right: (reference_expression) @constant))

(compile_time_if_expression
condition: (binary_expression
left: (reference_expression) @constant
right: (unary_expression (reference_expression) @constant)))

(label_reference) @label

(parameter_declaration
name: (identifier) @variable.parameter)
name: (identifier) @variable.parameter)
(receiver
name: (identifier) @variable.parameter)
(function_declaration
name: (identifier) @function)
name: (identifier) @function)
(function_declaration
receiver: (parameter_list)
name: (identifier) @function.method)
receiver: (receiver)
name: (identifier) @function.method)
(interface_method_definition
name: (identifier) @function.method)

(call_expression
function: (identifier) @function)
(call_expression
function: (selector_expression
field: (identifier) @function.method))
name: (selector_expression
field: (reference_expression) @function.method))

(field_identifier) @variable.other.member
(selector_expression
operand: (identifier) @variable
field: (identifier) @variable.other.member)
(call_expression
name: (reference_expression) @function)

(int_literal) @constant.numeric.integer
(struct_declaration
name: (identifier) @type)

(attribute_declaration) @attribute
(comment) @comment
[
(c_string_literal)
(raw_string_literal)
(interpreted_string_literal)
(string_interpolation)
(rune_literal)
] @string
(enum_declaration
name: (identifier) @type)

(escape_sequence) @constant.character.escape
(interface_declaration
name: (identifier) @type)

[
(pointer_type)
(array_type)
] @type
(type_declaration
name: (identifier) @type)

(const_spec name: (identifier) @constant)
(global_var_type_initializer name: (identifier) @constant)
(global_var_spec name: (identifier) @constant)
((identifier) @constant (#match? @constant "^[A-Z][A-Z\\d_]*$"))
(struct_field_declaration
name: (identifier) @variable.other.member)

(field_name) @variable.other.member

[
(generic_type)
(type_identifier)
] @constructor
(selector_expression
field: (reference_expression) @variable.other.member)

(builtin_type) @type.builtin
(int_literal) @constant.numeric.integer
(escape_sequence) @constant.character.escape

[
(true)
(false)
] @constant.builtin.boolean
(c_string_literal)
(raw_string_literal)
(interpreted_string_literal)
(string_interpolation)
(rune_literal)
] @string

(string_interpolation
(braced_interpolation_opening) @punctuation.bracket
(interpolated_expression) @embedded
(braced_interpolation_closing) @punctuation.bracket)

[
(module_identifier)
(import_path)
] @namespace
(attribute) @attribute

[
(pseudo_comptime_identifier)
(label_name)
] @label
(type_reference_expression)
] @type

[
(identifier)
] @variable

(true)
(false)
] @constant.builtin.boolean

[
"pub"
"assert"
"go"
"asm"
"defer"
"unsafe"
"sql"
(nil)
(none)
] @keyword

Expand Down Expand Up @@ -105,12 +134,17 @@
"lock"
"rlock"
"spawn"
"break"
"continue"
"go"
] @keyword.control

[
"if"
"$if"
"select"
"else"
"$else"
"match"
] @keyword.control.conditional

Expand Down Expand Up @@ -155,7 +189,7 @@
"]"
] @punctuation.bracket

(array) @punctuation.bracket
(array_creation) @punctuation.bracket

[
"++"
Expand Down
5 changes: 2 additions & 3 deletions runtime/queries/v/indents.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
(function_declaration)
(if_expression)
(match_expression)
(expression_case)
(default_case)
(for_statement)
(unsafe_expression)
(short_var_declaration)
(var_declaration)
(const_declaration)
] @indent

[
Expand Down
6 changes: 3 additions & 3 deletions runtime/queries/v/textobjects.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
body: (block)? @test.inside) @test.around
(#match? @_name "^test"))

(fn_literal
(function_literal
body: (block)? @function.inside) @function.around

(parameter_list
Expand All @@ -17,9 +17,9 @@
((_) @parameter.inside) @parameter.around))

(struct_declaration
(struct_field_declaration_list) @class.inside) @class.around
(struct_field_declaration) @class.inside) @class.around

(struct_field_declaration_list
(struct_field_declaration
((_) @parameter.inside) @parameter.around)

(comment) @comment.inside
Expand Down