Improve accuracy of FixQuery rule (#5438)

Co-authored-by: Michel Davit <[email protected]>

scalafix/input-0_14/src/main/scala/fix/v0_14_0/FixQuery.scala

@@ -3,13 +3,20 @@ rule = FixQuery
  */
 package fix.v0_14_0
 
-import com.spotify.scio.bigquery.types.BigQueryType.{HasQuery, Query}
+import com.spotify.scio.bigquery.types.BigQueryType.HasQuery
 
-object FixQuery {
+// Workaround to get 0.14 code to compile (query method has been removed from HasQuery)
+trait HasQueryRaw {
+  def query: String = ???
+}
 
-  val a: HasQuery = ???
-  val b: Query[_] = ???
+object HasQueryType extends HasQuery with HasQueryRaw {
+  override def queryRaw: String = ???
+  override def query: String = ???
+}
+
+object FixQuery {
+  HasQueryType.query
 
-  a.query
-  b.query
+  HasQueryType.query.format("foo")
 }

scalafix/output-0_14/src/main/scala/fix/v0_14_0/FixQuery.scala

@@ -1,12 +1,19 @@
 package fix.v0_14_0
 
-import com.spotify.scio.bigquery.types.BigQueryType.{HasQuery, Query}
+import com.spotify.scio.bigquery.types.BigQueryType.HasQuery
 
-object FixQuery {
+// Workaround to get 0.14 code to compile (query method has been removed from HasQuery)
+trait HasQueryRaw {
+  def query: String = ???
+}
 
-  val a: HasQuery = ???
-  val b: Query[_] = ???
+object HasQueryType extends HasQuery with HasQueryRaw {
+  override def queryRaw: String = ???
+  override def query: String = ???
+}
+
+object FixQuery {
+  HasQueryType.queryRaw
 
-  a.queryRaw
-  b.queryRaw
+  HasQueryType.queryRaw.format("foo")
 }

scalafix/rules/src/main/scala/fix/v0_14_0/FixQuery.scala

@@ -5,21 +5,25 @@ import scala.meta._
 
 object FixQuery {
   val HasQueryMatcher: SymbolMatcher =
-    SymbolMatcher.normalized("com/spotify/scio/bigquery/types/BigQueryType/HasQuery#query")
+    SymbolMatcher.normalized("com/spotify/scio/bigquery/types/BigQueryType/HasQuery")
 }
 
 class FixQuery extends SemanticRule("FixQuery") {
-
   import FixQuery._
 
-  private def isQuery(term: Tree)(implicit doc: SemanticDocument): Boolean =
-    term.symbol.info.exists(_.overriddenSymbols.exists(HasQueryMatcher.matches))
+  private def isQueryFormat(term: Tree)(implicit doc: SemanticDocument): Boolean =
+    term.symbol.info.map(_.signature).exists {
+      case ClassSignature(_, parents, _, _) =>
+        parents.exists {
+          case TypeRef(_, symbol, _) if HasQueryMatcher.matches(symbol) => true
+          case _                                                        => false
+        }
+      case _ => false
+    }
 
   override def fix(implicit doc: SemanticDocument): Patch = {
     doc.tree.collect {
-      case t @ q"$qual.$fn" if HasQueryMatcher.matches(fn) =>
-        Patch.replaceTree(t, q"$qual.queryRaw".syntax)
-      case t @ q"$qual.query" if isQuery(t) =>
+      case t @ q"$qual.query" if isQueryFormat(qual) =>
         Patch.replaceTree(t, q"$qual.queryRaw".syntax)
     }.asPatch
   }