java: adjusted "Cannot resolve method" message (IDEA-206898)

GitOrigin-RevId: 40fc7d00d6bcc4792dc097dde63dd40d08864068

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InvalidExpressions.java

@@ -48,10 +48,10 @@ public class a12 {
     ++<error descr="Variable expected">5</error>;
     <error descr="Variable expected">5</error> += 5;
 
-    <error descr="Cannot resolve method 'foo123Unresolved(?)'">foo123Unresolved</error>(<error descr="Expression expected">String</error>);
-    <error descr="Cannot resolve method 'foo123Unresolved(?)'">foo123Unresolved</error>(<error descr="Cannot resolve symbol 'xxxx'">xxxx</error>);
+    <error descr="Cannot resolve method 'foo123Unresolved' in 'a12'">foo123Unresolved</error>(<error descr="Expression expected">String</error>);
+    <error descr="Cannot resolve method 'foo123Unresolved' in 'a12'">foo123Unresolved</error>(<error descr="Cannot resolve symbol 'xxxx'">xxxx</error>);
 
-    <error descr="Cannot resolve method 'xxxxxx(?)'">xxxxxx</error>(<error descr="Cannot resolve symbol 'xxxxxx'">xxxxxx</error>);
+    <error descr="Cannot resolve method 'xxxxxx' in 'a12'">xxxxxx</error>(<error descr="Cannot resolve symbol 'xxxxxx'">xxxxxx</error>);
 
     // incomplete code should not cause 'expr expected'
     Object<error descr="';' expected"> </error>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/packageObscuring/main/Main.java

@@ -4,9 +4,9 @@ public class Main {
   public static void main(String[] args) {
     pkg.sub.Test obj = new pkg.sub.Test();
     obj.m1();
-    obj.<error descr="Cannot resolve method 'm2()'">m2</error>();
+    obj.<error descr="Cannot resolve method 'm2' in 'Test'">m2</error>();
 
     pkg.sub.Test.s1();
-    pkg.sub.Test.<error descr="Cannot resolve method 's2()'">s2</error>();
+    pkg.sub.Test.<error descr="Cannot resolve method 's2' in 'Test'">s2</error>();
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/HiddenMethodsOfAnonymousClass.java

@@ -4,6 +4,6 @@ class Example {
       public void run() {}
       public void m2() {}
     };
-    r.<error descr="Cannot resolve method 'm2()'">m2</error>();
+    r.<error descr="Cannot resolve method 'm2' in 'Runnable'">m2</error>();
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/MethodCallTypeErasedWhenUncheckedConversionWasAppliedDuringApplicabilityCheck.java

@@ -6,7 +6,7 @@ class Main1 {
 
   public static void main(String[] args) {
     List x = null;
-    foo(x).iterator().next().<error descr="Cannot resolve method 'iterator()'">iterator</error>();
+    foo(x).iterator().next().<error descr="Cannot resolve method 'iterator' in 'Object'">iterator</error>();
   }
 }
 
@@ -16,7 +16,7 @@ class Main {
   public static void main(String[] args) {
     List x = null;
     <error descr="Incompatible types. Found: 'java.lang.Object', required: 'java.lang.String'">String s = foo(x).get(0);</error>
-    foo(x).iterator().next().<error descr="Cannot resolve method 'toLowerCase()'">toLowerCase</error>();
+    foo(x).iterator().next().<error descr="Cannot resolve method 'toLowerCase' in 'Object'">toLowerCase</error>();
   }
 }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/ChainedInference.java

@@ -3,8 +3,8 @@ import java.util.*;
 class Main {
 
     void foo(List<Integer> list) {
-        bar(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
-        bar1(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown()'">unknown</error>());
+        bar(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown' in 'Integer'">unknown</error>());
+        bar1(list, <error descr="Failed to resolve argument">i -> i.intValue()</error>, i -> i.<error descr="Cannot resolve method 'unknown' in 'Integer'">unknown</error>());
     }
 
     <U, S_IN, S_OUT, R> R bar(List<S_IN> list,

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/UncheckedConversionDuringProperTypeExpressionConstraintResolution.java

@@ -48,7 +48,7 @@ class Test2 {
   {
     Class c = D.class;
 
-    D<String> d = new D<>(s -> s.<error descr="Cannot resolve method 'isEmpty()'">isEmpty</error>(), c);
-    D<String> d1 = D.create(s -> s.<error descr="Cannot resolve method 'isEmpty()'">isEmpty</error>(), c);
+    D<String> d = new D<>(s -> s.<error descr="Cannot resolve method 'isEmpty' in 'Object'">isEmpty</error>(), c);
+    D<String> d1 = D.create(s -> s.<error descr="Cannot resolve method 'isEmpty' in 'Object'">isEmpty</error>(), c);
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/interfaceMethods/ExtensionMethods.java

@@ -23,7 +23,7 @@ class C {
   interface II extends I {
     default void m() {
       I.super.m();
-      <error descr="Unqualified super reference is not allowed in extension method">super.<error descr="Cannot resolve method 'm()'">m</error></error>();
+      <error descr="Unqualified super reference is not allowed in extension method">super.<error descr="Cannot resolve method 'm' in 'Object'">m</error></error>();
 
       System.out.println(<error descr="'C.I' is not an enclosing class">I.super</error>.i);
       System.out.println(<error descr="Unqualified super reference is not allowed in extension method">super.<error descr="Cannot resolve symbol 'i'">i</error></error>);

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/RawSiteSubstitutorWithExpectedGenericsParameterType.java

@@ -14,7 +14,7 @@ class MySymbol<T extends String> {
 
   void findUsages(MySymbol s) {
     s.processSameSymbols(symbol -> {
-      String definition = symbol.<error descr="Cannot resolve method 'locateDefinition()'">locateDefinition</error>();
+      String definition = symbol.<error descr="Cannot resolve method 'locateDefinition' in 'Object'">locateDefinition</error>();
     });
   }
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newLambda/ValidFixesOnUnresolvedMethod.java

@@ -1,6 +1,6 @@
 class MyTest {
   void m(String[] refInfos){
-      refInfos = <error descr="Cannot resolve method 'unresolved(java.lang.String[], <lambda expression>)'">unresolved</error>(refInfos, refInfo -> {
+      refInfos = <error descr="Cannot resolve method 'unresolved' in 'MyTest'">unresolved</error>(refInfos, refInfo -> {
         refInfo = n<error descr="'n(java.lang.String)' in 'MyTest' cannot be applied to '(<lambda parameter>)'">(refInfo)</error>;
         return refInfo;
       });

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/unusedImports/UnresolvedReferencesInsideAmbiguousCallToImportedMethod.java

@@ -1,6 +1,6 @@
 import static a.A.foo;
 class Test {
      {
-          foo(<error descr="Cannot resolve method 'unresolvedMethodCall()'">unresolvedMethodCall</error>());
+          foo(<error descr="Cannot resolve method 'unresolvedMethodCall' in 'Test'">unresolvedMethodCall</error>());
      }
 }