From d93fef967ba1ab7939141cbb90bd414fa776163a Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Tue, 18 Jul 2017 19:52:10 +0300
Subject: [PATCH] PY-18816 Use PyResolveContext#noImplicits() instead of
 defaultContext()

where resolving of implicit attributes is actually not required.
Originally, defaultContext() was intended to be only for
"Navigate to Definition".
---
 .../python/inspections/PyGlobalUndefinedInspection.java         | 2 +-
 .../src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java | 2 +-
 .../classes/membersManager/InstanceFieldsManager.java           | 2 +-
 .../refactoring/classes/membersManager/PropertiesManager.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/src/com/jetbrains/python/inspections/PyGlobalUndefinedInspection.java b/python/src/com/jetbrains/python/inspections/PyGlobalUndefinedInspection.java
index 1808102d82ec..1e9ca7c4c624 100644
--- a/python/src/com/jetbrains/python/inspections/PyGlobalUndefinedInspection.java
+++ b/python/src/com/jetbrains/python/inspections/PyGlobalUndefinedInspection.java
@@ -58,7 +58,7 @@ public class PyGlobalUndefinedInspection extends PyInspection {
       final PyTargetExpression[] globals = node.getGlobals();
 
       for (PyTargetExpression global : globals) {
-        final PyResolveContext resolveContext = PyResolveContext.defaultContext().withTypeEvalContext(myTypeEvalContext);
+        final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(myTypeEvalContext);
         if (global.getReference(resolveContext).resolve() == global) {
           registerProblem(global, PyBundle.message("INSP.NAME.global.$0.undefined", global.getName()));
         }
diff --git a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
index fe883bc4fc22..1fbadf144c6f 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyNamedParameterImpl.java
@@ -398,7 +398,7 @@ public class PyNamedParameterImpl extends PyBaseElementImpl<PyNamedParameterStub
         public void visitPyTargetExpression(PyTargetExpression node) {
           if (parameterWasReassigned.get()) return;
 
-          final PyResolveContext resolveContext = PyResolveContext.defaultContext().withTypeEvalContext(context);
+          final PyResolveContext resolveContext = PyResolveContext.noImplicits().withTypeEvalContext(context);
           if (node.getReference(resolveContext).isReferenceTo(PyNamedParameterImpl.this)) {
             parameterWasReassigned.set(true);
           }
diff --git a/python/src/com/jetbrains/python/refactoring/classes/membersManager/InstanceFieldsManager.java b/python/src/com/jetbrains/python/refactoring/classes/membersManager/InstanceFieldsManager.java
index e1f113c77d4d..681a86b02a83 100644
--- a/python/src/com/jetbrains/python/refactoring/classes/membersManager/InstanceFieldsManager.java
+++ b/python/src/com/jetbrains/python/refactoring/classes/membersManager/InstanceFieldsManager.java
@@ -136,7 +136,7 @@ class InstanceFieldsManager extends FieldsManager {
     @Override
     protected boolean applyNotNull(@NotNull final PyTargetExpression input) {
       final TypeEvalContext typeEvalContext = TypeEvalContext.userInitiated(input.getProject(), null);
-      final PyResolveContext context = PyResolveContext.defaultContext().withTypeEvalContext(typeEvalContext);
+      final PyResolveContext context = PyResolveContext.noImplicits().withTypeEvalContext(typeEvalContext);
       return input.getReference(context).resolve() instanceof PyTargetExpression;
     }
   }
diff --git a/python/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java b/python/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java
index 15d75bc663fd..26ac0985db43 100644
--- a/python/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java
+++ b/python/src/com/jetbrains/python/refactoring/classes/membersManager/PropertiesManager.java
@@ -190,7 +190,7 @@ class PropertiesManager extends MembersManager<PyElement> {
       final PsiReference reference;
       if (node instanceof PyReferenceOwner) {
         final TypeEvalContext context = TypeEvalContext.userInitiated(node.getProject(), null);
-        reference = ((PyReferenceOwner)node).getReference(PyResolveContext.defaultContext().withTypeEvalContext(context));
+        reference = ((PyReferenceOwner)node).getReference(PyResolveContext.noImplicits().withTypeEvalContext(context));
       }
       else {
         reference = node.getReference();