Merge pull request #790 from ahoppen/ahoppen/swift-syntax-deprecations

Fix deprecation warnings

Author: ahoppen

Sources/SourceKitLSP/DocumentTokens.swift

@@ -41,7 +41,7 @@ extension DocumentSnapshot {
       return self.tokens.semantic
     }
     let range = range.flatMap({ $0.byteSourceRange(in: self) })
-             ?? ByteSourceRange(offset: 0, length: tree.byteSize)
+             ?? ByteSourceRange(offset: 0, length: tree.totalLength.utf8Length)
     return tree
       .classifications(in: range)
       .flatMap({ $0.highlightingTokens(in: self) })

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -1124,7 +1124,7 @@ extension SwiftLanguageServer {
             end: node.rightBrace.positionAfterSkippingLeadingTrivia.utf8Offset)
         }
 
-        override func visit(_ node: MemberDeclBlockSyntax) -> SyntaxVisitorContinueKind {
+        override func visit(_ node: MemberBlockSyntax) -> SyntaxVisitorContinueKind {
           return self.addFoldingRange(
             start: node.members.position.utf8Offset,
             end: node.rightBrace.positionAfterSkippingLeadingTrivia.utf8Offset)
@@ -1150,14 +1150,14 @@ extension SwiftLanguageServer {
 
         override func visit(_ node: FunctionCallExprSyntax) -> SyntaxVisitorContinueKind {
           return self.addFoldingRange(
-            start: node.argumentList.position.utf8Offset,
-            end: node.argumentList.endPosition.utf8Offset)
+            start: node.arguments.position.utf8Offset,
+            end: node.arguments.endPosition.utf8Offset)
         }
 
-        override func visit(_ node: SubscriptExprSyntax) -> SyntaxVisitorContinueKind {
+        override func visit(_ node: SubscriptCallExprSyntax) -> SyntaxVisitorContinueKind {
           return self.addFoldingRange(
-            start: node.argumentList.position.utf8Offset,
-            end: node.argumentList.endPosition.utf8Offset)
+            start: node.arguments.position.utf8Offset,
+            end: node.arguments.endPosition.utf8Offset)
         }
 
         __consuming func finalize() -> Set<FoldingRange> {

Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift

@@ -106,7 +106,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
         buildSetup: TestSourceKitServer.serverOptions.buildSetup)
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = ws.buildParameters.triple
+      let hostTriple = ws.buildParameters.targetTriple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent())
 
       XCTAssertEqual(ws.buildPath, build)
@@ -162,7 +162,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
         buildSetup: config)
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = ws.buildParameters.triple
+      let hostTriple = ws.buildParameters.targetTriple
       let build = buildPath(root: packageRoot, config: config, platform: hostTriple.platformBuildPathComponent())
 
       XCTAssertEqual(ws.buildPath, build)
@@ -349,7 +349,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
 
       let acxx = packageRoot.appending(components: "Sources", "lib", "a.cpp")
       let bcxx = packageRoot.appending(components: "Sources", "lib", "b.cpp")
-      let hostTriple = ws.buildParameters.triple
+      let hostTriple = ws.buildParameters.targetTriple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent())
 
       XCTAssertEqual(ws.buildPath, build)
@@ -427,7 +427,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
       let arguments = try ws._settings(for: aswift.asURI, .swift)!.compilerArguments
       check("-target", arguments: arguments) // Only one!
-      let hostTriple = ws.buildParameters.triple
+      let hostTriple = ws.buildParameters.targetTriple
 
       #if os(macOS)
         check("-target",