diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/config.odin | 62 | ||||
| -rw-r--r-- | src/server/inlay_hints.odin | 7 | ||||
| -rw-r--r-- | src/server/requests.odin | 12 | ||||
| -rw-r--r-- | src/server/types.odin | 44 |
4 files changed, 71 insertions, 54 deletions
diff --git a/src/common/config.odin b/src/common/config.odin index 6ca8bc9..27bc1ac 100644 --- a/src/common/config.odin +++ b/src/common/config.odin @@ -7,36 +7,38 @@ ConfigProfile :: struct { } Config :: struct { - workspace_folders: [dynamic]WorkspaceFolder, - completion_support_md: bool, - hover_support_md: bool, - signature_offset_support: bool, - collections: map[string]string, - running: bool, - verbose: bool, - enable_format: bool, - enable_hover: bool, - enable_document_symbols: bool, - enable_semantic_tokens: bool, - enable_inlay_hints: bool, - enable_procedure_context: bool, - enable_snippets: bool, - enable_references: bool, - enable_rename: bool, - enable_label_details: bool, - enable_std_references: bool, - enable_import_fixer: bool, - enable_fake_method: bool, - enable_procedure_snippet: bool, - enable_checker_only_saved: bool, - disable_parser_errors: bool, - thread_count: int, - file_log: bool, - odin_command: string, - checker_args: string, - checker_targets: []string, - client_name: string, - profile: ConfigProfile, + workspace_folders: [dynamic]WorkspaceFolder, + completion_support_md: bool, + hover_support_md: bool, + signature_offset_support: bool, + collections: map[string]string, + running: bool, + verbose: bool, + enable_format: bool, + enable_hover: bool, + enable_document_symbols: bool, + enable_semantic_tokens: bool, + enable_inlay_hints: bool, + enable_inlay_hints_params: bool, + enable_inlay_hints_default_params: bool, + enable_procedure_context: bool, + enable_snippets: bool, + enable_references: bool, + enable_rename: bool, + enable_label_details: bool, + enable_std_references: bool, + enable_import_fixer: bool, + enable_fake_method: bool, + enable_procedure_snippet: bool, + enable_checker_only_saved: bool, + disable_parser_errors: bool, + thread_count: int, + file_log: bool, + odin_command: string, + checker_args: string, + checker_targets: []string, + client_name: string, + profile: ConfigProfile, } config: Config diff --git a/src/server/inlay_hints.odin b/src/server/inlay_hints.odin index 464dd56..86d1bf5 100644 --- a/src/server/inlay_hints.odin +++ b/src/server/inlay_hints.odin @@ -9,6 +9,7 @@ import "src:common" get_inlay_hints :: proc( document: ^Document, symbols: map[uintptr]SymbolAndNode, + config: ^common.Config, ) -> ( []InlayHint, bool, @@ -112,6 +113,10 @@ get_inlay_hints :: proc( continue loop } + if !config.enable_inlay_hints_default_params { + continue loop + } + value := common.node_to_string(arg.default_value) call_range := common.get_token_range( @@ -154,7 +159,7 @@ get_inlay_hints :: proc( append(&hints, hint) has_added_default = true - } else { + } else if config.enable_inlay_hints_params { // if the arg name and param name are the same, don't add it. same_name: bool diff --git a/src/server/requests.odin b/src/server/requests.odin index 0fd73ba..778f1b2 100644 --- a/src/server/requests.odin +++ b/src/server/requests.odin @@ -495,6 +495,11 @@ read_ols_initialize_options :: proc( config.enable_inlay_hints = ols_config.enable_inlay_hints.(bool) or_else config.enable_inlay_hints + config.enable_inlay_hints_params = + ols_config.enable_inlay_hints_params.(bool) or_else config.enable_inlay_hints_params + config.enable_inlay_hints_default_params = + ols_config.enable_inlay_hints_default_params.(bool) or_else config.enable_inlay_hints_default_params + config.enable_fake_method = ols_config.enable_fake_methods.(bool) or_else config.enable_fake_method @@ -688,6 +693,10 @@ request_initialize :: proc( config.enable_hover = true config.enable_format = true + config.enable_inlay_hints = false + config.enable_inlay_hints_params = true + config.enable_inlay_hints_default_params = true + config.disable_parser_errors = false config.thread_count = 2 config.enable_document_symbols = true @@ -702,7 +711,6 @@ request_initialize :: proc( config.enable_rename = false config.odin_command = "" config.checker_args = "" - config.enable_inlay_hints = false config.enable_fake_method = false config.enable_procedure_snippet = true config.enable_checker_only_saved = false @@ -1438,7 +1446,7 @@ request_inlay_hint :: proc( resolve_entire_file_cached(document) if file, ok := file_resolve_cache.files[document.uri.uri]; ok { - hints, ok = get_inlay_hints(document, file.symbols) + hints, ok = get_inlay_hints(document, file.symbols, config) } if !ok { diff --git a/src/server/types.odin b/src/server/types.odin index 9cc1e01..044a83c 100644 --- a/src/server/types.odin +++ b/src/server/types.odin @@ -336,27 +336,29 @@ TextDocumentSyncOptions :: struct { } OlsConfig :: struct { - collections: [dynamic]OlsConfigCollection, - thread_pool_count: Maybe(int), - enable_semantic_tokens: Maybe(bool), - enable_document_symbols: Maybe(bool), - enable_format: Maybe(bool), - enable_hover: Maybe(bool), - enable_procedure_context: Maybe(bool), - enable_snippets: Maybe(bool), - enable_inlay_hints: Maybe(bool), - enable_references: Maybe(bool), - enable_fake_methods: Maybe(bool), - enable_procedure_snippet: Maybe(bool), - enable_checker_only_saved: Maybe(bool), - disable_parser_errors: Maybe(bool), - verbose: Maybe(bool), - file_log: Maybe(bool), - odin_command: string, - checker_args: string, - checker_targets: []string, - profiles: [dynamic]common.ConfigProfile, - profile: string, + collections: [dynamic]OlsConfigCollection, + thread_pool_count: Maybe(int), + enable_semantic_tokens: Maybe(bool), + enable_document_symbols: Maybe(bool), + enable_format: Maybe(bool), + enable_hover: Maybe(bool), + enable_procedure_context: Maybe(bool), + enable_snippets: Maybe(bool), + enable_inlay_hints: Maybe(bool), + enable_inlay_hints_params: Maybe(bool), + enable_inlay_hints_default_params: Maybe(bool), + enable_references: Maybe(bool), + enable_fake_methods: Maybe(bool), + enable_procedure_snippet: Maybe(bool), + enable_checker_only_saved: Maybe(bool), + disable_parser_errors: Maybe(bool), + verbose: Maybe(bool), + file_log: Maybe(bool), + odin_command: string, + checker_args: string, + checker_targets: []string, + profiles: [dynamic]common.ConfigProfile, + profile: string, } OlsConfigCollection :: struct { |