aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielGavin <danielgavin5@hotmail.com>2022-07-22 02:03:03 +0200
committerGitHub <noreply@github.com>2022-07-22 02:03:03 +0200
commit693ab697b238f8e11b339f9d9bbb331c2c31583c (patch)
tree475466b136eb96ae732b065615fd3a8565e55be0
parent53d13ab19c1a0039f9c5a5645081aea63fe18aa3 (diff)
parent1b7c27d11be863f72894540af482114c755e920a (diff)
Merge pull request #121 from nico-bb/master
fix path.join() parameters to fit the new signature
-rw-r--r--src/server/build.odin4
-rw-r--r--src/server/requests.odin2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/build.odin b/src/server/build.odin
index 741cf6b..e6172b3 100644
--- a/src/server/build.odin
+++ b/src/server/build.odin
@@ -114,7 +114,7 @@ setup_index :: proc() {
dir_exe := path.dir(os.args[0])
- try_build_package(path.join(dir_exe, "builtin"))
+ try_build_package(path.join({dir_exe, "builtin"}))
}
free_index :: proc() {
@@ -127,4 +127,4 @@ log_error_handler :: proc(pos: tokenizer.Pos, msg: string, args: ..any) {
log_warning_handler :: proc(pos: tokenizer.Pos, msg: string, args: ..any) {
log.warnf("%v %v %v", pos, msg, args)
-} \ No newline at end of file
+}
diff --git a/src/server/requests.odin b/src/server/requests.odin
index 6201d03..d9147ba 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -545,7 +545,7 @@ request_initialize :: proc (params: json.Value, id: RequestId, config: ^common.C
*/
if core, ok := config.collections["core"]; ok {
- append(&indexer.builtin_packages, path.join(core, "runtime"))
+ append(&indexer.builtin_packages, path.join({core, "runtime"}))
}
for pkg in indexer.builtin_packages {