From 814724de8f35780a4a8f32471e4e073a57f2934e Mon Sep 17 00:00:00 2001
From: Semyon Proshev <Semyon.Proshev@jetbrains.com>
Date: Tue, 20 Mar 2018 17:32:00 +0300
Subject: [PATCH] Minor cleanup in PyCallingNonCallableInspection (PY-28626)

---
 .../PyCallingNonCallableInspection.java        | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/python/src/com/jetbrains/python/inspections/PyCallingNonCallableInspection.java b/python/src/com/jetbrains/python/inspections/PyCallingNonCallableInspection.java
index a8ccb1b3445a..1196fe59a5dd 100644
--- a/python/src/com/jetbrains/python/inspections/PyCallingNonCallableInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyCallingNonCallableInspection.java
@@ -56,7 +56,7 @@ public class PyCallingNonCallableInspection extends PyInspection {
     @Override
     public void visitPyCallExpression(PyCallExpression node) {
       super.visitPyCallExpression(node);
-      checkCallable(node, node.getCallee(), null);
+      checkCallable(node, node.getCallee());
     }
 
     @Override
@@ -64,25 +64,21 @@ public class PyCallingNonCallableInspection extends PyInspection {
       super.visitPyDecoratorList(node);
       for (PyDecorator decorator : node.getDecorators()) {
         final PyExpression callee = decorator.getCallee();
-        checkCallable(decorator, callee, null);
+        checkCallable(decorator, callee);
         if (decorator.hasArgumentList()) {
-          checkCallable(decorator, decorator, null);
+          checkCallable(decorator, decorator);
         }
       }
     }
 
-    private void checkCallable(@NotNull PyElement node, @Nullable PyExpression callee, @Nullable PyType type) {
-      final Boolean callable = callee != null ? isCallable(callee, myTypeEvalContext) : PyTypeChecker.isCallable(type);
-      if (callable == null) {
-        return;
-      }
-      if (!callable) {
-        final PyType calleeType = callee != null ? myTypeEvalContext.getType(callee) : type;
+    private void checkCallable(@NotNull PyElement node, @Nullable PyExpression callee) {
+      if (callee != null && isCallable(callee, myTypeEvalContext) == Boolean.FALSE) {
+        final PyType calleeType = myTypeEvalContext.getType(callee);
         String message = "Expression is not callable";
         if (calleeType instanceof PyClassType) {
           message = String.format("'%s' object is not callable", calleeType.getName());
         }
-        else if (callee != null) {
+        else {
           final String name = callee.getName();
           if (name != null) {
             message = String.format("'%s' is not callable", name);