Skip to content

Fix JSONC comment skipper for CRLF line endings #4869

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
lawrencecchen merged 3 commits into from
May 27, 2026
Merged

Fix JSONC comment skipper for CRLF line endings #4869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d61d4f
Fix JSONC // comment skipper for CRLF line endings
lawrencecchen May 27, 2026
c558db4
Allow workflow_dispatch to run tmux corpus terminal-nightly
lawrencecchen May 27, 2026
a7ef5d6
Fix JSONC editor indent detection for CRLF line endings
lawrencecchen May 27, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/tmux-corpus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
done

terminal-nightly:
if: github.event_name == 'schedule'
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
runs-on: [self-hosted, warp-macos-15-arm64-6x]
timeout-minutes: 30
steps:
Expand Down
16 changes: 12 additions & 4 deletions Sources/JSONCParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ enum JSONCParser {
}
}

static func isLineTerminator(_ character: Character) -> Bool {
// Swift treats "\r\n" as a single extended grapheme cluster, so comparing
// against "\n" alone misses CRLF line endings and would let line comments
// run to end-of-file. Match any character whose first scalar is CR or LF.
guard let scalar = character.unicodeScalars.first else { return false }
return scalar == "\n" || scalar == "\r"
}

private static func stripComments(from source: String) throws -> String {
var result = ""
var index = source.startIndex
Expand Down Expand Up @@ -112,7 +120,7 @@ enum JSONCParser {
let next = source[nextIndex]
if next == "/" {
index = source.index(after: nextIndex)
while index < source.endIndex && source[index] != "\n" {
while index < source.endIndex && !JSONCParser.isLineTerminator(source[index]) {
index = source.index(after: index)
}
continue
Expand Down Expand Up @@ -355,7 +363,7 @@ enum JSONCObjectEditor {
let next = source.index(after: index)
if next < source.endIndex, source[next] == "/" {
index = source.index(after: next)
while index < source.endIndex, source[index] != "\n" {
while index < source.endIndex, !JSONCParser.isLineTerminator(source[index]) {
index = source.index(after: index)
}
continue
Expand Down Expand Up @@ -452,7 +460,7 @@ enum JSONCObjectEditor {
let next = source.index(after: index)
if next < source.endIndex, source[next] == "/" {
index = source.index(after: next)
while index < source.endIndex, source[index] != "\n" {
while index < source.endIndex, !JSONCParser.isLineTerminator(source[index]) {
index = source.index(after: index)
}
continue
Expand Down Expand Up @@ -483,7 +491,7 @@ enum JSONCObjectEditor {
var lineStart = index
while lineStart > source.startIndex {
let previous = source.index(before: lineStart)
if source[previous] == "\n" || source[previous] == "\r" {
if JSONCParser.isLineTerminator(source[previous]) {
break
}
lineStart = previous
Expand Down
Loading