aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielGavin <danielgavin5@hotmail.com>2024-03-10 21:58:43 +0100
committerDanielGavin <danielgavin5@hotmail.com>2024-03-10 21:58:43 +0100
commit447284f2366d8cf51ab4417427cdb3c079670282 (patch)
treee020dcd7c5f4bd5b5aa9c0d1ab7f10fd37b3977e
parent89fd8a66c987703801288300a78376cdf140c198 (diff)
Check global json first before the local one.
-rw-r--r--src/server/requests.odin11
1 files changed, 11 insertions, 0 deletions
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(