diff options
| author | DanielGavin <danielgavin5@hotmail.com> | 2023-09-19 22:14:50 +0200 |
|---|---|---|
| committer | DanielGavin <danielgavin5@hotmail.com> | 2023-09-19 22:14:50 +0200 |
| commit | 59f033f5af3c740226213bc12b6b08220ffa335f (patch) | |
| tree | 122cc0ea1d88e92c275c3949a9013aabfb0b748c /src/server | |
| parent | 89ebef892b36e12669ea364b3454b7ec03057695 (diff) | |
Fix issue with maybe(string) in OlsConfig
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/requests.odin | 23 | ||||
| -rw-r--r-- | src/server/types.odin | 4 |
2 files changed, 17 insertions, 10 deletions
diff --git a/src/server/requests.odin b/src/server/requests.odin index 5a561d8..257baef 100644 --- a/src/server/requests.odin +++ b/src/server/requests.odin @@ -425,14 +425,21 @@ read_ols_initialize_options :: proc( config.file_log = ols_config.file_log.(bool) or_else config.file_log config.enable_rename = ols_config.enable_references.(bool) or_else config.enable_rename - config.odin_command = strings.clone( - ols_config.odin_command.(string) or_else config.odin_command, - context.allocator, - ) - config.checker_args = strings.clone( - ols_config.checker_args.(string) or_else config.checker_args, - context.allocator, - ) + + if ols_config.odin_command != "" { + config.odin_command = strings.clone( + ols_config.odin_command, + context.allocator, + ) + } + + if ols_config.checker_args != "" { + config.checker_args = strings.clone( + ols_config.checker_args, + context.allocator, + ) + } + config.enable_inlay_hints = ols_config.enable_inlay_hints.(bool) or_else config.enable_inlay_hints config.enable_fake_method = diff --git a/src/server/types.odin b/src/server/types.odin index 42e9699..f809bf8 100644 --- a/src/server/types.odin +++ b/src/server/types.odin @@ -350,8 +350,8 @@ OlsConfig :: struct { disable_parser_errors: Maybe(bool), verbose: Maybe(bool), file_log: Maybe(bool), - odin_command: Maybe(string), - checker_args: Maybe(string), + odin_command: string, + checker_args: string, } OlsConfigCollection :: struct { |