File tree Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Expand file tree Collapse file tree 5 files changed +17
-7
lines changed Original file line number Diff line number Diff line change @@ -170,7 +170,7 @@ extension RawSyntax {
170
170
var tokenLeadingRawTriviaPieces : [ RawTriviaPiece ] {
171
171
switch rawData. payload {
172
172
case . parsedToken( let dat) :
173
- return self . arena. parseTrivia ( source: dat. leadingTriviaText, isTrailing : false )
173
+ return self . arena. parseTrivia ( source: dat. leadingTriviaText, position : . leading )
174
174
case . materializedToken( let dat) :
175
175
return Array ( dat. leadingTrivia)
176
176
case . layout( _) :
@@ -181,7 +181,7 @@ extension RawSyntax {
181
181
var tokenTrailingRawTriviaPieces : [ RawTriviaPiece ] {
182
182
switch rawData. payload {
183
183
case . parsedToken( let dat) :
184
- return self . arena. parseTrivia ( source: dat. trailingTriviaText, isTrailing : false )
184
+ return self . arena. parseTrivia ( source: dat. trailingTriviaText, position : . trailing )
185
185
case . materializedToken( let dat) :
186
186
return Array ( dat. trailingTrivia)
187
187
case . layout( _) :
Original file line number Diff line number Diff line change 13
13
public class SyntaxArena {
14
14
15
15
@_spi ( RawSyntax)
16
- public typealias ParseTriviaFunction = ( _ source: SyntaxText , _ isTrailing : Bool ) -> [ RawTriviaPiece ]
16
+ public typealias ParseTriviaFunction = ( _ source: SyntaxText , _ position : TriviaPosition ) -> [ RawTriviaPiece ]
17
17
18
18
/// Bump-pointer allocator for all "intern" methods.
19
19
private var allocator : BumpPtrAllocator
@@ -158,8 +158,8 @@ public class SyntaxArena {
158
158
}
159
159
160
160
@_spi ( RawSyntax)
161
- public func parseTrivia( source: SyntaxText , isTrailing : Bool ) -> [ RawTriviaPiece ] {
162
- return parseTriviaFunction ( source, isTrailing )
161
+ public func parseTrivia( source: SyntaxText , position : TriviaPosition ) -> [ RawTriviaPiece ] {
162
+ return self . parseTriviaFunction ( source, position )
163
163
}
164
164
}
165
165
@@ -201,6 +201,6 @@ extension SyntaxArena {
201
201
public static let `default` = SyntaxArena ( )
202
202
}
203
203
204
- private func _defaultParseTriviaFunction( _ source: SyntaxText , _ isTrailnig : Bool ) -> [ RawTriviaPiece ] {
204
+ private func _defaultParseTriviaFunction( _ source: SyntaxText , _ position : TriviaPosition ) -> [ RawTriviaPiece ] {
205
205
preconditionFailure ( " Trivia parsing not supported " )
206
206
}
Original file line number Diff line number Diff line change 17
17
//
18
18
//===----------------------------------------------------------------------===//
19
19
20
+ public enum TriviaPosition {
21
+ case leading
22
+ case trailing
23
+ }
24
+
20
25
/// A contiguous stretch of a single kind of trivia. The constituent part of
21
26
/// a `Trivia` collection.
22
27
///
Original file line number Diff line number Diff line change 12
12
//
13
13
//===----------------------------------------------------------------------===//
14
14
15
+ public enum TriviaPosition {
16
+ case leading
17
+ case trailing
18
+ }
19
+
15
20
/// A contiguous stretch of a single kind of trivia. The constituent part of
16
21
/// a `Trivia` collection.
17
22
///
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ final class RawSyntaxTests: XCTestCase {
82
82
83
83
func testParsedToken( ) throws {
84
84
// Dummy trivia parsing function.
85
- func dummyParseToken( source: SyntaxText , isTrailing : Bool ) -> [ RawTriviaPiece ] {
85
+ func dummyParseToken( source: SyntaxText , position : TriviaPosition ) -> [ RawTriviaPiece ] {
86
86
// Emit a single `unexpectedText` trivia of the whole trivia text.
87
87
return [ . unexpectedText( source) ]
88
88
}
You can’t perform that action at this time.
0 commit comments