diff options
| author | Daniel Gavin <danielgavin5@hotmail.com> | 2022-09-06 23:12:55 +0200 |
|---|---|---|
| committer | Daniel Gavin <danielgavin5@hotmail.com> | 2022-09-06 23:12:55 +0200 |
| commit | 9e3ca7b83888fdcf0228e1f71a91c07317d8a73f (patch) | |
| tree | e89de4e8b53c63e559c9c0badd6026a3055c3d36 | |
| parent | ea6056b0b2c0225f62f63bb8a2c1d88ea9593e23 (diff) | |
Use the fallback for vendor even if core exists.
| -rw-r--r-- | src/server/requests.odin | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/server/requests.odin b/src/server/requests.odin index 2180c18..586a2a1 100644 --- a/src/server/requests.odin +++ b/src/server/requests.odin @@ -421,10 +421,10 @@ request_initialize :: proc( ) { if data, ok := os.read_entire_file(file, context.temp_allocator); ok { if value, err := json.parse( - data = data, - allocator = context.temp_allocator, - parse_integers = true, - ); err == .None { + data = data, + allocator = context.temp_allocator, + parse_integers = true, + ); err == .None { ols_config: OlsConfig if unmarshal(value, ols_config, context.temp_allocator) == @@ -518,7 +518,7 @@ request_initialize :: proc( odin_core_env := os.get_env("ODIN_ROOT", context.temp_allocator) - if odin_core_env == "" && "core" not_in config.collections { + if odin_core_env == "" { if exe_path, ok := common.lookup_in_path("odin"); ok { odin_core_env = filepath.dir(exe_path, context.temp_allocator) } @@ -884,11 +884,11 @@ notification_did_open :: proc( } if n := document_open( - open_params.textDocument.uri, - open_params.textDocument.text, - config, - writer, - ); n != .None { + open_params.textDocument.uri, + open_params.textDocument.text, + config, + writer, + ); n != .None { return .InternalError } @@ -1027,10 +1027,10 @@ notification_did_save :: proc( } if ret := collect_symbols( - &indexer.index.collection, - file, - corrected_uri.uri, - ); ret != .None { + &indexer.index.collection, + file, + corrected_uri.uri, + ); ret != .None { log.errorf("failed to collect symbols on save %v", ret) } |