Tangle :comments noweb with :noweb-ref blocks !148

merged merged by cmc on 2026-10-07 23:32 UTC · krz/orgstar:noweb-ref-comments into main

3 files changed, +21 −4

Layout: unified · split

Sources/OrgCore/Compute/Babel.swift +6 −2

                 ? try expandNoweb(other, params: otherParams, model: model, text: text, tangling: tangling, depth: depth + 1, links: links)
                 : normalizedBody(other)
             guard commenting, let links else { return b }
-            guard other.name != nil else { throw Failure.message(":comments noweb with :noweb-ref blocks isn't supported yet; nothing was tangled.") }
             // `c-wrap`: commented in this block's language, trimmed.
             func wrap(_ s: String) throws -> String {
                 try Tangle.commentRegion(s, language: block.language ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
             }
-            let (begin, end) = try links(other, otherParams)
+            var (begin, end) = try links(other.name == nil ? block : other, other.name == nil ? params : otherParams)
+            // A `:noweb-ref` block without a name: the link is the including block's, the name empty.
+            if other.name == nil {
+                if let split = begin.range(of: "][") { begin = begin[..<split.lowerBound] + "][]]" }
+                end = " ends here"
+            }
             return try wrap(begin) + "\n" + b + "\n" + (try wrap(end)) + "\n"
         }
         func inCommentedHeading(_ b: SrcBlockInfo) -> Bool {

Sources/OrgCore/Compute/Tangle.swift +5 −2

         guard let syntax = commentSyntax[language] else {
             throw Babel.Failure.message(":comments needs the comment syntax of \(language.isEmpty ? "the block's language" : language), which isn't known yet; nothing was tangled.")
         }
-        return text.components(separatedBy: "\n").map { line in
+        // The comment starts at the lines' least indentation, as `comment-region` puts it.
-            line.contains(where: { !$0.isWhitespace }) ? syntax.start + line + syntax.end : line
+        let lines = text.components(separatedBy: "\n")
+        let indent = lines.filter { $0.contains(where: { !$0.isWhitespace }) }.map { $0.prefix { $0 == " " || $0 == "\t" }.count }.min() ?? 0
+        return lines.map { line in
+            line.contains(where: { !$0.isWhitespace }) ? String(line.prefix(indent)) + syntax.start + line.dropFirst(indent) + syntax.end : line
         }.joined(separator: "\n")
     }

Tests/OrgCoreTests/TangleTests.swift +10

	@@ -143,6 +143,16 @@ struct TangleTests {
143	#+begin_src conf :tangle out.conf :comments noweb :noweb yes	143	#+begin_src conf :tangle out.conf :comments noweb :noweb yes
144	a=<<named-py>>	144	a=<<named-py>>
145	#+end_src	145	#+end_src
		146	#+begin_src sh :noweb-ref setup
		147	echo one
		148	#+end_src
		149	#+begin_src sh :noweb-ref setup
		150	echo two
		151	#+end_src
		152	#+begin_src sh :tangle refs.sh :noweb yes :comments noweb
		153	<<setup>>
		154	echo main
		155	#+end_src
146	#+begin_src lua :tangle out.lua	156	#+begin_src lua :tangle out.lua
147	x = 1	157	x = 1
148	#+end_src	158	#+end_src