Move module name split into OpenInterfaceRequest

Use group names when running open interface request

Author: adam-fowler

Sources/LanguageServerProtocol/Requests/OpenInterfaceRequest.swift

@@ -20,15 +20,35 @@ public struct OpenInterfaceRequest: TextDocumentRequest, Hashable {
   public var textDocument: TextDocumentIdentifier
 
   /// The module to generate an index for.
-  public var name: String
+  public var moduleName: String
+
+  /// The module group name.
+  public var groupNames: [String]
 
   /// The symbol to search for in the generated module interface.
   public var symbol: String?
 
   public init(textDocument: TextDocumentIdentifier, name: String, symbol: String?) {
     self.textDocument = textDocument
-    self.name = name
     self.symbol = symbol
+    // 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)}
+    }
+  }
+
+  /// Name of interface module name with group names appended
+  public var name: String {
+    if groupNames.count > 0 {
+      return "\(self.moduleName).\(self.groupNames.joined(separator: "."))"
+    } else {
+      return self.moduleName
+    }
   }
 }
 

Sources/SourceKitD/sourcekitd_uids.swift

@@ -40,6 +40,7 @@ public struct sourcekitd_keys {
   public let expression_type_list: sourcekitd_uid_t
   public let filepath: sourcekitd_uid_t
   public let fixits: sourcekitd_uid_t
+  public let groupname: sourcekitd_uid_t
   public let id: sourcekitd_uid_t
   public let is_system: sourcekitd_uid_t
   public let kind: sourcekitd_uid_t
@@ -115,6 +116,7 @@ public struct sourcekitd_keys {
     expression_type_list = api.uid_get_from_cstr("key.expression_type_list")!
     filepath = api.uid_get_from_cstr("key.filepath")!
     fixits = api.uid_get_from_cstr("key.fixits")!
+    groupname = api.uid_get_from_cstr("key.groupname")!
     id = api.uid_get_from_cstr("key.id")!
     is_system = api.uid_get_from_cstr("key.is_system")!
     kind = api.uid_get_from_cstr("key.kind")!

Sources/SourceKitLSP/SourceKitServer.swift

@@ -1360,11 +1360,6 @@ extension SourceKitServer {
     symbol: String?,
     languageService: ToolchainLanguageServer
   ) {
-      var moduleName = moduleName
-      // Stdlib Swift modules are all in the "Swift" module, but their symbols return a module name `Swift.***`.
-      if moduleName.hasPrefix("Swift.") {
-        moduleName = "Swift"
-      }            
       let openInterface = OpenInterfaceRequest(textDocument: req.params.textDocument, name: moduleName, symbol: symbol)
       let request = Request(openInterface, id: req.id, clientID: ObjectIdentifier(self),
                             cancellation: req.cancellationToken, reply: { (result: Result<OpenInterfaceRequest.Response, ResponseError>) in

Sources/SourceKitLSP/Swift/OpenInterface.swift

@@ -27,10 +27,11 @@ struct FindUSRInfo {
 extension SwiftLanguageServer {
   public func openInterface(_ request: LanguageServerProtocol.Request<LanguageServerProtocol.OpenInterfaceRequest>) {
     let uri = request.params.textDocument.uri
-    let moduleName = request.params.name
+    let moduleName = request.params.moduleName
+    let name = request.params.name
     let symbol = request.params.symbol
     self.queue.async {
-      let interfaceFilePath = self.generatedInterfacesPath.appendingPathComponent("\(moduleName).swiftinterface")
+      let interfaceFilePath = self.generatedInterfacesPath.appendingPathComponent("\(name).swiftinterface")
       let interfaceDocURI = DocumentURI(interfaceFilePath)
       // has interface already been generated
       if let snapshot = self.documentManager.latestSnapshot(interfaceDocURI) {
@@ -75,6 +76,9 @@ extension SwiftLanguageServer {
     let skreq = SKDRequestDictionary(sourcekitd: sourcekitd)
     skreq[keys.request] = requests.editor_open_interface
     skreq[keys.modulename] = name
+    if request.params.groupNames.count > 0 {
+      skreq[keys.groupname] = request.params.groupNames
+    }
     skreq[keys.name] = interfaceURI.pseudoPath
     skreq[keys.synthesizedextensions] = 1
     if let compileCommand = self.commandsByFile[uri] {