handling for debugging python test targets with transitions - fix for…

… query test

querysync/javatests/com/google/idea/blaze/qsync/query/QuerySpecTest.java

@@ -19,6 +19,8 @@
 
 import com.google.idea.blaze.qsync.BlazeQueryParser;
 import java.nio.file.Path;
+import java.util.stream.Stream;
+import java.util.stream.Collectors;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -86,6 +88,22 @@ public void testGetQueryExpression_includes_and_excludes() {
 
   @Test
   public void testGetQueryExpression_experimental_includes_and_excludes() {
+
+    // There are a number of Kinds that are expected to be queried for. It is also
+    // necessary to include the same Kinds with the prefix `_transition_` as well because it
+    // could be that any given rule is subject to a transition.
+
+    String kindsExpression = Stream.of(
+        "android_library", "android_binary", "android_local_test",
+        "android_instrumentation_test", "kt_android_library_helper", "java_library", "java_binary",
+        "kt_jvm_library", "kt_jvm_binary", "kt_jvm_library_helper", "java_test",
+        "java_proto_library", "java_lite_proto_library", "java_mutable_proto_library",
+        "_java_grpc_library", "_kotlin_library", "_java_lite_grpc_library", "_iml_module_",
+        "cc_library", "cc_binary", "cc_shared_library", "cc_test", "proto_library", "py_library",
+        "py_binary", "py_test")
+        .flatMap(k -> Stream.of(k, "_transition_" + k))
+        .collect(Collectors.joining("|"));
+
     QuerySpec qs =
       QuerySpec.builder(QuerySpec.QueryStrategy.FILTERING_TO_KNOWN_AND_USED_TARGETS)
         .workspaceRoot(Path.of("/workspace/"))
@@ -98,7 +116,7 @@ public void testGetQueryExpression_experimental_includes_and_excludes() {
     assertThat(qs.getQueryExpression())
       .hasValue(
         "let base = //some/included/path/...:* + //another/included/path/...:* - //some/included/path/excluded/...:* - //another/included/path/excluded/...:*\n" +
-        " in let known = kind(\"source file|android_library|android_binary|android_local_test|android_instrumentation_test|kt_android_library_helper|java_library|java_binary|kt_jvm_library|kt_jvm_binary|kt_jvm_library_helper|java_test|java_proto_library|java_lite_proto_library|java_mutable_proto_library|_java_grpc_library|_kotlin_library|_java_lite_grpc_library|_iml_module_|cc_library|cc_binary|cc_shared_library|cc_test|proto_library|py_library|py_binary|py_test\", $base) \n" +
+        " in let known = kind(\"source file|" + kindsExpression + "\", $base) \n" +
         " in let unknown = $base except $known \n" +
         " in $known union ($base intersect allpaths($known, $unknown)) \n");
   }