Skip to content

Output a --- marker to mark the end of a log message in NonDarwinLogger #919

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 1 commit into from
Oct 25, 2023
Merged

Output a --- marker to mark the end of a log message in NonDarwinLogger #919

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
1 change: 1 addition & 0 deletions Sources/LSPLogging/NonDarwinLogging.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ public struct NonDarwinLogger {
"""
[\(subsystem):\(category)] \(level) \(dateFormatter.string(from: date))
\(message().value.string(for: self.privacyLevel))
---
"""
)
}
Expand Down
8 changes: 6 additions & 2 deletions Tests/LSPLoggingTests/LoggingTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ fileprivate func assertLogging(
)
continue
}
let messageContent = String(message[message.index(after: firstNewline)...])
guard message.hasSuffix("\n---") else {
XCTFail("Message is expected to end with `---`", file: file, line: line)
return
}
let messageContent = String(message[message.index(after: firstNewline)...].dropLast(4))
XCTAssertEqual(messageContent, expected, "Message does not match expected", file: file, line: line)
}

Expand All @@ -82,7 +86,7 @@ final class LoggingTests: XCTestCase {
message.starts(with: "[org.swift.sourcekit-lsp:test] error"),
"Message did not have expected header. Received \n\(message)"
)
XCTAssert(message.hasSuffix("\nmy message"), "Message did not have expected body. Received \n\(message)")
XCTAssert(message.hasSuffix("\nmy message\n---"), "Message did not have expected body. Received \n\(message)")
}

func testLoggingBasic() {
Expand Down