diff --git a/install.vsh b/install.vsh index a8b8bf63..75c9b539 100644 --- a/install.vsh +++ b/install.vsh @@ -490,7 +490,7 @@ mut cmd := cli.Command{ release_type := get_release_type(cmd) install(no_interaction, release_type)! } - flags: [ + flags: [ cli.Flag{ flag: .bool name: 'no-interaction' // Used primarily for VS Code extension, to install v-analyzer from sources @@ -508,7 +508,7 @@ cmd.add_command(cli.Command{ release_type := get_release_type(cmd) update(nightly, release_type)! } - flags: [ + flags: [ cli.Flag{ flag: .bool name: 'nightly' diff --git a/src/analyzer/index/IndexDeserializer.v b/src/analyzer/index/IndexDeserializer.v index ae14506d..e5c0e65a 100644 --- a/src/analyzer/index/IndexDeserializer.v +++ b/src/analyzer/index/IndexDeserializer.v @@ -167,15 +167,15 @@ pub fn (mut d IndexDeserializer) deserialize_stub() &psi.StubBase { end_line: identifier_end_line end_column: identifier_end_column } - text_range: psi.TextRange{ + text_range: psi.TextRange{ line: line column: column end_line: end_line end_column: end_column } - parent_id: parent_id - stub_list: unsafe { nil } // will be set later - stub_type: stub_type - id: id + parent_id: parent_id + stub_list: unsafe { nil } // will be set later + stub_type: stub_type + id: id } } diff --git a/src/analyzer/index/IndexingRoot.v b/src/analyzer/index/IndexingRoot.v index d295d96c..6bc8a131 100644 --- a/src/analyzer/index/IndexingRoot.v +++ b/src/analyzer/index/IndexingRoot.v @@ -191,7 +191,7 @@ pub fn (mut i IndexingRoot) index_file(path string, content string) !FileIndex { kind: unsafe { psi.StubIndexLocationKind(u8(i.kind)) } stub_list: unsafe { nil } } - stub_list: unsafe { nil } + stub_list: unsafe { nil } } stub_tree := build_stub_tree(psi_file, i.root) diff --git a/src/bytes/serialization_test.v b/src/bytes/serialization_test.v index 8d335063..24363222 100644 --- a/src/bytes/serialization_test.v +++ b/src/bytes/serialization_test.v @@ -34,11 +34,11 @@ fn test_serialize_deserialize_stub_element() { end_line: 3 end_column: 4 } - stub_type: .function_declaration - id: 123456 - text: 'some text with spaces' - comment: '// comment data' - receiver: 'Foo' + stub_type: .function_declaration + id: 123456 + text: 'some text with spaces' + comment: '// comment data' + receiver: 'Foo' } serialize_stub_element(mut s, data) diff --git a/src/jsonrpc/server.v b/src/jsonrpc/server.v index 8891de66..e0f14230 100644 --- a/src/jsonrpc/server.v +++ b/src/jsonrpc/server.v @@ -139,7 +139,7 @@ pub fn (s &Server) writer(cfg NewWriterConfig) &ResponseWriter { }, ] } - sb: if cfg.own_buffer { s.res_buf.clone() } else { s.res_buf } + sb: if cfg.own_buffer { s.res_buf.clone() } else { s.res_buf } } } diff --git a/src/server/code_lens/CodeLensVisitor.v b/src/server/code_lens/CodeLensVisitor.v index d5d660ae..a584f990 100644 --- a/src/server/code_lens/CodeLensVisitor.v +++ b/src/server/code_lens/CodeLensVisitor.v @@ -192,7 +192,7 @@ pub fn (mut v CodeLensVisitor) add_lens(node psi.AstNode, cmd lsp.Command) { character: int(start_point.column) } v.result << lsp.CodeLens{ - range: lsp.Range{ + range: lsp.Range{ start: start end: start } diff --git a/src/server/completion/providers/ReferenceCompletionProcessor.v b/src/server/completion/providers/ReferenceCompletionProcessor.v index 04e6c85b..ceb08687 100644 --- a/src/server/completion/providers/ReferenceCompletionProcessor.v +++ b/src/server/completion/providers/ReferenceCompletionProcessor.v @@ -45,10 +45,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { if element is psi.VarDefinition { c.add_item( - label: name - kind: .variable - detail: element.get_type().readable_name() - label_details: lsp.CompletionItemLabelDetails{ + label: name + kind: .variable + detail: element.get_type().readable_name() + label_details: lsp.CompletionItemLabelDetails{ description: element.get_type().readable_name() } documentation: '' @@ -60,10 +60,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { if element is psi.ParameterDeclaration { c.add_item( - label: name - kind: .variable - detail: element.get_type().readable_name() - label_details: lsp.CompletionItemLabelDetails{ + label: name + kind: .variable + detail: element.get_type().readable_name() + label_details: lsp.CompletionItemLabelDetails{ description: element.get_type().readable_name() } documentation: '' @@ -75,10 +75,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { if element is psi.Receiver { c.add_item( - label: element.name() - kind: .variable - detail: element.get_type().readable_name() - label_details: lsp.CompletionItemLabelDetails{ + label: element.name() + kind: .variable + detail: element.get_type().readable_name() + label_details: lsp.CompletionItemLabelDetails{ description: element.get_type().readable_name() } documentation: '' @@ -134,9 +134,9 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { insert_text_builder.write_string('$0') c.add_item( - label: '${name}' - kind: if receiver_text == '' { .function } else { .method } - label_details: lsp.CompletionItemLabelDetails{ + label: '${name}' + kind: if receiver_text == '' { .function } else { .method } + label_details: lsp.CompletionItemLabelDetails{ detail: signature.get_text() } detail: 'fn ${receiver_text}${element.name()}${generic_parameters_text}${signature.get_text()}' @@ -194,9 +194,9 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { insert_text_builder.write_string('$0') c.add_item( - label: '${name}' - kind: .method - label_details: lsp.CompletionItemLabelDetails{ + label: '${name}' + kind: .method + label_details: lsp.CompletionItemLabelDetails{ detail: signature.get_text() } detail: 'fn ${receiver_text}${element.name()}${generic_parameters_text}${signature.get_text()}' @@ -238,10 +238,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { if element is psi.ConstantDefinition { c.add_item( - label: element.name() - kind: .constant - detail: element.get_type().readable_name() - label_details: lsp.CompletionItemLabelDetails{ + label: element.name() + kind: .constant + detail: element.get_type().readable_name() + label_details: lsp.CompletionItemLabelDetails{ description: element.get_type().readable_name() } documentation: element.doc_comment() @@ -260,10 +260,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { } c.add_item( - label: element.name() - kind: .field - detail: element.get_type().readable_name() - label_details: lsp.CompletionItemLabelDetails{ + label: element.name() + kind: .field + detail: element.get_type().readable_name() + label_details: lsp.CompletionItemLabelDetails{ description: element.get_type().readable_name() } documentation: element.doc_comment() @@ -290,10 +290,10 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { '' } c.add_item( - label: element.name() - kind: .method - detail: 'fn ${element.name()}${signature.get_text()}' - label_details: lsp.CompletionItemLabelDetails{ + label: element.name() + kind: .method + detail: 'fn ${element.name()}${signature.get_text()}' + label_details: lsp.CompletionItemLabelDetails{ detail: signature.get_text() description: owner_name } @@ -339,8 +339,8 @@ fn (mut c ReferenceCompletionProcessor) execute(element psi.PsiElement) bool { label_details: lsp.CompletionItemLabelDetails{ detail: ' (global defined in ${module_name})' } - kind: .variable - insert_text: element.name() + kind: .variable + insert_text: element.name() ) } diff --git a/src/server/diagnostics.v b/src/server/diagnostics.v index 6fc99561..e5b6b617 100644 --- a/src/server/diagnostics.v +++ b/src/server/diagnostics.v @@ -68,9 +68,9 @@ fn (_ &DiagnosticReporter) convert_report(report inspections.Report) lsp.Diagnos .warning { lsp.DiagnosticSeverity.warning } .notice { lsp.DiagnosticSeverity.information } } - source: 'compiler' - message: report.message - tags: tags + source: 'compiler' + message: report.message + tags: tags } } diff --git a/src/server/features_hover.v b/src/server/features_hover.v index ec644e35..af843bb5 100644 --- a/src/server/features_hover.v +++ b/src/server/features_hover.v @@ -51,14 +51,14 @@ pub fn (mut ls LanguageServer) hover(params lsp.HoverParams) ?lsp.Hover { return lsp.Hover{ contents: lsp.hover_markdown_string('```\n' + grand_elem + '\n ' + parent_elem + '\n ' + this + '\n```') - range: tform.text_range_to_lsp_range(element.text_range()) + range: tform.text_range_to_lsp_range(element.text_range()) } } return lsp.Hover{ contents: lsp.hover_markdown_string(element.type_name() + ': ' + element.node.type_name.str()) - range: tform.text_range_to_lsp_range(element.text_range()) + range: tform.text_range_to_lsp_range(element.text_range()) } } diff --git a/src/server/file_diff/Diff.v b/src/server/file_diff/Diff.v index 873220bc..ed23d166 100644 --- a/src/server/file_diff/Diff.v +++ b/src/server/file_diff/Diff.v @@ -26,7 +26,7 @@ pub fn (mut diff Diff) append_to_begin(line int, text string) { pub fn (mut diff Diff) append_to(line int, col int, text string) { pos := Diff.line_pos(line, col) diff.edits << Edit{ - range: lsp.Range{ + range: lsp.Range{ start: pos end: pos } @@ -37,7 +37,7 @@ pub fn (mut diff Diff) append_to(line int, col int, text string) { pub fn (mut diff Diff) append_as_prev_line(line int, text string) { pos := Diff.line_begin_pos(line) diff.edits << Edit{ - range: lsp.Range{ + range: lsp.Range{ start: pos end: pos } @@ -48,7 +48,7 @@ pub fn (mut diff Diff) append_as_prev_line(line int, text string) { pub fn (mut diff Diff) append_as_next_line(line int, text string) { pos := Diff.line_begin_pos(line) diff.edits << Edit{ - range: lsp.Range{ + range: lsp.Range{ start: pos end: pos } diff --git a/src/server/general.v b/src/server/general.v index 2689f8a5..7ecc1a36 100644 --- a/src/server/general.v +++ b/src/server/general.v @@ -39,7 +39,7 @@ pub fn (mut ls LanguageServer) initialize(params lsp.InitializeParams, mut wr Re return lsp.InitializeResult{ capabilities: lsp.ServerCapabilities{ - text_document_sync: lsp.TextDocumentSyncOptions{ + text_document_sync: lsp.TextDocumentSyncOptions{ open_close: true change: .full will_save: true @@ -54,36 +54,36 @@ pub fn (mut ls LanguageServer) initialize(params lsp.InitializeParams, mut wr Re resolve_provider: false trigger_characters: ['.', ':', '(', '@'] } - signature_help_provider: lsp.SignatureHelpOptions{ + signature_help_provider: lsp.SignatureHelpOptions{ trigger_characters: ['(', ','] retrigger_characters: [',', ' '] } - code_lens_provider: lsp.CodeLensOptions{} - inlay_hint_provider: lsp.InlayHintOptions{} - semantic_tokens_provider: lsp.SemanticTokensOptions{ + code_lens_provider: lsp.CodeLensOptions{} + inlay_hint_provider: lsp.InlayHintOptions{} + semantic_tokens_provider: lsp.SemanticTokensOptions{ legend: lsp.SemanticTokensLegend{ token_types: semantic.semantic_types token_modifiers: semantic.semantic_modifiers } - range: true - full: true + range: true + full: true } - rename_provider: lsp.RenameOptions{ + rename_provider: lsp.RenameOptions{ prepare_provider: false } - document_symbol_provider: true - workspace_symbol_provider: true - implementation_provider: true - document_highlight_provider: true - code_action_provider: lsp.CodeActionOptions{ + document_symbol_provider: true + workspace_symbol_provider: true + implementation_provider: true + document_highlight_provider: true + code_action_provider: lsp.CodeActionOptions{ code_action_kinds: [lsp.quick_fix] } - folding_range_provider: true - execute_command_provider: lsp.ExecuteCommandOptions{ + folding_range_provider: true + execute_command_provider: lsp.ExecuteCommandOptions{ commands: arrays.concat(ls.intentions.values().map(it.id), ...ls.compiler_quick_fixes.values().map(it.id)) } } - server_info: lsp.ServerInfo{ + server_info: lsp.ServerInfo{ name: metadata.manifest.name version: metadata.manifest.version } diff --git a/src/server/hints/InlayHintsVisitor.v b/src/server/hints/InlayHintsVisitor.v index 908fc0ae..b1c59f78 100644 --- a/src/server/hints/InlayHintsVisitor.v +++ b/src/server/hints/InlayHintsVisitor.v @@ -36,8 +36,8 @@ pub fn (mut v InlayHintsVisitor) process_node(node psi.AstNode, containing_file line: int(start_point.row) character: int(start_point.column) } - label: '≤' - kind: .type_ + label: '≤' + kind: .type_ } } if need_right { @@ -46,8 +46,8 @@ pub fn (mut v InlayHintsVisitor) process_node(node psi.AstNode, containing_file line: int(end_point.row) character: int(end_point.column) } - label: '<' - kind: .type_ + label: '<' + kind: .type_ } } return @@ -67,8 +67,8 @@ pub fn (mut v InlayHintsVisitor) process_node(node psi.AstNode, containing_file line: range.line character: range.end_column } - label: ': ' + element.get_type().readable_name() - kind: .type_ + label: ': ' + element.get_type().readable_name() + kind: .type_ } } } @@ -84,8 +84,8 @@ pub fn (mut v InlayHintsVisitor) process_node(node psi.AstNode, containing_file line: range.line character: range.end_column } - label: ': ' + typ.readable_name() - kind: .type_ + label: ': ' + typ.readable_name() + kind: .type_ } } } @@ -133,8 +133,8 @@ pub fn (mut v InlayHintsVisitor) handle_enum_field(enum_field psi.AstNode, conta line: int(text_range.line) character: int(text_range.end_column) } - label: ' = ${value_presentation}' - kind: .type_ + label: ' = ${value_presentation}' + kind: .type_ } } } @@ -179,8 +179,8 @@ pub fn (mut v InlayHintsVisitor) handle_call_expression(call psi.AstNode, contai line: arg_range.line character: arg_range.column } - label: '${name}: ' - kind: .parameter + label: '${name}: ' + kind: .parameter } } } @@ -218,7 +218,7 @@ pub fn (mut v InlayHintsVisitor) handle_implicit_error_variable(block psi.AstNod line: int(start_point.row) character: int(start_point.column + 1) } - label: ' err →' - kind: .parameter + label: ' err →' + kind: .parameter } } diff --git a/src/server/inspections/compiler/utils.v b/src/server/inspections/compiler/utils.v index 04c19b67..b603ef22 100644 --- a/src/server/inspections/compiler/utils.v +++ b/src/server/inspections/compiler/utils.v @@ -51,7 +51,7 @@ fn parse_compiler_diagnostic(msg string) ?inspections.Report { } return inspections.Report{ - range: psi.TextRange{ + range: psi.TextRange{ line: line_nr column: col_nr end_line: line_nr diff --git a/src/server/tform/tform.v b/src/server/tform/tform.v index 6489f924..3c5db176 100644 --- a/src/server/tform/tform.v +++ b/src/server/tform/tform.v @@ -25,7 +25,7 @@ pub fn text_range_to_lsp_range(pos psi.TextRange) lsp.Range { line: pos.line character: pos.column } - end: lsp.Position{ + end: lsp.Position{ line: pos.end_line character: pos.end_column } diff --git a/src/testing/TestFixture.v b/src/testing/TestFixture.v index e6ad2974..8c3fcfd1 100644 --- a/src/testing/TestFixture.v +++ b/src/testing/TestFixture.v @@ -64,8 +64,8 @@ pub fn (mut t Fixture) initialize(with_stdlib bool) !lsp.InitializeResult { result := t.test_client.send[lsp.InitializeParams, lsp.InitializeResult]('initialize', lsp.InitializeParams{ - process_id: 75556 - client_info: lsp.ClientInfo{ + process_id: 75556 + client_info: lsp.ClientInfo{ name: 'Testing' version: '0.0.1' } @@ -141,7 +141,7 @@ fn (mut t Fixture) send_open_current_file_request() ! { t.test_client.send[lsp.DidChangeTextDocumentParams, jsonrpc.Null]('textDocument/didChange', lsp.DidChangeTextDocumentParams{ - text_document: lsp.VersionedTextDocumentIdentifier{ + text_document: lsp.VersionedTextDocumentIdentifier{ uri: lsp.document_uri_from_path(t.current_file.path) version: 1 } @@ -173,7 +173,7 @@ pub fn (mut t Fixture) definition(pos lsp.Position) []lsp.LocationLink { text_document: lsp.TextDocumentIdentifier{ uri: lsp.document_uri_from_path(t.current_file.path) } - position: pos + position: pos }) or { []lsp.LocationLink{} } return links @@ -189,8 +189,8 @@ pub fn (mut t Fixture) complete(pos lsp.Position) []lsp.CompletionItem { text_document: lsp.TextDocumentIdentifier{ uri: lsp.document_uri_from_path(t.current_file.path) } - position: pos - context: lsp.CompletionContext{ + position: pos + context: lsp.CompletionContext{ trigger_kind: .invoked } }) or { []lsp.CompletionItem{} } @@ -230,7 +230,7 @@ pub fn (mut t Fixture) implementation(pos lsp.Position) []lsp.Location { text_document: lsp.TextDocumentIdentifier{ uri: lsp.document_uri_from_path(t.current_file.path) } - position: pos + position: pos }) or { []lsp.Location{} } return links @@ -253,7 +253,7 @@ pub fn (mut t Fixture) documentation(pos lsp.Position) ?lsp.Hover { text_document: lsp.TextDocumentIdentifier{ uri: lsp.document_uri_from_path(t.current_file.path) } - position: pos + position: pos }) or { return none } return hover