rename the command for action query

Author: sean7218

Sources/SourceKitBazelBSP/RequestHandlers/SKOptions/BazelTargetAquerier.swift

@@ -67,7 +67,7 @@ final class BazelTargetAquerier {
         }
 
         // Run the aquery on the special index output base since that's where we will build at.
-        let output = try commandRunner.bazelIndexActionData(initializedConfig: config, cmd: cmd)
+        let output = try commandRunner.bazelActionQuery(initializedConfig: config, cmd: cmd)
 
         let parsedOutput = try BazelProtobufBindings.parseActionGraph(data: output)
 

Sources/SourceKitBazelBSP/RequestHandlers/SKOptions/CompilerArgumentsProcessor.swift

@@ -25,7 +25,6 @@ private let logger = makeFileLevelBSPLogger()
 
 enum CompilerArgumentsProcessor {
     // Parses and processes the compilation step for a given target from a larger aquery output.
-    // The parsing step is only necessary because BazelTargetAquerier operates on text. Should become unnecessary once we move to proto.
     static func extractAndProcessCompilerArgs(
         fromAquery aqueryOutput: Analysis_ActionGraphContainer,
         bazelTarget: String,

Sources/SourceKitBazelBSP/SharedUtils/Shell/CommandRunner.swift

@@ -42,10 +42,6 @@ extension CommandRunner {
         try run(baseConfig.bazelWrapper + " " + cmd, cwd: rootUri)
     }
 
-    func bazel(baseConfig: BaseServerConfig, rootUri: String, cmd: String) throws -> Data {
-        try run(baseConfig.bazelWrapper + " " + cmd, cwd: rootUri)
-    }
-
     /// A regular bazel command, but at this BSP's special output base and taking into account the special index flags.
     func bazelIndexAction(initializedConfig: InitializedServerConfig, cmd: String) throws -> String {
         return try bazelIndexAction(
@@ -56,14 +52,16 @@ extension CommandRunner {
         )
     }
 
-    /// A regular bazel command, but at this BSP's special output base and taking into account the special index flags.
-    func bazelIndexActionData(initializedConfig: InitializedServerConfig, cmd: String) throws -> Data {
-        let additionalFlags = initializedConfig.baseConfig.indexFlags.joined(separator: " ")
-        let baseConfig = initializedConfig.baseConfig
-        let outputBase = initializedConfig.outputBase
-        let rootUri = initializedConfig.rootUri
-        let cmd = "--output_base=\(outputBase) \(cmd)\(additionalFlags)"
-        return try bazel(baseConfig: baseConfig, rootUri: rootUri, cmd: cmd)
+    /// A  bazel action query command, but at this BSP's special output base and taking into account the special index flags.
+    func bazelActionQuery(initializedConfig: InitializedServerConfig, cmd: String) throws -> Data {
+        let baseCommand = [
+            initializedConfig.baseConfig.bazelWrapper,
+            "--output_base=\(initializedConfig.outputBase)",
+            cmd,
+        ]
+        let additionalFlags = initializedConfig.baseConfig.indexFlags
+        let command = (baseCommand + additionalFlags).joined(separator: " ")
+        return try run(command, cwd: initializedConfig.rootUri)
     }
 
     /// A regular bazel command, but at this BSP's special output base and taking into account the special index flags.