From c0c758954744b8e66de0908e97afb313b0bc12d5 Mon Sep 17 00:00:00 2001
From: Alex Hoppen <ahoppen@apple.com>
Date: Thu, 3 Aug 2023 09:45:29 -0700
Subject: [PATCH] Fix deprecation warnings

Fix deprecation warnings from SwiftSyntax and SwiftPM.
---
 Sources/SourceKitLSP/DocumentTokens.swift            |  2 +-
 Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift | 12 ++++++------
 .../SwiftPMWorkspaceTests.swift                      |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Sources/SourceKitLSP/DocumentTokens.swift b/Sources/SourceKitLSP/DocumentTokens.swift
index c0a00c2fd..e5e12d8a9 100644
--- a/Sources/SourceKitLSP/DocumentTokens.swift
+++ b/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) })
diff --git a/Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift b/Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
index 4a47fea74..9813b13be 100644
--- a/Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift
+++ b/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> {
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
index 86432e3ed..ef91ccfcc 100644
--- a/Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
+++ b/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",