From e3a5c3c411d54c2f2b2d73ef4235c49f387b1af5 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 7 Oct 2024 13:17:22 +0200 Subject: [PATCH 1/2] fix: In Query Sync, use consistent flags to avoid mismatch between @@-prefixed and other ones --- querysync/java/com/google/idea/blaze/qsync/query/QuerySpec.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querysync/java/com/google/idea/blaze/qsync/query/QuerySpec.java b/querysync/java/com/google/idea/blaze/qsync/query/QuerySpec.java index 8b059e6666a..316dece8213 100644 --- a/querysync/java/com/google/idea/blaze/qsync/query/QuerySpec.java +++ b/querysync/java/com/google/idea/blaze/qsync/query/QuerySpec.java @@ -42,7 +42,7 @@ public abstract class QuerySpec implements Formattable { // LINT.IfChanges @Memoized public ImmutableList getQueryFlags() { - return ImmutableList.of("--output=streamed_proto", "--relative_locations=true"); + return ImmutableList.of("--output=streamed_proto", "--relative_locations=true", "--consistent_labels=true"); } @Memoized From 4ee067c82ece45879bd994ee6c7148a5388f5995 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 7 Oct 2024 16:29:00 +0200 Subject: [PATCH 2/2]