From 447284f2366d8cf51ab4417427cdb3c079670282 Mon Sep 17 00:00:00 2001 From: DanielGavin Date: Sun, 10 Mar 2024 21:58:43 +0100 Subject: Check global json first before the local one. --- src/server/requests.odin | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/server/requests.odin b/src/server/requests.odin index 00b649b..711fb79 100644 --- a/src/server/requests.odin +++ b/src/server/requests.odin @@ -682,10 +682,21 @@ request_initialize :: proc( } if uri, ok := common.parse_uri(project_uri, context.temp_allocator); ok { + global_ols_config_path := path.join( + elems = { + filepath.dir(os.args[0], context.temp_allocator), + "ols.json", + }, + allocator = context.temp_allocator, + ) + + read_ols_config(global_ols_config_path, config, uri) + ols_config_path := path.join( elems = {uri.path, "ols.json"}, allocator = context.temp_allocator, ) + read_ols_config(ols_config_path, config, uri) read_ols_initialize_options( -- cgit v1.2.3