From 2b8210e8233adac72c2863c5a9efeecb3408c245 Mon Sep 17 00:00:00 2001
From: Tomasz Pasternak <tomasz.pasternak@jetbrains.com>
Date: Tue, 8 Oct 2024 13:23:30 +0200
Subject: [PATCH] =?UTF-8?q?fix:=20In=20Query=20Sync,=20use=20consistent=20?=
 =?UTF-8?q?flags=20to=20avoid=20mismatch=20between=20@@=E2=80=A6=20(#6858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 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<String> getQueryFlags() {
-    return ImmutableList.of("--output=streamed_proto", "--relative_locations=true");
+    return ImmutableList.of("--output=streamed_proto", "--relative_locations=true", "--consistent_labels=true");
   }
 
   @Memoized