Syntax changes after review

Author: adam-fowler

Sources/SourceKitLSP/Swift/OpenInterface.swift

@@ -34,14 +34,7 @@ extension SwiftLanguageServer {
       let interfaceDocURI = DocumentURI(interfaceFilePath)
       // has interface already been generated
       if let snapshot = self.documentManager.latestSnapshot(interfaceDocURI) {
-        self._findUSR(request: request, uri: interfaceDocURI, snapshot: snapshot, symbol: symbol) { result in
-          switch result {
-            case .success(let info):
-              request.reply(.success(InterfaceDetails(uri: interfaceDocURI, position: info.position)))
-            case .failure:
-              request.reply(.success(InterfaceDetails(uri: interfaceDocURI, position: nil)))
-          }
-        }
+        self._findUSRAndRespond(request: request, uri: interfaceDocURI, snapshot: snapshot, symbol: symbol)
       } else {
         // generate interface
         self._openInterface(request: request, uri: uri, name: moduleName, interfaceURI: interfaceDocURI) { result in
@@ -52,14 +45,7 @@ extension SwiftLanguageServer {
               try interfaceInfo.contents.write(to: interfaceFilePath, atomically: true, encoding: String.Encoding.utf8)
               // store snapshot
               let snapshot = try self.documentManager.open(interfaceDocURI, language: .swift, version: 0, text: interfaceInfo.contents)
-              self._findUSR(request: request, uri: interfaceDocURI, snapshot: snapshot, symbol: symbol) { result in
-                switch result {
-                  case .success(let info):
-                    request.reply(.success(InterfaceDetails(uri: interfaceDocURI, position: info.position)))
-                  case .failure:
-                    request.reply(.success(InterfaceDetails(uri: interfaceDocURI, position: nil)))
-                }
-              }
+              self._findUSRAndRespond(request: request, uri: interfaceDocURI, snapshot: snapshot, symbol: symbol)
             } catch {
               request.reply(.failure(ResponseError.unknown(error.localizedDescription)))
             }
@@ -110,6 +96,22 @@ extension SwiftLanguageServer {
       }
     }
   }
+  
+  private func _findUSRAndRespond(
+    request: LanguageServerProtocol.Request<LanguageServerProtocol.OpenInterfaceRequest>, 
+    uri: DocumentURI, 
+    snapshot: DocumentSnapshot,
+    symbol: String?
+  ) {
+    self._findUSR(request: request, uri: uri, snapshot: snapshot, symbol: symbol) { result in
+      switch result {
+        case .success(let info):
+          request.reply(.success(InterfaceDetails(uri: uri, position: info.position)))
+        case .failure:
+          request.reply(.success(InterfaceDetails(uri: uri, position: nil)))
+      }
+    }
+  }
 
   private func _findUSR(
     request: LanguageServerProtocol.Request<LanguageServerProtocol.OpenInterfaceRequest>, 
@@ -127,20 +129,16 @@ extension SwiftLanguageServer {
     skreq[keys.request] = requests.find_usr
     skreq[keys.sourcefile] = uri.pseudoPath
     skreq[keys.usr] = symbol
-
-    if let compileCommand = self.commandsByFile[uri] {
-      skreq[keys.compilerargs] = compileCommand.compilerArgs
-    }
 
     let handle = self.sourcekitd.send(skreq, self.queue) { result in
       switch result {
       case .success(let dict):
-          if let offset: Int = dict[keys.offset],
-            let position = snapshot.positionOf(utf8Offset: offset) {
-              return completion(.success(FindUSRInfo(position: position)))
-          } else {
-            return completion(.success(FindUSRInfo(position: nil)))
-          } 
+        if let offset: Int = dict[keys.offset],
+          let position = snapshot.positionOf(utf8Offset: offset) {
+            return completion(.success(FindUSRInfo(position: position)))
+        } else {
+          return completion(.success(FindUSRInfo(position: nil)))
+        } 
       case .failure(let error):
         return completion(.failure(error))
       }