add support for json configuration in the workspace

3 files changed, 46 insertions, 9 deletions

diff --git a/src/main.odin b/src/main.odin
index 1051e24..6246ba0 100644
--- a/src/main.odin
+++ b/src/main.odin
@@ -37,15 +37,8 @@ run :: proc(reader: ^server.Reader, writer: ^server.Writer) {
     //temporary collections being set manually, need to get client configuration set up.
     config.collections = make(map [string] string);
 
-    config.collections["core"] = strings.to_lower("c:/Users/danie/OneDrive/Desktop/Computer_Science/Odin/core");
-    config.collections["shared"] = strings.to_lower("c:/Users/danie/OneDrive/Desktop/Computer_Science/ols/src");
-
     log.info("Starting Odin Language Server");
 
-    index.build_static_index(context.allocator, &config);
-
-    log.info("Finished indexing");
-
     config.running = true;
 
     for config.running {
diff --git a/src/server/requests.odin b/src/server/requests.odin
index abcb59e..c84a3bd 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -8,9 +8,11 @@ import "core:strings"
 import "core:slice"
 import "core:strconv"
 import "core:encoding/json"
+import "core:path"
 
-import "shared:common"
 
+import "shared:common"
+import "shared:index"
 
 Header :: struct {
     content_length: int,
@@ -219,7 +221,32 @@ request_initialize :: proc(params: json.Value, id: RequestId, config: ^common.Co
     config.workspace_folders = make([dynamic]common.WorkspaceFolder);
 
     for s in initialize_params.workspaceFolders {
-        append_elem(&config.workspace_folders, s);
+        append(&config.workspace_folders, s);
+    }
+
+    //right now just look at the first workspace - TODO(daniel, add multiple workspace support)
+    if uri, ok := common.parse_uri(config.workspace_folders[0].uri, context.temp_allocator); ok {
+
+        ols_config_path := path.join(elems = {uri.path, "ols.json"}, allocator = context.temp_allocator);
+
+        if data, ok := os.read_entire_file(ols_config_path, context.temp_allocator); ok {
+
+            if value, err := json.parse(data = data, allocator = context.temp_allocator, parse_integers = true); err == .None {
+
+                ols_config: OlsConfig;
+
+                if unmarshal(value, ols_config, context.temp_allocator) == .None {
+
+                    for p in ols_config.collections {
+                        config.collections[strings.clone(p.name)] = strings.clone(strings.to_lower(p.path, context.temp_allocator));
+                    }
+
+                }
+
+            }
+
+        }
+
     }
 
     for format in initialize_params.capabilities.textDocument.hover.contentFormat {
@@ -254,6 +281,14 @@ request_initialize :: proc(params: json.Value, id: RequestId, config: ^common.Co
         id = id,
     );
 
+    /*
+        Temp index here, but should be some background thread that starts the indexing
+    */
+
+    index.build_static_index(context.allocator, config);
+
+    log.info("Finished indexing");
+
     send_response(response, writer);
 
     return .None;
diff --git a/src/server/types.odin b/src/server/types.odin
index d957041..e22d0ad 100644
--- a/src/server/types.odin
+++ b/src/server/types.odin
@@ -252,4 +252,13 @@ SignatureInformation :: struct {
 
 ParameterInformation :: struct {
 	label: [2] int,
+};
+
+OlsConfig :: struct {
+	collections: [dynamic] OlsConfigCollection,
+};
+
+OlsConfigCollection :: struct {
+	name: string,
+	path: string,
 };
\ No newline at end of file