Some refactoring in UastCallMatcher before implementing matching callable reference expressions

jvm/jvm-analysis-api/src/com/intellij/codeInspection/UastCallMatcher.java

@@ -62,26 +62,33 @@ public interface UastCallMatcher {
     // for all fields 'null' = doesn't matter
 
     private final String myMethodName;
-    private final String[] myArguments; // array length is arguments count; each element is argument type FQN
+    /**
+     * array length is arguments count; each element is argument type FQN
+     */
+    private final String[] myArguments;
     private final boolean myMatchArgumentTypeInheritors;
-    private final String myReceiverTypeClassFqn; // e.g. for "abc".equals it is String
     private final String myReturnTypeClassFqn;
+    /**
+     * FQN of receiver type class (for method calls)  or  class/object type class (for method references).
+     */
+    private final String myClassFqn;
+
 
     public SimpleUastCallMatcher(@Nullable String methodName,
                                  @Nullable String[] arguments,
                                  boolean matchArgumentTypeInheritors,
-                                 @Nullable String receiverTypeClassFqn,
+                                 @Nullable String classFqn,
                                  @Nullable String returnTypeClassFqn) {
       if (methodName == null &&
           arguments == null &&
-          receiverTypeClassFqn == null &&
+          classFqn == null &&
           returnTypeClassFqn == null) {
         throw new IllegalArgumentException("At least one qualifier must be specified");
       }
       myMethodName = methodName;
       myArguments = arguments;
       myMatchArgumentTypeInheritors = matchArgumentTypeInheritors;
-      myReceiverTypeClassFqn = receiverTypeClassFqn;
+      myClassFqn = classFqn;
       myReturnTypeClassFqn = returnTypeClassFqn;
     }
 
@@ -96,7 +103,11 @@ public interface UastCallMatcher {
 
     @Override
     public boolean testCallableReferenceExpression(@Nullable UCallableReferenceExpression expression) {
-      return false; //TODO implement
+      if (expression == null) return false;
+      return methodNameMatches(expression) &&
+             classMatches(expression) &&
+             returnTypeMatches(expression) &&
+             argumentsMatch(expression);
     }
 
 
@@ -105,9 +116,19 @@ public interface UastCallMatcher {
              myMethodName.equals(expression.getMethodName());
     }
 
+    private boolean methodNameMatches(@NotNull UCallableReferenceExpression expression) {
+      return myMethodName == null ||
+             myMethodName.equals(expression.getCallableName());
+    }
+
     private boolean receiverTypeMatches(@NotNull UCallExpression expression) {
-      return myReceiverTypeClassFqn == null ||
-             myReceiverTypeClassFqn.equals(AnalysisUastUtil.getExpressionReceiverTypeClassFqn(expression));
+      return myClassFqn == null ||
+             myClassFqn.equals(AnalysisUastUtil.getExpressionReceiverTypeClassFqn(expression));
+    }
+
+    private boolean classMatches(@NotNull UCallableReferenceExpression expression) {
+      if (myClassFqn == null) return true;
+      return false; //TODO implement
     }
 
     private boolean returnTypeMatches(@NotNull UCallExpression expression) {
@@ -115,6 +136,11 @@ public interface UastCallMatcher {
              myReturnTypeClassFqn.equals(AnalysisUastUtil.getExpressionReturnTypePsiClassFqn(expression));
     }
 
+    private boolean returnTypeMatches(@NotNull UCallableReferenceExpression expression) {
+      if (myReturnTypeClassFqn == null) return true;
+      return false; //TODO implement
+    }
+
     private boolean argumentsMatch(@NotNull UCallExpression expression) {
       if (myArguments == null) return true;
       if (myArguments.length != expression.getValueArgumentCount()) {
@@ -154,6 +180,11 @@ public interface UastCallMatcher {
       }
       return true;
     }
+
+    private boolean argumentsMatch(@NotNull UCallableReferenceExpression expression) {
+      if (myArguments == null) return true;
+      return true; //TODO implement (seems like it only has meaning for static method references)
+    }
   }
 
 

jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/UastCallMatcherTest.java

@@ -25,6 +25,8 @@ public class UastCallMatcherTest extends JavaCodeInsightFixtureTestCase {
 
   @Override
   protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) {
+    moduleBuilder.setLanguageLevel(LanguageLevel.JDK_1_8);
+    moduleBuilder.addJdk(IdeaTestUtil.getMockJdk18Path().getPath());
     moduleBuilder.addLibrary("javaUtil", PathUtil.getJarPathForClass(Locale.class));
   }