Requested changes from PR

rename symbol to symbolUSR
Cleanup OpenInterfaceRequest.init

Author: adam-fowler

Sources/LanguageServerProtocol/Requests/OpenInterfaceRequest.swift

@@ -25,21 +25,16 @@ public struct OpenInterfaceRequest: TextDocumentRequest, Hashable {
   /// The module group name.
   public var groupNames: [String]
 
-  /// The symbol to search for in the generated module interface.
-  public var symbol: String?
+  /// The symbol USR to search for in the generated module interface.
+  public var symbolUSR: String?
 
-  public init(textDocument: TextDocumentIdentifier, name: String, symbol: String?) {
+  public init(textDocument: TextDocumentIdentifier, name: String, symbolUSR: String?) {
     self.textDocument = textDocument
-    self.symbol = symbol
+    self.symbolUSR = symbolUSR
     // Stdlib Swift modules are all in the "Swift" module, but their symbols return a module name `Swift.***`.
     let splitName = name.split(separator: ".")
-    if splitName.count == 1 {
-      self.moduleName = name
-      self.groupNames = []
-    } else {
-      self.moduleName = String(splitName[0])
-      self.groupNames = [String.SubSequence](splitName.dropFirst()).map { String($0)}
-    }
+    self.moduleName = String(splitName[0])
+    self.groupNames = [String.SubSequence](splitName.dropFirst()).map(String.init)
   }
 
   /// Name of interface module name with group names appended

Sources/SourceKitLSP/SourceKitServer.swift

@@ -1307,7 +1307,7 @@ extension SourceKitServer {
 
       // If this symbol is a module then generate a textual interface
       if case .success(let symbols) = result, let symbol = symbols.first, symbol.kind == .module, let name = symbol.name {
-        self.respondWithInterface(req, moduleName: name, symbol: nil, languageService: languageService)
+        self.respondWithInterface(req, moduleName: name, symbolUSR: nil, languageService: languageService)
         return
       }
 
@@ -1330,7 +1330,7 @@ extension SourceKitServer {
           self.respondWithInterface(
             req, 
             moduleName: moduleName, 
-            symbol: firstResolved.occurrence?.symbol.usr,
+            symbolUSR: firstResolved.occurrence?.symbol.usr,
             languageService: languageService
           )
           return
@@ -1357,10 +1357,10 @@ extension SourceKitServer {
   func respondWithInterface(
     _ req: Request<DefinitionRequest>,
     moduleName: String,
-    symbol: String?,
+    symbolUSR: String?,
     languageService: ToolchainLanguageServer
   ) {
-      let openInterface = OpenInterfaceRequest(textDocument: req.params.textDocument, name: moduleName, symbol: symbol)
+      let openInterface = OpenInterfaceRequest(textDocument: req.params.textDocument, name: moduleName, symbolUSR: symbolUSR)
       let request = Request(openInterface, id: req.id, clientID: ObjectIdentifier(self),
                             cancellation: req.cancellationToken, reply: { (result: Result<OpenInterfaceRequest.Response, ResponseError>) in
         switch result {

Sources/SourceKitLSP/Swift/OpenInterface.swift

@@ -29,7 +29,7 @@ extension SwiftLanguageServer {
     let uri = request.params.textDocument.uri
     let moduleName = request.params.moduleName
     let name = request.params.name
-    let symbol = request.params.symbol
+    let symbol = request.params.symbolUSR
     self.queue.async {
       let interfaceFilePath = self.generatedInterfacesPath.appendingPathComponent("\(name).swiftinterface")
       let interfaceDocURI = DocumentURI(interfaceFilePath)