From 6070844d69cab5b4a5bb50473bd6ccc2343ff7dd Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Tue, 21 Jun 2022 23:22:40 +0200 Subject: Add new json variable for picking the space amount --- src/common/config.odin | 1 + 1 file changed, 1 insertion(+) (limited to 'src/common') diff --git a/src/common/config.odin b/src/common/config.odin index 387e8b8..d90e5fa 100644 --- a/src/common/config.odin +++ b/src/common/config.odin @@ -28,6 +28,7 @@ Config :: struct { Format_Config :: struct { tabs: bool, characters: int, + spaces: int, } config: Config; \ No newline at end of file -- cgit v1.2.3 From ff4801dfd8ee5113d1fba64aeede0f7412a91931 Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Wed, 22 Jun 2022 00:09:15 +0200 Subject: Forgot file --- src/common/config.odin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/common') diff --git a/src/common/config.odin b/src/common/config.odin index d90e5fa..c510e57 100644 --- a/src/common/config.odin +++ b/src/common/config.odin @@ -27,8 +27,8 @@ Config :: struct { Format_Config :: struct { tabs: bool, - characters: int, - spaces: int, + characters: Maybe(int), + spaces: Maybe(int), } config: Config; \ No newline at end of file -- cgit v1.2.3 From 0f780f6c0bc61294f735f2ccb7209226121e5918 Mon Sep 17 00:00:00 2001 From: DanielGavin Date: Tue, 28 Jun 2022 12:32:52 +0200 Subject: Remember to close the handle in `get_case_sensitive_path` --- src/common/util_windows.odin | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/common') diff --git a/src/common/util_windows.odin b/src/common/util_windows.odin index 194bd4d..716d4be 100644 --- a/src/common/util_windows.odin +++ b/src/common/util_windows.odin @@ -32,10 +32,10 @@ get_case_sensitive_path :: proc(path: string, allocator := context.temp_allocato file := win32.CreateFileW(&wide[0], 0, win32.FILE_SHARE_READ, nil, win32.OPEN_EXISTING, win32.FILE_FLAG_BACKUP_SEMANTICS, nil) if(file == win32.INVALID_HANDLE) - { + { log_last_error() - return ""; - } + return ""; + } buffer := make([]u16, 512, context.temp_allocator) @@ -43,6 +43,8 @@ get_case_sensitive_path :: proc(path: string, allocator := context.temp_allocato res, _ := win32.utf16_to_utf8(buffer[4:], allocator) + win32.CloseHandle(file) + return res } @@ -127,4 +129,4 @@ run_executable :: proc(command: string, stdout: ^[]byte) -> (u32, bool, []byte) win32.CloseHandle(stdout_read) return exit_code, true, stdout[0:index] -} \ No newline at end of file +} -- cgit v1.2.3 From 9b19888219305c3740f36d9490e08e04e148a413 Mon Sep 17 00:00:00 2001 From: Daniel Gavin Date: Wed, 29 Jun 2022 23:09:14 +0200 Subject: Remove Maybe for now because json serialization messes it up. --- src/common/config.odin | 4 ++-- src/server/format.odin | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/common') diff --git a/src/common/config.odin b/src/common/config.odin index c510e57..d90e5fa 100644 --- a/src/common/config.odin +++ b/src/common/config.odin @@ -27,8 +27,8 @@ Config :: struct { Format_Config :: struct { tabs: bool, - characters: Maybe(int), - spaces: Maybe(int), + characters: int, + spaces: int, } config: Config; \ No newline at end of file diff --git a/src/server/format.odin b/src/server/format.odin index 219d7d9..041b204 100644 --- a/src/server/format.odin +++ b/src/server/format.odin @@ -22,12 +22,12 @@ get_complete_format :: proc(document: ^common.Document, config: ^common.Config) style := printer.default_style style.tabs = config.formatter.tabs - if characters, ok := config.formatter.characters.(int); ok { - style.max_characters = characters + if config.formatter.characters != 0 { + style.max_characters = config.formatter.characters } - if spaces, ok := config.formatter.spaces.(int); ok { - style.spaces = spaces + if config.formatter.spaces != 0 { + style.spaces = config.formatter.spaces } prnt := printer.make_printer(style, context.temp_allocator) -- cgit v1.2.3