Re-add check for textDocumentContent capability

fwcd · fwcd · commit ba53b2e3b727 · 2024-09-04T23:21:11.000+02:00
Once the request is upstreamed to LSP 3.18 we should relax this
condition to support clients that don't declare it as an experimental
capability (since it will become a standard LSP request).
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "lldb.library": "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB",
+  "lldb.launch.expressions": "native"
+}
diff --git a/Sources/SourceKitLSP/Swift/MacroExpansion.swift b/Sources/SourceKitLSP/Swift/MacroExpansion.swift
@@ -218,8 +218,8 @@ extension SwiftLanguageService {
     }
 
     if case .dictionary(let experimentalCapabilities) = self.capabilityRegistry.clientCapabilities.experimental,
-      case .bool(true) = experimentalCapabilities["workspace/peekDocuments"]
-      // TODO: Check if client supports LSP 3.18's workspace/textDocumentContent
+      case .bool(true) = experimentalCapabilities["workspace/peekDocuments"],
+      case .bool(true) = experimentalCapabilities["workspace/textDocumentContent"]
     {
       let expansionURIs = try macroExpansionReferenceDocumentURLs.map {
         return DocumentURI(try $0.url)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "lldb.library": "/Applications/Xcode.app/Contents/SharedFrameworks/LLDB.framework/Versions/A/LLDB",
 +  "lldb.launch.expressions": "native"
 +}
Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ extension SwiftLanguageService {`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`if case .dictionary(let experimentalCapabilities) = self.capabilityRegistry.clientCapabilities.experimental,`
`221`		`- case .bool(true) = experimentalCapabilities["workspace/peekDocuments"]`
`222`		`- // TODO: Check if client supports LSP 3.18's workspace/textDocumentContent`
	`221`	`+ case .bool(true) = experimentalCapabilities["workspace/peekDocuments"],`
	`222`	`+ case .bool(true) = experimentalCapabilities["workspace/textDocumentContent"]`
`223`	`223`	`{`
`224`	`224`	`let expansionURIs = try macroExpansionReferenceDocumentURLs.map {`
`225`	`225`	`return DocumentURI(try $0.url)`