Skip to content

[Diagnostics] Let the swift-syntax formatter handle multiple files itself #68379

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
Sep 7, 2023
Merged

[Diagnostics] Let the swift-syntax formatter handle multiple files itself #68379

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: 0 additions & 1 deletion include/swift/Frontend/PrintingDiagnosticConsumer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class PrintingDiagnosticConsumer : public DiagnosticConsumer {
/// The queued diagnostics structure.
void *queuedDiagnostics = nullptr;
llvm::DenseMap<unsigned, QueuedBuffer> queuedBuffers;
unsigned queuedDiagnosticsOutermostBufferID;

public:
PrintingDiagnosticConsumer(llvm::raw_ostream &stream = llvm::errs());
Expand Down
12 changes: 3 additions & 9 deletions lib/Frontend/PrintingDiagnosticConsumer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,16 +458,10 @@ void PrintingDiagnosticConsumer::handleDiagnostic(SourceManager &SM,
// Use the swift-syntax formatter.
auto bufferStack = getSourceBufferStack(SM, Info.Loc);
if (!bufferStack.empty()) {
// If there are no enqueued diagnostics, they are from a different
// outermost buffer, or we have hit a non-note diagnostic, flush any
// enqueued diagnostics and start fresh.
unsigned outermostBufferID = bufferStack.back();
if (!queuedDiagnostics ||
outermostBufferID != queuedDiagnosticsOutermostBufferID ||
Info.Kind != DiagnosticKind::Note) {
// If there are no enqueued diagnostics, or we have hit a non-note
// diagnostic, flush any enqueued diagnostics and start fresh.
if (!queuedDiagnostics || Info.Kind != DiagnosticKind::Note) {
flush(/*includeTrailingBreak*/ true);

queuedDiagnosticsOutermostBufferID = outermostBufferID;
queuedDiagnostics = swift_ASTGen_createQueuedDiagnostics();
}

Expand Down