Skip to content

Fix Setext heading loop termination #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2025
Merged

Fix Setext heading loop termination #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e5b27
Fix Setext heading loop termination
DongyuZhao Jul 15, 2025
c5177d7
Fix heading whitespace and table cells
DongyuZhao Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions Sources/SwiftParser/Languages/MarkdownLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,9 +324,9 @@ public struct MarkdownLanguage: CodeLanguage {
processed.append(tok)
}

let value = processed.map { $0.text }.joined()
let trimmedValue = processed.map { $0.text }.joined().trimmingCharacters(in: .whitespaces)
let children = MarkdownLanguage.parseInlineTokens(processed, input: context.input)
let node = MarkdownHeadingNode(value: value, level: count)
let node = MarkdownHeadingNode(value: trimmedValue, level: count)
children.forEach { node.addChild($0) }
context.currentNode.addChild(node)
}
Expand Down Expand Up @@ -376,7 +376,10 @@ public struct MarkdownLanguage: CodeLanguage {
default:
return false
}
if idx < context.tokens.count, let next = context.tokens[idx] as? Token, case .newline = next { break }
if idx < context.tokens.count, let next = context.tokens[idx] as? Token {
if case .newline = next { break }
if case .eof = next { break }
}
}
if count == 0 { return false }
if idx < context.tokens.count, let endTok = context.tokens[idx] as? Token {
Expand Down Expand Up @@ -1053,13 +1056,9 @@ public struct MarkdownLanguage: CodeLanguage {
cells.append(cell.trimmingCharacters(in: .whitespaces))
cell = ""
context.index += 1
case .newline:
cells.append(cell.trimmingCharacters(in: .whitespaces))
context.index += 1
context.currentNode.addChild(MarkdownTableNode(value: cells.joined(separator: "|")))
return
case .eof:
case .newline, .eof:
cells.append(cell.trimmingCharacters(in: .whitespaces))
if let last = cells.last, last.isEmpty { cells.removeLast() }
context.index += 1
context.currentNode.addChild(MarkdownTableNode(value: cells.joined(separator: "|")))
return
Expand Down