Merge branch 'master' of https://github.com/DanielGavin/ols

2 files changed, 11 insertions, 4 deletions

diff --git a/src/odin/printer/printer.odin b/src/odin/printer/printer.odin
index 8fb8baf..74f5853 100644
--- a/src/odin/printer/printer.odin
+++ b/src/odin/printer/printer.odin
@@ -129,13 +129,18 @@ build_disabled_lines_info :: proc(p: ^Printer) {
 
 	for group in p.comments {
 		for comment in group.list {
-			comment_text, _ := strings.replace_all(comment.text[:], " ", "", context.temp_allocator)
 
-			if strings.contains(comment_text, "//odinfmt:disable") {
+			if !strings.starts_with(comment.text, "//") do continue
+			comment_text := strings.trim_left_space(comment.text[len("//"):])
+
+			if !strings.starts_with(comment_text, "odinfmt:") do continue
+			action := strings.trim_space(comment_text[len("odinfmt:"):])
+
+			if action == "disable" {
 				found_disable = true
 				empty = true
 				disable_position = comment.pos
-			} else if strings.contains(comment_text, "//odinfmt:enable") && found_disable {
+			} else if found_disable && action == "enable" {
 				begin := disable_position.offset - (comment.pos.column - 1)
 				end := comment.pos.offset + len(comment.text)
 
@@ -146,7 +151,7 @@ build_disabled_lines_info :: proc(p: ^Printer) {
 					empty      = empty,
 				}
 
-				for line := disable_position.line; line <= comment.pos.line; line += 1 {
+				for line in disable_position.line..=comment.pos.line {
 					p.disabled_lines[line] = disabled_info
 				}
 
diff --git a/src/server/completion.odin b/src/server/completion.odin
index 1b7249d..c085881 100644
--- a/src/server/completion.odin
+++ b/src/server/completion.odin
@@ -178,8 +178,10 @@ DIRECTIVE_NAME_LIST :: []string {
 	"line",
 	"procedure",
 	"caller_location",
+	"reverse",
 	/* call directives */
 	"location",
+	"caller_expression",
 	"exists",
 	"load",
 	"load_directory",