Skip to content

Add structured CodeBlockNode #31

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
DongyuZhao merged 1 commit into from
Jul 15, 2025
Merged

Add structured CodeBlockNode #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions Sources/SwiftParser/Languages/MarkdownLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,15 +706,23 @@ public struct MarkdownLanguage: CodeLanguage {
fenceLength += 1
context.index += 1
}
// skip info string until end of line
// capture info string until end of line and trim whitespace
var info = ""
while context.index < context.tokens.count {
if let tok = context.tokens[context.index] as? Token, case .newline = tok {
context.index += 1
break
if let tok = context.tokens[context.index] as? Token {
if case .newline = tok {
context.index += 1
break
} else {
info += tok.text
context.index += 1
}
} else {
context.index += 1
}
}
info = info.trimmingCharacters(in: .whitespaces)
let lang = info.split(whereSeparator: { $0.isWhitespace }).first.map(String.init)

let blockStart = context.index
var text = ""
Expand All @@ -730,15 +738,15 @@ public struct MarkdownLanguage: CodeLanguage {
if count >= fenceLength {
context.index = idx
if context.index < context.tokens.count, let nl = context.tokens[context.index] as? Token, case .newline = nl { context.index += 1 }
context.currentNode.addChild(MarkdownCodeBlockNode(value: text))
context.currentNode.addChild(MarkdownCodeBlockNode(lang: lang, content: text))
return
}
}
text += tok.text
context.index += 1
} else { context.index += 1 }
}
context.currentNode.addChild(MarkdownCodeBlockNode(value: text))
context.currentNode.addChild(MarkdownCodeBlockNode(lang: lang, content: text))
}
}

Expand Down Expand Up @@ -799,7 +807,7 @@ public struct MarkdownLanguage: CodeLanguage {
text += "\n" + String(s.dropFirst(4))
context.index += 1
} else {
context.currentNode.addChild(MarkdownCodeBlockNode(value: text))
context.currentNode.addChild(MarkdownCodeBlockNode(lang: nil, content: text))
return
}
case .text(let s, _):
Expand All @@ -811,7 +819,7 @@ public struct MarkdownLanguage: CodeLanguage {
}
} else { context.index += 1 }
}
context.currentNode.addChild(MarkdownCodeBlockNode(value: text))
context.currentNode.addChild(MarkdownCodeBlockNode(lang: nil, content: text))
}
}

Expand Down
12 changes: 10 additions & 2 deletions Sources/SwiftParser/Languages/MarkdownNodes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,16 @@ public final class MarkdownStrongNode: CodeNode {
}

public final class MarkdownCodeBlockNode: CodeNode {
public init(value: String = "", range: Range<String.Index>? = nil) {
super.init(type: MarkdownLanguage.Element.codeBlock, value: value, range: range)
public let lang: String?

public var content: String {
get { value }
set { value = newValue }
}

public init(lang: String? = nil, content: String = "", range: Range<String.Index>? = nil) {
self.lang = lang
super.init(type: MarkdownLanguage.Element.codeBlock, value: content, range: range)
}
}

Expand Down
26 changes: 23 additions & 3 deletions Tests/SwiftParserTests/SwiftParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ final class SwiftParserTests: XCTestCase {
let source = "```\ncode\n```\ninline `code`"
let result = parser.parse(source, language: MarkdownLanguage())
XCTAssertEqual(result.errors.count, 0)
XCTAssertEqual(result.root.children.first?.type as? MarkdownLanguage.Element, .codeBlock)
let block = result.root.children.first as? MarkdownCodeBlockNode
XCTAssertEqual(block?.type as? MarkdownLanguage.Element, .codeBlock)
XCTAssertNil(block?.lang)
XCTAssertEqual(block?.content, "code\n")
let para = result.root.children.last
XCTAssertEqual(para?.type as? MarkdownLanguage.Element, .paragraph)
XCTAssertEqual(para?.children.last?.type as? MarkdownLanguage.Element, .inlineCode)
Expand All @@ -138,7 +141,10 @@ final class SwiftParserTests: XCTestCase {
let result = parser.parse(source, language: MarkdownLanguage())
XCTAssertEqual(result.errors.count, 0)
XCTAssertEqual(result.root.children.count, 1)
XCTAssertEqual(result.root.children.first?.type as? MarkdownLanguage.Element, .codeBlock)
let block = result.root.children.first as? MarkdownCodeBlockNode
XCTAssertEqual(block?.type as? MarkdownLanguage.Element, .codeBlock)
XCTAssertEqual(block?.lang, "swift")
XCTAssertEqual(block?.content, "print(\"hi\")\n")
}

func testMarkdownTildeCodeBlock() {
Expand All @@ -147,7 +153,21 @@ final class SwiftParserTests: XCTestCase {
let result = parser.parse(source, language: MarkdownLanguage())
XCTAssertEqual(result.errors.count, 0)
XCTAssertEqual(result.root.children.count, 1)
XCTAssertEqual(result.root.children.first?.type as? MarkdownLanguage.Element, .codeBlock)
let block = result.root.children.first as? MarkdownCodeBlockNode
XCTAssertEqual(block?.type as? MarkdownLanguage.Element, .codeBlock)
XCTAssertNil(block?.lang)
XCTAssertEqual(block?.content, "print(\"hi\")\n")
}

func testMarkdownMultiLineFencedCodeBlock() {
let parser = SwiftParser()
let source = "```swift\nprint(\"hi\")\nprint(\"bye\")\n```"
let result = parser.parse(source, language: MarkdownLanguage())
XCTAssertEqual(result.errors.count, 0)
XCTAssertEqual(result.root.children.count, 1)
let block = result.root.children.first as? MarkdownCodeBlockNode
XCTAssertEqual(block?.lang, "swift")
XCTAssertEqual(block?.content, "print(\"hi\")\nprint(\"bye\")\n")
}

func testMarkdownLink() {
Expand Down