8000 Sync swift-5.0-branch with master. by nkcsgexi · Pull Request #42 · swiftlang/swift-syntax · GitHub
[go: up one dir, main page]
Skip to content

Sync swift-5.0-branch with master. #42

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 17 commits into from
Nov 15, 2018
Merged

Sync swift-5.0-branch with master. #42

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6b8261e
add doc-comments for visitor.
nkcsgexi Nov 12, 2018
9457fd7
Merge pull request #34 from nkcsgexi/visitor-doc
nkcsgexi Nov 12, 2018
0dc30ef
use IUO for known optional cases.
nkcsgexi Nov 13, 2018
98c080c
Using enum case instead of boolean value to indicate how SyntaxVisito…
nkcsgexi Nov 13, 2018
817c872
Add swift-tools-version comment to README example
kastiglione Nov 14, 2018
63034c2
Merge pull request #36 from kastiglione/patch-1
nkcsgexi Nov 14, 2018
8b06475
Properly compute start location after leading trivia
Nov 14, 2018
ec3e78e
Use .exact instead of .branch in README
kastiglione Nov 14, 2018
d62ad83
Merge pull request #35 from nkcsgexi/enum-visit
nkcsgexi Nov 14, 2018
efecb4f
Merge pull request #38 from kastiglione/patch-2
nkcsgexi Nov 14, 2018
2d032c5
Merge pull request #37 from harlanhaskins/trivial-pursuit
Nov 14, 2018
6a295a9
Add an API for unkown checking.
nkcsgexi Nov 14, 2018
de92a86
Merge pull request #39 from nkcsgexi/isunknown
nkcsgexi Nov 15, 2018
ef680b0
add a SyntaxVerifier to assert no unknown syntax in a fully parsed tree.
nkcsgexi Nov 15, 2018
36dbcbe
Merge pull request #40 from nkcsgexi/verifier
nkcsgexi Nov 15, 2018
f3c5edc
NFC: make SyntaxVerifier more swifty.
nkcsgexi Nov 15, 2018
9004282
Merge pull request #41 from nkcsgexi/comments-verifier
nkcsgexi Nov 15, 2018
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
6 changes: 3 additions & 3 deletions Sources/SwiftSyntax/Syntax.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,9 +239,9 @@ extension Syntax {
in file: URL,
afterLeadingTrivia: Bool = true
) -> SourceLocation {
let pos = afterLeadingTrivia ?
data.position :
data.positionAfterSkippingLeadingTrivia
let pos = afterLeadingTrivia ?
data.positionAfterSkippingLeadingTrivia :
data.position
return SourceLocation(file: file.path, position: pos)
}

Expand Down
26 changes: 26 additions & 0 deletions Tests/SwiftSyntaxTest/AbsolutePosition.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class AbsolutePositionTestCase: XCTestCase {
("testTrivias", testTrivias),
("testImplicit", testImplicit),
("testWithoutSourceFileRoot", testWithoutSourceFileRoot),
("testSourceLocation", testSourceLocation),
]

public func testVisitor() {
Expand Down Expand Up @@ -139,4 +140,29 @@ public class AbsolutePositionTestCase: XCTestCase {
XCTAssertEqual(0, item.position.utf8Offset)
XCTAssertEqual(1, item.positionAfterSkippingLeadingTrivia.utf8Offset)
}

public func testSourceLocation() {
let url = URL(fileURLWithPath: "/tmp/test.swift")
let root = self.createSourceFile(2)
guard let secondReturnStmt = root.child(at: 0)?.child(at: 1) else {
fatalError("out of sync with createSourceFile")
}
let startLoc = secondReturnStmt.startLocation(in: url)
XCTAssertEqual(startLoc.line, 4)
XCTAssertEqual(startLoc.column, 18)

let startLocBeforeTrivia =
secondReturnStmt.startLocation(in: url, afterLeadingTrivia: false)
XCTAssertEqual(startLocBeforeTrivia.line, 3)
XCTAssertEqual(startLocBeforeTrivia.column, 1)

let endLoc = secondReturnStmt.endLocation(in: url)
XCTAssertEqual(endLoc.line, 4)
XCTAssertEqual(endLoc.column, 24)

let endLocAfterTrivia =
secondReturnStmt.endLocation(in: url, afterTrailingTrivia: true)
XCTAssertEqual(endLocAfterTrivia.line, 5)
XCTAssertEqual(endLocAfterTrivia.column, 1)
}
}
0