Don’t fatalError when calling splitToSingleLineRanges on a range that exceeds past the document

ahoppen · ahoppen · commit e3bc5610771c · 2024-04-04T11:05:53.000-07:00
diff --git a/Sources/SourceKitLSP/Swift/SyntaxHighlightingTokenParser.swift b/Sources/SourceKitLSP/Swift/SyntaxHighlightingTokenParser.swift
@@ -206,7 +206,7 @@ struct SyntaxHighlightingTokenParser {
   }
 }
 
-extension Range where Bound == Position {
+extension Range<Position> {
   /// Splits a potentially multi-line range to multiple single-line ranges.
   func splitToSingleLineRanges(in snapshot: DocumentSnapshot) -> [Self] {
     if isEmpty {
@@ -220,7 +220,8 @@ extension Range where Bound == Position {
     guard let startIndex = snapshot.index(of: lowerBound),
       let endIndex = snapshot.index(of: upperBound)
     else {
-      fatalError("Range \(self) reaches outside of the document")
+      logger.fault("Range \(self) reaches outside of the document")
+      return [self]
     }
 
     let text = snapshot.text[startIndex..<endIndex]

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ struct SyntaxHighlightingTokenParser {`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`-extension Range where Bound == Position {`
	`209`	`+extension Range<Position> {`
`210`	`210`	`/// Splits a potentially multi-line range to multiple single-line ranges.`
`211`	`211`	`func splitToSingleLineRanges(in snapshot: DocumentSnapshot) -> [Self] {`
`212`	`212`	`if isEmpty {`
`@@ -220,7 +220,8 @@ extension Range where Bound == Position {`
`220`	`220`	`guard let startIndex = snapshot.index(of: lowerBound),`
`221`	`221`	`let endIndex = snapshot.index(of: upperBound)`
`222`	`222`	`else {`
`223`		`- fatalError("Range \(self) reaches outside of the document")`
	`223`	`+ logger.fault("Range \(self) reaches outside of the document")`
	`224`	`+ return [self]`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`let text = snapshot.text[startIndex..<endIndex]`