Address review comments

Author: award999

Sources/LanguageServerProtocol/SupportTypes/PlaygroundItem.swift

@@ -20,7 +20,7 @@ public struct PlaygroundItem: ResponseType, Equatable {
   /// Display name describing the playground.
   public var label: String?
 
-  /// The range of the playground item in the source code.
+  /// The location of the #Playground macro expansion in the source code.
   public var location: Location
 
   public init(
@@ -32,17 +32,4 @@ public struct PlaygroundItem: ResponseType, Equatable {
     self.label = label
     self.location = location
   }
-
-  public func encodeToLSPAny() -> LSPAny {
-    var dict: [String: LSPAny] = [
-      "id": .string(id),
-      "location": location.encodeToLSPAny()
-    ]
-
-    if let label {
-      dict["label"] = .string(label)
-    }
-
-    return .dictionary(dict)
-  }
 }

Sources/SwiftLanguageService/PlaygroundsMacro.swift

@@ -28,10 +28,9 @@ extension SwiftLanguageService {
     try Task.checkCancellation()
     return
       await PlaygroundMacroFinder.find(
-        in: [Syntax(syntaxTree)],
+        in: Syntax(syntaxTree),
         workspace: workspace,
         snapshot: snapshot,
-        range: syntaxTree.position..<syntaxTree.endPosition
       )
   }
 }
@@ -45,39 +44,32 @@ final class PlaygroundMacroFinder: SyntaxAnyVisitor {
   /// The snapshot of the document for which we are getting playgrounds.
   private let snapshot: DocumentSnapshot
 
-  /// Only playgrounds that intersect with this range get reported.
-  private let range: Range<AbsolutePosition>
-
   /// Accumulating the result in here.
   private var result: [PlaygroundItem] = []
 
   /// Keep track of if "Playgrounds" has been imported
   private var isPlaygroundImported: Bool = false
 
-  private init(baseID: String, snapshot: DocumentSnapshot, range: Range<AbsolutePosition>) {
+  private init(baseID: String, snapshot: DocumentSnapshot) {
     self.baseID = baseID
     self.snapshot = snapshot
-    self.range = range
     super.init(viewMode: .sourceAccurate)
   }
 
   /// Designated entry point for `PlaygroundMacroFinder`.
   static func find(
-    in nodes: some Sequence<Syntax>,
+    in node: some SyntaxProtocol,
     workspace: Workspace,
-    snapshot: DocumentSnapshot,
-    range: Range<AbsolutePosition>
+    snapshot: DocumentSnapshot
   ) async -> [PlaygroundItem] {
     guard let canonicalTarget = await workspace.buildServerManager.canonicalTarget(for: snapshot.uri),
       let moduleName = await workspace.buildServerManager.moduleName(for: snapshot.uri, in: canonicalTarget),
       let baseName = snapshot.uri.fileURL?.lastPathComponent 
     else {
       return []
     }
-    let visitor = PlaygroundMacroFinder(baseID: "\(moduleName)/\(baseName)", snapshot: snapshot, range: range)
-    for node in nodes {
-      visitor.walk(node)
-    }
+    let visitor = PlaygroundMacroFinder(baseID: "\(moduleName)/\(baseName)", snapshot: snapshot)
+    visitor.walk(node)
     return visitor.result
   }
 
@@ -87,9 +79,6 @@ final class PlaygroundMacroFinder: SyntaxAnyVisitor {
     label: String?,
     range: Range<AbsolutePosition>
   ) {
-    if !self.range.overlaps(range) {
-      return
-    }
     let positionRange = snapshot.absolutePositionRange(of: range)
     let location = Location(uri: snapshot.uri, range: positionRange)
 

Tests/SourceKitLSPTests/DocumentPlaygroundDiscoveryTests.swift

@@ -16,32 +16,32 @@ import SourceKitLSP
 import XCTest
 
 final class DocumentPlaygroundDiscoveryTests: XCTestCase {
-  func testParsePlaygroundsTests() async throws {
+  func testParsePlaygrounds() async throws {
     let project = try await SwiftPMTestProject(
       files: [
         "MyLib.swift": """
         import Playgrounds
 
         public func foo() -> String {
-            "bar"
+          "bar"
         }
 
         1️⃣#Playground("foo") {
-            print(foo())
+          print(foo())
         }2️⃣
 
         3️⃣#Playground {
-            print(foo())
+          print(foo())
         }4️⃣
 
         public func bar(_ i: Int, _ j: Int) -> Int {
-            i + j
+          i + j
         }
 
         5️⃣#Playground("bar") {
-            var i = bar(1, 2)
-            i = i + 1
-            print(i)
+          var i = bar(1, 2)
+          i = i + 1
+          print(i)
         }6️⃣
         """
       ],
@@ -52,7 +52,6 @@ final class DocumentPlaygroundDiscoveryTests: XCTestCase {
           targets: [.target(name: "MyLibrary")]
         )
         """,
-      enableBackgroundIndexing: false
     )
 
     let (uri, positions) = try project.openDocument("MyLib.swift")
@@ -76,35 +75,35 @@ final class DocumentPlaygroundDiscoveryTests: XCTestCase {
           id: "MyLibrary/MyLib.swift:19",
           label: "bar",
           location: Location(uri: uri, range: positions["5️⃣"]..<positions["6️⃣"]),
-        )
+        ),
       ]
     )
   }
 
-  func testNoImportPlaygroundsTests() async throws {
+  func testNoImportPlaygrounds() async throws {
     let project = try await SwiftPMTestProject(
       files: [
         "Sources/MyLibrary/MyLib.swift": """
         public func foo() -> String {
-            "bar"
+          "bar"
         }
 
         #Playground("foo") {
-            print(foo())
+          print(foo())
         }
 
         #Playground {
-            print(foo())
+          print(foo())
         }
 
         public func bar(_ i: Int, _ j: Int) -> Int {
-            i + j
+          i + j
         }
 
         #Playground("bar") {
-            var i = bar(1, 2)
-            i = i + 1
-            print(i)
+          var i = bar(1, 2)
+          i = i + 1
+          print(i)
         }
         """
       ],
@@ -115,7 +114,6 @@ final class DocumentPlaygroundDiscoveryTests: XCTestCase {
           targets: [.target(name: "MyLibrary")]
         )
         """,
-      enableBackgroundIndexing: false
     )
 
     let (uri, _) = try project.openDocument("MyLib.swift")
@@ -125,16 +123,16 @@ final class DocumentPlaygroundDiscoveryTests: XCTestCase {
     XCTAssertEqual(playgrounds, [])
   }
 
-  func testParseNoPlaygroundsTests() async throws {
+  func testParseNoPlaygrounds() async throws {
     let project = try await SwiftPMTestProject(
       files: [
         "Sources/MyLibrary/MyLib.swift": """
         import Playgrounds
 
         public func Playground(_ i: Int, _ j: Int) -> Int {
-            i + j
+          i + j
         }
-        
+
         @Playground
         struct MyPlayground {
           public var playground: String = ""
@@ -148,7 +146,6 @@ final class DocumentPlaygroundDiscoveryTests: XCTestCase {
           targets: [.target(name: "MyLibrary")]
         )
         """,
-      enableBackgroundIndexing: false
     )
 
     let (uri, _) = try project.openDocument("MyLib.swift")