Skip to content

Commit a4ef050

Browse files
committed
Remove try before Parser.parse calls.
As of swiftlang/swift-syntax#912, this call no longer throws.
1 parent 07c7442 commit a4ef050

File tree

8 files changed

+12
-46
lines changed

8 files changed

+12
-46
lines changed

Sources/SwiftFormat/Parsing.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func parseAndEmitDiagnostics(
3838
parsingDiagnosticHandler: ((Diagnostic, SourceLocation) -> Void)? = nil
3939
) throws -> SourceFileSyntax {
4040
let sourceFile =
41-
try operatorTable.foldAll(Parser.parse(source: source)) { _ in }.as(SourceFileSyntax.self)!
41+
operatorTable.foldAll(Parser.parse(source: source)) { _ in }.as(SourceFileSyntax.self)!
4242

4343
let diagnostics = ParseDiagnosticsGenerator.diagnostics(for: sourceFile)
4444
if let parsingDiagnosticHandler = parsingDiagnosticHandler {

Sources/generate-pipeline/RuleCollector.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ final class RuleCollector {
5858

5959
let fileURL = url.appendingPathComponent(baseName)
6060
let fileInput = try String(contentsOf: fileURL)
61-
let sourceFile = try Parser.parse(source: fileInput)
61+
let sourceFile = Parser.parse(source: fileInput)
6262

6363
for statement in sourceFile.statements {
6464
guard let detectedRule = self.detectedRule(at: statement) else { continue }

Tests/SwiftFormatCoreTests/RuleMaskTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ final class RuleMaskTests: XCTestCase {
1212
private func createMask(sourceText: String) -> RuleMask {
1313
let fileURL = URL(fileURLWithPath: "/tmp/test.swift")
1414
converter = SourceLocationConverter(file: fileURL.path, source: sourceText)
15-
let syntax = try! Parser.parse(source: sourceText)
15+
let syntax = Parser.parse(source: sourceText)
1616
return RuleMask(syntaxNode: Syntax(syntax), sourceLocationConverter: converter)
1717
}
1818

Tests/SwiftFormatPerformanceTests/WhitespaceLinterPerformanceTests.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,7 @@ final class WhitespaceLinterPerformanceTests: DiagnosingTestCase {
5656
/// - input: The user's input text.
5757
/// - expected: The formatted text.
5858
private func performWhitespaceLint(input: String, expected: String) {
59-
let sourceFileSyntax: SourceFileSyntax
60-
do {
61-
sourceFileSyntax = try Parser.parse(source: input)
62-
} catch {
63-
XCTFail("Parsing failed with error: \(error)")
64-
return
65-
}
66-
59+
let sourceFileSyntax = Parser.parse(source: input)
6760
let context = makeContext(sourceFileSyntax: sourceFileSyntax)
6861
let linter = WhitespaceLinter(user: input, formatted: expected, context: context)
6962
linter.lint()

Tests/SwiftFormatPrettyPrintTests/PrettyPrintTestCase.swift

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,10 @@ class PrettyPrintTestCase: DiagnosingTestCase {
6565
private func prettyPrintedSource(
6666
_ source: String, configuration: Configuration, whitespaceOnly: Bool
6767
) -> String? {
68-
let sourceFileSyntax: SourceFileSyntax
69-
do {
70-
// Ignore folding errors for unrecognized operators so that we fallback to a reasonable
71-
// default instead of throwing an error.
72-
sourceFileSyntax =
73-
try OperatorTable.standardOperators.foldAll(Parser.parse(source: source)) { _ in }
74-
.as(SourceFileSyntax.self)!
75-
} catch {
76-
XCTFail("Parsing failed with error: \(error)")
77-
return nil
78-
}
79-
68+
// Ignore folding errors for unrecognized operators so that we fallback to a reasonable default.
69+
let sourceFileSyntax =
70+
OperatorTable.standardOperators.foldAll(Parser.parse(source: source)) { _ in }
71+
.as(SourceFileSyntax.self)!
8072
let context = makeContext(sourceFileSyntax: sourceFileSyntax, configuration: configuration)
8173
let printer = PrettyPrinter(
8274
context: context,

Tests/SwiftFormatRulesTests/ImportsXCTestVisitorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class ImportsXCTestVisitorTests: DiagnosingTestCase {
4949
/// Parses the given source, makes a new `Context`, then populates and returns its `XCTest`
5050
/// import state.
5151
private func makeContextAndSetImportsXCTest(source: String) throws -> Context.XCTestImportState {
52-
let sourceFile = try Parser.parse(source: source)
52+
let sourceFile = Parser.parse(source: source)
5353
let context = makeContext(sourceFileSyntax: sourceFile)
5454
setImportsXCTest(context: context, sourceFile: sourceFile)
5555
return context.importsXCTest

Tests/SwiftFormatRulesTests/LintOrFormatRuleTestCase.swift

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
1919
file: StaticString = #file,
2020
line: UInt = #line
2121
) {
22-
let sourceFileSyntax: SourceFileSyntax
23-
do {
24-
sourceFileSyntax = try Parser.parse(source: input)
25-
} catch {
26-
XCTFail("\(error)", file: file, line: line)
27-
return
28-
}
22+
let sourceFileSyntax = Parser.parse(source: input)
2923

3024
// Force the rule to be enabled while we test it.
3125
var configuration = Configuration()
@@ -62,13 +56,7 @@ class LintOrFormatRuleTestCase: DiagnosingTestCase {
6256
file: StaticString = #file,
6357
line: UInt = #line
6458
) {
65-
let sourceFileSyntax: SourceFileSyntax
66-
do {
67-
sourceFileSyntax = try Parser.parse(source: input)
68-
} catch {
69-
XCTFail("\(error)", file: file, line: line)
70-
return
71-
}
59+
let sourceFileSyntax = Parser.parse(source: input)
7260

7361
// Force the rule to be enabled while we test it.
7462
var configuration = configuration ?? Configuration()

Tests/SwiftFormatWhitespaceLinterTests/WhitespaceTestCase.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,7 @@ class WhitespaceTestCase: DiagnosingTestCase {
2020
/// - expected: The formatted text.
2121
/// - linelength: The maximum allowed line length of the output.
2222
final func performWhitespaceLint(input: String, expected: String, linelength: Int? = nil) {
23-
let sourceFileSyntax: SourceFileSyntax
24-
do {
25-
sourceFileSyntax = try Parser.parse(source: input)
26-
} catch {
27-
XCTFail("Parsing failed with error: \(error)")
28-
return
29-
}
30-
23+
let sourceFileSyntax = Parser.parse(source: input)
3124
var configuration = Configuration()
3225
if let linelength = linelength {
3326
configuration.lineLength = linelength

0 commit comments

Comments
 (0)