aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gavin <danielgavin5@hotmail.com>2022-05-09 19:12:17 +0200
committerDaniel Gavin <danielgavin5@hotmail.com>2022-05-09 19:12:17 +0200
commit9d83cedd360ab3877b4eec46e9d5f6b225b9d2bf (patch)
tree10280f02e770a4b983d3d5a1d2162d2b9d1482b1
parentfb3199666ed9885275a4e225555cdeb2624b74c8 (diff)
parent1961fd33886fa3b48ec2e7c9216d129a253c4017 (diff)
Merge branch 'master' of github.com:DanielGavin/ols
-rw-r--r--README.md20
-rw-r--r--tools/odinfmt/main.odin2
2 files changed, 7 insertions, 15 deletions
diff --git a/README.md b/README.md
index fcefd75..09f9178 100644
--- a/README.md
+++ b/README.md
@@ -69,20 +69,12 @@ Configuration of the LSP:
{
"odin":
{
- "command":
- [
- "C:/path/to/ols"
- ],
- "enabled": true,
- "languageId": "odin",
- "scopes":
- [
- "source.odin"
- ],
- "syntaxes":
- [
- "Packages/User/sublime-odin/Odin.sublime-syntax"
- ]
+ "command":
+ [
+ "C:/path/to/ols.exe"
+ ],
+ "enabled": false, // true for globally-enabled, but not required due to 'Enable In Project' command
+ "selector": "source.odin",
}
},
"only_show_lsp_completions": true,
diff --git a/tools/odinfmt/main.odin b/tools/odinfmt/main.odin
index 45bbf81..6fca27f 100644
--- a/tools/odinfmt/main.odin
+++ b/tools/odinfmt/main.odin
@@ -66,7 +66,7 @@ walk_files :: proc(info: os.File_Info, in_err: os.Errno) -> (err: os.Errno, skip
main :: proc() {
arena: mem.Arena;
- mem.init_arena(&arena, make([]byte, mem.megabytes(20)));
+ mem.init_arena(&arena, make([]byte, 20 * mem.Megabyte));
arena_allocator := mem.arena_allocator(&arena);