Commit `15dd64c4f2`

15dd64c4f2752dbdb7d31156ef6fb4d5dc1a60b8

parent: f727fd9a17

Verified · cmc

cmc <hello@cleberg.net> · 2026-10-08 03:38 UTC

TYP_TODO keywords go to the done keyword on C-c C-t

As org-todo: a type keyword goes to its sequence's first done keyword,
and only a repeated C-c C-t moves to the next type.

Layout: unified · split

Sources/OrgCore/Commands/HeadingCommands.swift +7 −4

         entryHeading(at: context.caret, in: context.tree) != nil
     }
-    /// No keyword, then each keyword of its sequence in order, then no keyword again.
+    /// No keyword, then each keyword of its sequence in order, then no keyword again. A
-    static func next(after current: String?, in settings: OrgSettings) -> String? {
+    /// `#+TYP_TODO` keyword goes to the sequence's first done keyword unless `repeated` (the
+    /// previous command was also this one, `this-command` eq `last-command` in `org-todo`).
+    static func next(after current: String?, in settings: OrgSettings, repeated: Bool) -> String? {
         guard let current else {
             guard let first = settings.todoSequences.first else { return nil }
             return (first.active + first.done).first?.name
         for sequence in settings.todoSequences {
             let names = (sequence.active + sequence.done).map(\.name)
             if let index = names.firstIndex(of: current) {
-                return index + 1 < names.count ? names[index + 1] : nil
+                guard index + 1 < names.count else { return nil }
+                return sequence.kind == .type && !repeated ? sequence.done.first?.name : names[index + 1]
             }
         }
         return nil
             return .failed("Before first headline")
         }
         let line = HeadingLine(heading)
-        let next = Self.next(after: line.todo?.text, in: context.tree.settings)
+        let next = Self.next(after: line.todo?.text, in: context.tree.settings, repeated: context.lastCommand == id)
         return line.commit(context) { buffer in
             let text = buffer.string as NSString
             let regionStart = line.stars.upperBound - line.start

Tests/OrgCoreTests/HeadingCommandTests.swift +29

	@@ -13,6 +13,35 @@ struct HeadingCommandTests {
13	#expect(runCommand(cycle, "text\n", caret: 1).failure != nil)	13	#expect(runCommand(cycle, "text\n", caret: 1).failure != nil)
14	}	14	}
15		15
		16	/// `#+TYP_TODO`: a first C-c C-t goes to the done keyword, a repeated one to the next type.
		17	@Test(.enabled(if: ProcessInfo.processInfo.environment["ORGSTAR_SKIP_ORACLE"] == nil))
		18	func typeKeywordsMatchEmacs() throws {
		19	let texts = [
		20	"#+TYP_TODO: Fred Sara Lucy \| DONE\n* Fred a\n", "#+TYP_TODO: Fred Sara Lucy \| DONE\n* Sara a\n",
		21	"#+TYP_TODO: Fred Sara Lucy \| DONE\n* Lucy a\n", "#+TYP_TODO: Fred Sara Lucy \| DONE\n* DONE a\n",
		22	"#+TYP_TODO: Fred Sara \| DONE GONE\n* Sara a\n", "#+TYP_TODO: Fred Sara \| DONE GONE\n* DONE a\n",
		23	"#+TYP_TODO: Fred Sara \| DONE\n* a\n", "#+TODO: TODO \| DONE\n#+TYP_TODO: Fred Sara \| OK\n* Fred a\n",
		24	]
		25	var cases: [EmacsOracle.Case] = []
		26	var ours: [String] = []
		27	for text in texts {
		28	let caret = (text as NSString).range(of: "\n*").location + 2
		29	for repeated in [false, true] {
		30	let last = repeated ? "'org-todo" : "'other"
		31	cases.append(EmacsOracle.Case(text: text, point: EmacsOracle.point(caret, in: text), form: "(let ((this-command 'org-todo) (last-command \(last))) (org-todo))"))
		32	let context = EditContext(revision: 0, text: text, tree: OrgParser.parse(text), selection: [caret..<caret], lastCommand: repeated ? TodoCycle().id : "org.other")
		33	guard case .commit(let result) = TodoCycle().run(in: context) else { ours.append("failed"); continue }
		34	ours.append(result.edits.sorted { $0.range.lowerBound > $1.range.lowerBound }.reduce(text) { $1.apply(to: $0) })
		35	}
		36	}
		37	let emacs = try EmacsOracle.run(cases)
		38	#expect(emacs.count == ours.count)
		39	for (mine, emacs) in zip(ours, emacs) {
		40	#expect(mine == emacs.text)
		41	}
		42	#expect(ours[0].hasSuffix("* DONE a\n") && ours[1].hasSuffix("* Sara a\n"))
		43	}
		44
16	@Test func caretMovesToTheTitleWhenBeforeIt() {	45	@Test func caretMovesToTheTitleWhenBeforeIt() {
17	#expect(runCommand(TodoCycle(), "* a\n", caret: 2).caret == 7)	46	#expect(runCommand(TodoCycle(), "* a\n", caret: 2).caret == 7)
18	#expect(runCommand(TodoCycle(), "* TODO abc\nbody\n", caret: 13).caret == 13)	47	#expect(runCommand(TodoCycle(), "* TODO abc\nbody\n", caret: 13).caret == 13)

Commit 15dd64c4f2

Commit `15dd64c4f2`