Fix issue with chainings `do` would increase indentation in a block

4 files changed, 36 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index 6a8af68..3c69cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,17 @@
-*.exe

-*.pdb

-*.rdbg

-*.obj

-*.bc

-*.ll

-*.sublime-project

-*.sublime-workspace

-*.lib

-*.exp

-*.sqlite

-*.suo

-*node_modules

-ols

-odinfmt

-

-

+*.exe
+*.pdb
+*.rdbg
+*.obj
+*.bc
+*.ll
+*.sublime-project
+*.sublime-workspace
+*.lib
+*.exp
+*.sqlite
+*.suo
+*node_modules
+/ols
+/odinfmt
+
+
diff --git a/src/odin/printer/visit.odin b/src/odin/printer/visit.odin
index cc491e1..df48bbb 100644
--- a/src/odin/printer/visit.odin
+++ b/src/odin/printer/visit.odin
@@ -977,6 +977,7 @@ visit_stmt :: proc(
 		set_source_position(p, v.pos)
 
 		block := visit_block_stmts(p, v.stmts, len(v.stmts) > 1)
+
 		comment_end, _ := visit_comments(
 			p,
 			tokenizer.Pos{line = v.end.line, offset = v.end.offset},
@@ -984,6 +985,8 @@ visit_stmt :: proc(
 
 		if block_type == .Switch_Stmt && !p.config.indent_cases {
 			document = cons(document, block, comment_end)
+		} else if uses_do {
+			document = cons(document, cons(block, comment_end))
 		} else {
 			document = cons(document, nest(cons(block, comment_end)))
 		}
diff --git a/tools/odinfmt/tests/.snapshots/for.odin b/tools/odinfmt/tests/.snapshots/for.odin
new file mode 100644
index 0000000..6d2ddce
--- /dev/null
+++ b/tools/odinfmt/tests/.snapshots/for.odin
@@ -0,0 +1,8 @@
+package odinfmt_test
+
+a :: proc() {
+	bag: bit_set[0 ..< 10] = {5}
+	for x in 0 ..< 10 do if x in bag {
+		fmt.println(x)
+	}
+}
diff --git a/tools/odinfmt/tests/for.odin b/tools/odinfmt/tests/for.odin
new file mode 100644
index 0000000..e4168eb
--- /dev/null
+++ b/tools/odinfmt/tests/for.odin
@@ -0,0 +1,8 @@
+package odinfmt_test
+
+a :: proc() {
+	bag: bit_set[0 ..< 10] = {5}
+	for x in 0 ..< 10 do if x in bag {
+			fmt.println(x)
+		}
+}