From 63c4720ed2b9e034fda6810a9c0e521355a24c44 Mon Sep 17 00:00:00 2001
From: Ian Wrzesinski <133046678+wrzian@users.noreply.github.com>
Date: Thu, 16 Jan 2025 08:40:29 -0500
Subject: [PATCH] Fix list indent when starting at an open bracket (#5677)

---
 crates/typst-syntax/src/parser.rs | 19 +++++++++-----
 tests/suite/model/list.typ        | 43 +++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/crates/typst-syntax/src/parser.rs b/crates/typst-syntax/src/parser.rs
index 335b8f1a2..a65e5ff6b 100644
--- a/crates/typst-syntax/src/parser.rs
+++ b/crates/typst-syntax/src/parser.rs
@@ -1605,10 +1605,12 @@ impl AtNewline {
                 _ => true,
             },
             AtNewline::StopParBreak => parbreak,
-            AtNewline::RequireColumn(min_col) => match column {
-                Some(column) => column <= min_col,
-                None => false, // Don't stop if we had no column.
-            },
+            AtNewline::RequireColumn(min_col) => {
+                // Don't stop if this newline doesn't start a column (this may
+                // be checked on the boundary of lexer modes, since we only
+                // report a column in Markup).
+                column.is_some_and(|column| column <= min_col)
+            }
         }
     }
 }
@@ -1703,10 +1705,13 @@ impl<'s> Parser<'s> {
         self.token.newline.is_some()
     }
 
-    /// The number of characters until the most recent newline from the current
-    /// token, or 0 if it did not follow a newline.
+    /// The number of characters until the most recent newline from the start of
+    /// the current token. Uses a cached value from the newline mode if present.
     fn current_column(&self) -> usize {
-        self.token.newline.and_then(|newline| newline.column).unwrap_or(0)
+        self.token
+            .newline
+            .and_then(|newline| newline.column)
+            .unwrap_or_else(|| self.lexer.column(self.token.start))
     }
 
     /// The current token's text.
diff --git a/tests/suite/model/list.typ b/tests/suite/model/list.typ
index 138abf70e..b3d9a830b 100644
--- a/tests/suite/model/list.typ
+++ b/tests/suite/model/list.typ
@@ -77,6 +77,49 @@ _Shopping list_
 
 #test(indented, manual)
 
+--- list-indent-bracket-nesting ---
+// Test list indent nesting behavior when directly at a starting bracket.
+
+#let indented = {
+  [- indented
+  - less
+  ]
+  [- indented
+   - same
+  - then less
+   - then same
+  ]
+  [- indented
+    - more
+   - then same
+  - then less
+  ]
+}
+
+#let item = list.item
+#let manual = {
+    {
+      item[indented]; [ ]
+      item[less]; [ ]
+    }
+    {
+      item[indented]; [ ]
+      item[same]; [ ]
+      item[then less #{
+        item[then same]
+      }]; [ ]
+    }
+    {
+      item[indented #{
+        item[more]
+      }]; [ ]
+      item[then same]; [ ]
+      item[then less]; [ ]
+    }
+}
+
+#test(indented, manual)
+
 --- list-tabs ---
 // This works because tabs are used consistently.
 	- A with 1 tab