Skip to content

Move the Diagnostic-related types back to the SwiftSyntax module #321

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 6, 2021
Merged

Move the Diagnostic-related types back to the SwiftSyntax module #321

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
4 changes: 1 addition & 3 deletions Sources/SwiftSyntaxParser/Diagnostic.swift → Sources/SwiftSyntax/Diagnostic.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
// This file provides the Diagnostic, Note, and FixIt types.
//===----------------------------------------------------------------------===//

import SwiftSyntax

/// A FixIt represents a change to source code in order to "correct" a
/// diagnostic.
public enum FixIt: Codable, CustomDebugStringConvertible {
Expand Down Expand Up @@ -108,7 +106,7 @@ public struct Note: Codable {
public let fixIts: [FixIt]

/// Constructs a new Note from the constituent parts.
internal init(message: Diagnostic.Message, location: SourceLocation?,
public init(message: Diagnostic.Message, location: SourceLocation?,
highlights: [SourceRange], fixIts: [FixIt]) {
precondition(message.severity == .note,
"notes can only have the `note` severity")
Expand Down
0 ...wiftSyntaxParser/DiagnosticConsumer.swift → Sources/SwiftSyntax/DiagnosticConsumer.swift
View file
Open in desktop
File renamed without changes.
5 changes: 2 additions & 3 deletions .../SwiftSyntaxParser/DiagnosticEngine.swift → Sources/SwiftSyntax/DiagnosticEngine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
//===----------------------------------------------------------------------===//

import Foundation
import SwiftSyntax

/// The DiagnosticEngine allows Swift tools to emit diagnostics.
public class DiagnosticEngine {
Expand Down Expand Up @@ -56,7 +55,7 @@ public class DiagnosticEngine {
}
}

internal var needsLineColumn: Bool {
public var needsLineColumn: Bool {
// Check if any consumer is interested in line and column.
return consumers.first { $0.needsLineColumn } != nil
}
Expand All @@ -71,7 +70,7 @@ public class DiagnosticEngine {
}
}

internal func diagnose(_ diagnostic: Diagnostic) {
public func diagnose(_ diagnostic: Diagnostic) {
diagnostics.append(diagnostic)
for consumer in consumers {
consumer.handle(diagnostic)
Expand Down
1 change: 0 additions & 1 deletion ...SyntaxParser/JSONDiagnosticConsumer.swift → .../SwiftSyntax/JSONDiagnosticConsumer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
//===----------------------------------------------------------------------===//

import Foundation
import SwiftSyntax

public final class JSONDiagnosticConsumer: DiagnosticConsumer {
/// Enumerates the possible places this consumer might output diagnostics.
Expand Down
0 ...axParser/PrintingDiagnosticConsumer.swift → ...ftSyntax/PrintingDiagnosticConsumer.swift
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions utils/group.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@
],
"Parse": [
"IncrementalParseTransition.swift",
"Diagnostic.swift",
"DiagnosticEngine.swift",
"DiagnosticConsumer.swift",
"JSONDiagnosticConsumer.swift",
"PrintingDiagnosticConsumer.swift"
],
"Internal": [
"_SyntaxParserInterop.swift",
Expand Down