Commit `5d3019a3c9`

5d3019a3c99437780e1c4a6c913a9afbaca3b13f

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-05 03:30 UTC

Match org's heading and keyword rules

Layout: unified · split

Sources/OrgCore/Parser/Lines.swift +3 −2

 private func lineClass(_ rest: Substring, columnZero: Bool) -> LineClass {
     let trimmed = rest.trimmingTrailingWhitespace
+    // As org's `org-outline-regexp`: stars and then a space. A lone `*`, or stars before a tab,
+    // is not a heading.
     if columnZero, rest.first == "*" {
         let stars = rest.prefix { $0 == "*" }
-        let after = rest.dropFirst(stars.count)
+        if rest.dropFirst(stars.count).first == " " {
-        if after.isEmpty || after.first == " " || after.first == "\t" {
             return .heading(level: stars.count)
         }
     }

Sources/OrgCore/Parser/Parser.swift +3 −1

         builder.token(.stars, stars)
         rest = whitespace(rest.dropFirst(stars.count))
+        // As org: a keyword counts only before a space or the end of the line, not a tab.
         let word = rest.prefix { $0 != " " && $0 != "\t" }
-        if !word.isEmpty, settings.todoKeywordNames.contains(String(word)) {
+        let afterWord = rest.dropFirst(word.count).first
+        if !word.isEmpty, afterWord == nil || afterWord == " ", settings.todoKeywordNames.contains(String(word)) {
             builder.token(.todoKeyword, word)
             rest = whitespace(rest.dropFirst(word.count))
         }

Tests/OrgCoreTests/LinesTests.swift +3 −1

         ("   \t", .blank),
         ("* a", .heading(level: 1)),
         ("*** ", .heading(level: 3)),
-        ("*", .heading(level: 1)),
+        ("*", .plain),
+        ("*\ttab", .plain),
+        ("* ", .heading(level: 1)),
         ("*bold* text", .plain),
         (" * a", .listItem),
         ("#+BEGIN_SRC sh :results output", .blockBegin(name: "src")),

Tests/OrgCoreTests/ParserSectionTests.swift +6

         #expect(todo == ["NEXT"])
     }
+    @Test func todoKeywordNeedsASpaceAfterIt() {
+        #expect(tokens(of: .heading, in: "* TODO a\n").contains { $0.kind == .todoKeyword })
+        #expect(tokens(of: .heading, in: "* TODO\n").contains { $0.kind == .todoKeyword })
+        #expect(!tokens(of: .heading, in: "* TODO\ta\n").contains { $0.kind == .todoKeyword })
+    }
     @Test func priorityNeedsValidValueAndSpace() {
         #expect(tokens(of: .heading, in: "* [#B] x\n").contains { $0.kind == .priority })
         #expect(tokens(of: .heading, in: "* [#10] x\n").contains { $0.kind == .priority })

Commit 5d3019a3c9