Skip to content

Commit 0e8a1db

Browse files
nicklockwoodnicklockwood
committed
Update formatting
1 parent 274d5d8 commit 0e8a1db

39 files changed

+477
-422
lines changed

‎.swiftformat‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
--ifdef no-indent
1111
--self init-only
1212
--shortoptionals except-properties
13-
# --wraparguments before-first
13+
--wraparguments before-first
1414
--wrapparameters before-first
1515
--wrapcollections before-first
1616
--wrapconditions after-first
@@ -20,9 +20,17 @@
2020

2121
--lintonly unusedArguments
2222
--lintonly unusedPrivateDeclarations
23+
--enable emptyExtensions
2324
--enable isEmpty
2425
# --enable docComments
25-
--enable throwingTests
26+
--enable noForceTryInTests
27+
--enable noForceUnwrapInTests
28+
# --enable noGuardInTests
29+
--enable preferFinalClasses
30+
--enable redundantAsync
31+
--enable redundantThrows
2632
--enable redundantProperty
2733
--enable redundantEquatable
2834
--enable redundantMemberwiseInit
35+
--enable redundantProperty
36+

‎ShapeScript/Interpreter.swift‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,10 @@ extension RuntimeErrorType {
440440
while case let .tuple(values) = value, values.count == 1 {
441441
value = values[0]
442442
}
443-
assert(!value.members.contains(name),
444-
"\(value.errorDescription) should have member '\(name)'")
443+
assert(
444+
!value.members.contains(name),
445+
"\(value.errorDescription) should have member '\(name)'"
446+
)
445447
return unknownMember(name, of: value.errorDescription, options: value.members)
446448
}
447449

@@ -992,10 +994,12 @@ extension Statement {
992994
return nil
993995
}() {
994996
return try context.define(name, as: .option(
995-
evaluateParameter(parameter,
996-
as: type,
997-
for: identifier,
998-
in: context)
997+
evaluateParameter(
998+
parameter,
999+
as: type,
1000+
for: identifier,
1001+
in: context
1002+
)
9991003
))
10001004
}
10011005
guard let symbol = context.symbol(for: name) else {
@@ -1006,10 +1010,12 @@ extension Statement {
10061010
}
10071011
switch symbol {
10081012
case let .function((parameterType, _), fn):
1009-
let argument = try evaluateParameter(parameter,
1010-
as: parameterType,
1011-
for: identifier,
1012-
in: context)
1013+
let argument = try evaluateParameter(
1014+
parameter,
1015+
as: parameterType,
1016+
for: identifier,
1017+
in: context
1018+
)
10131019
try RuntimeError.wrap(context.addValue(fn(argument, context)), at: range)
10141020
case let .property(type, setter, getter):
10151021
if parameter == nil {
@@ -1022,10 +1028,12 @@ extension Statement {
10221028
}
10231029
}
10241030
}
1025-
let argument = try evaluateParameter(parameter,
1026-
as: type,
1027-
for: identifier,
1028-
in: context)
1031+
let argument = try evaluateParameter(
1032+
parameter,
1033+
as: type,
1034+
for: identifier,
1035+
in: context
1036+
)
10291037
try RuntimeError.wrap(setter(argument, context), at: range)
10301038
case let .block(type, fn):
10311039
if let parameter {
@@ -1485,8 +1493,10 @@ extension Expression {
14851493
case let .member(expression, member):
14861494
let value = try expression.evaluate(in: context)
14871495
if let memberValue = value[member.name, context.isCancelled] {
1488-
assert(value.hasMember(member.name),
1489-
"\(value.errorDescription) does not have member '\(member.name)'")
1496+
assert(
1497+
value.hasMember(member.name),
1498+
"\(value.errorDescription) does not have member '\(member.name)'"
1499+
)
14901500
return memberValue
14911501
}
14921502
throw RuntimeError(.unknownMember(member.name, of: value), at: member.range)

‎ShapeScript/Parser.swift‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,11 @@ private extension ArraySlice where Element == Token {
433433
range: range.upperBound ..< nextToken.range.lowerBound
434434
)
435435
range = range.lowerBound ..< nextToken.range.upperBound
436-
try requireToken(.rparen, as: expression.type == .tuple([]) ?
437-
"expression" : TokenType.rparen.errorDescription)
436+
try requireToken(
437+
.rparen,
438+
as: expression.type == .tuple([]) ?
439+
"expression" : TokenType.rparen.errorDescription
440+
)
438441
switch expression.type {
439442
case .tuple:
440443
type = expression.type

‎ShapeScript/String+Matching.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ extension String {
4747
if lhs[i - 1] == rhs[j - 1] {
4848
dist[i].append(dist[i - 1][j - 1])
4949
} else {
50-
dist[i].append(Swift.min(dist[i - 1][j] + 1,
51-
dist[i][j - 1] + 1,
52-
dist[i - 1][j - 1] + 1))
50+
dist[i].append(Swift.min(
51+
dist[i - 1][j] + 1,
52+
dist[i][j - 1] + 1,
53+
dist[i - 1][j - 1] + 1
54+
))
5355
}
5456
if i > 1, j > 1, lhs[i - 1] == rhs[j - 2], lhs[i - 2] == rhs[j - 1] {
5557
dist[i][j] = Swift.min(dist[i][j], dist[i - 2][j - 2] + 1)

‎ShapeScriptTests/GeometryTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Euclid
1010
@testable import ShapeScript
1111
import XCTest
1212

13-
class GeometryTests: XCTestCase {
13+
final class GeometryTests: XCTestCase {
1414
// MARK: Bounds
1515

1616
func testGroupOfShapeCameraBoundsNotEmpty() {

‎ShapeScriptTests/ImportExportTests.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import XCTest
1414
import SceneKit
1515
#endif
1616

17-
class ImportExportTests: XCTestCase {
17+
final class ImportExportTests: XCTestCase {
1818
// MARK: Geometry
1919

2020
func testCog() throws {
@@ -86,7 +86,7 @@ class ImportExportTests: XCTestCase {
8686
]
8787
"""
8888
let json = try JSONSerialization
89-
.jsonObject(with: source.data(using: .utf8)!)
89+
.jsonObject(with: XCTUnwrap(source.data(using: .utf8)))
9090
let value = Value(json: json)
9191
XCTAssertEqual(value, [
9292
"hello",
@@ -110,7 +110,7 @@ class ImportExportTests: XCTestCase {
110110
"foo"
111111
]
112112
"""
113-
XCTAssertThrowsError(try Value(jsonData: json.data(using: .utf8)!)) { error in
113+
XCTAssertThrowsError(try Value(jsonData: XCTUnwrap(json.data(using: .utf8)))) { error in
114114
let error = try? XCTUnwrap(error as? ParserError)
115115
guard case let .custom(message, _, range)? = error?.type else {
116116
XCTFail()

0 commit comments

Comments
 (0)