Merge branch 'master' into refractor-analysis

9 files changed, 11 insertions, 9 deletions

diff --git a/src/server/check.odin b/src/server/check.odin
index 574227e..ab6dfb2 100644
--- a/src/server/check.odin
+++ b/src/server/check.odin
@@ -8,7 +8,7 @@ import "core:strings"
 import "core:slice"
 import "core:strconv"
 import "core:encoding/json"
-import "core:path"
+import path "core:path/slashpath"
 import "core:runtime"
 import "core:thread"
 import "core:sync"
@@ -49,7 +49,7 @@ when ODIN_OS == "windows" {
 			command = "odin";
 		}
  
-		if code, ok, buffer = common.run_executable(fmt.tprintf("%v check %s %s -no-entry-point", command, path.dir(uri.path, context.temp_allocator), strings.to_string(collection_builder)), &data); !ok {
+		if code, ok, buffer = common.run_executable(fmt.tprintf("%v check %s %s -no-entry-point %s", command, path.dir(uri.path, context.temp_allocator), strings.to_string(collection_builder), config.checker_args), &data); !ok {
 			log.errorf("Odin check failed with code %v for file %v", code, uri.path);
 			return;
 		} 
diff --git a/src/server/completion.odin b/src/server/completion.odin
index 590f36d..e869006 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -6,7 +6,7 @@ import "core:odin/tokenizer"
 import "core:fmt"
 import "core:log"
 import "core:strings"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 import "core:strconv"
 import "core:path/filepath"
diff --git a/src/server/definition.odin b/src/server/definition.odin
index 01641b4..52e09dd 100644
--- a/src/server/definition.odin
+++ b/src/server/definition.odin
@@ -6,7 +6,7 @@ import "core:odin/tokenizer"
 import "core:fmt"
 import "core:log"
 import "core:strings"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 import "core:strconv"
 import "core:path/filepath"
diff --git a/src/server/document_symbols.odin b/src/server/document_symbols.odin
index db18e56..3d3a296 100644
--- a/src/server/document_symbols.odin
+++ b/src/server/document_symbols.odin
@@ -6,7 +6,7 @@ import "core:odin/tokenizer"
 import "core:fmt"
 import "core:log"
 import "core:strings"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 import "core:strconv"
 import "core:path/filepath"
diff --git a/src/server/documents.odin b/src/server/documents.odin
index da7bcb5..94c0cd6 100644
--- a/src/server/documents.odin
+++ b/src/server/documents.odin
@@ -7,7 +7,7 @@ import "core:os"
 import "core:odin/parser"
 import "core:odin/ast"
 import "core:odin/tokenizer"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 
 import "core:intrinsics"
diff --git a/src/server/hover.odin b/src/server/hover.odin
index 7c2d9c4..1a45b8c 100644
--- a/src/server/hover.odin
+++ b/src/server/hover.odin
@@ -6,7 +6,7 @@ import "core:odin/tokenizer"
 import "core:fmt"
 import "core:log"
 import "core:strings"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 import "core:strconv"
 import "core:path/filepath"
diff --git a/src/server/requests.odin b/src/server/requests.odin
index c4bd7b9..4fc4b48 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -8,7 +8,7 @@ import "core:strings"
 import "core:slice"
 import "core:strconv"
 import "core:encoding/json"
-import "core:path"
+import path "core:path/slashpath"
 import "core:runtime"
 import "core:thread"
 import "core:sync"
@@ -423,6 +423,7 @@ request_initialize :: proc (task: ^common.Task) {
 					config.file_log = ols_config.file_log;
 					config.formatter = ols_config.formatter;
 					config.odin_command = strings.clone(ols_config.odin_command, context.allocator);
+					config.checker_args = ols_config.checker_args;
 					
 					for p in ols_config.collections {
 
diff --git a/src/server/signature.odin b/src/server/signature.odin
index 3dcbacd..03d9ce7 100644
--- a/src/server/signature.odin
+++ b/src/server/signature.odin
@@ -6,7 +6,7 @@ import "core:odin/tokenizer"
 import "core:fmt"
 import "core:log"
 import "core:strings"
-import "core:path"
+import path "core:path/slashpath"
 import "core:mem"
 import "core:strconv"
 import "core:path/filepath"
diff --git a/src/server/types.odin b/src/server/types.odin
index 4a36d82..1dbcbe1 100644
--- a/src/server/types.odin
+++ b/src/server/types.odin
@@ -302,6 +302,7 @@ OlsConfig :: struct {
 	file_log:                 bool,
 	formatter:                common.Format_Config,
 	odin_command:             string,
+	checker_args:             string,
 }
 
 OlsConfigCollection :: struct {