From 1edb242fdd08ae91ccf73362a3d79a66ae5fd7e6 Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Thu, 24 Mar 2016 19:01:35 +0300
Subject: [PATCH] In percent string resolve positional substitution on first
 position  to non-tuple  left part expression #PY-18115

---
 .../PySubstitutionChunkReference.java         | 38 ++++++++-----------
 .../percentStringWithDictCall.py              |  1 +
 .../com/jetbrains/python/PyResolveTest.java   |  6 +--
 .../PyUnresolvedReferencesInspectionTest.java |  5 +++
 4 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 python/testData/inspections/PyUnresolvedReferencesInspection/percentStringWithDictCall.py

diff --git a/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java b/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
index a5d67047187b..71e96f63be14 100644
--- a/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
+++ b/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
@@ -56,12 +56,12 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
 
   private static TextRange getKeyWordRange(@NotNull final PyStringLiteralExpression element,
                                            @NotNull final PyStringFormatParser.SubstitutionChunk chunk) {
-    final TextRange shifted = chunk.getTextRange();
+    final TextRange textRange = chunk.getTextRange();
     if (chunk.getMappingKey() != null) {
-      final int start = shifted.getStartOffset() + chunk.getTextRange().substring(element.getText()).indexOf(chunk.getMappingKey());
+      final int start = textRange.getStartOffset() + chunk.getTextRange().substring(element.getText()).indexOf(chunk.getMappingKey());
       return new TextRange(start, start + chunk.getMappingKey().length());
     }
-    return shifted;
+    return textRange;
   }
 
   @Nullable
@@ -132,7 +132,7 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
       return resolveDictLiteralExpression((PyDictLiteralExpression)expression);
     }
     else if (expression instanceof PyCallExpression) {
-      return resolveCallExpression((PyCallExpression)expression);
+      return resolveCallExpressionForKeywordSubstitution((PyCallExpression)expression);
     }
     
     return null;
@@ -140,11 +140,11 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
 
   @Nullable
   private PsiElement resolvePositional(PyExpression expression) {
-    PsiElement result = null;
     PyExpression containedExpression = expression;
     if (expression instanceof PyParenthesizedExpression) {
       containedExpression = PyPsiUtils.flattenParens(expression);
     }
+    PsiElement result = null;
     
     if (containedExpression instanceof PyTupleExpression) {
       myIgnoreUnresolved = false;
@@ -156,18 +156,17 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
     else if (containedExpression instanceof PyBinaryExpression && ((PyBinaryExpression)containedExpression).isOperator("+")) {
       result = resolveNotNestedBinaryExpression((PyBinaryExpression)containedExpression);
     }
-    else if (containedExpression instanceof PyLiteralExpression && myPosition == 0) {
+    else if (myPosition == 0) {
       result = containedExpression;
     }
-    else if (containedExpression instanceof PyCallExpression) {
-      result = resolveCallExpression((PyCallExpression)containedExpression);
+    else {
+      myIgnoreUnresolved = false;
     }
     return result;
   }
 
   @Nullable
   private PsiElement resolveNotNestedBinaryExpression(PyBinaryExpression containedExpression) {
-    myIgnoreUnresolved = true;
     PyExpression left = containedExpression.getLeftExpression();
     PyExpression right = containedExpression.getRightExpression();
     if (left instanceof PyParenthesizedExpression) {
@@ -229,7 +228,7 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
         }        
       }
       else if ((pyExpression = PsiTreeUtil.getChildOfType(args[0], PyCallExpression.class)) != null) {
-        return resolveCallExpression((PyCallExpression)pyExpression);
+        return resolveCallExpressionForKeywordSubstitution((PyCallExpression)pyExpression);
       }
     }
     return null;
@@ -252,22 +251,17 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
   }
 
   @Nullable
-  private PyExpression resolveCallExpression(PyCallExpression pyExpression) {
+  private PyExpression resolveCallExpressionForKeywordSubstitution(PyCallExpression pyExpression) {
     PyExpression callee = pyExpression.getCallee();
     if (callee != null) {
       String name = callee.getName();
-
-      if ("dict".equals(name)) {
-        boolean isKeyword = myChunk.getMappingKey() != null;
-        myIgnoreUnresolved = false;
-        PyArgumentList list = pyExpression.getArgumentList();
-        if (isKeyword && list != null) {
-          return list.getKeywordArgument(myChunk.getMappingKey());
+        if ("dict".equals(name)) {
+          myIgnoreUnresolved = false;
+          PyArgumentList list = pyExpression.getArgumentList();
+          if (list != null) {
+            return list.getKeywordArgument(myChunk.getMappingKey());
+          }
         }
-        else {
-          return callee;
-        }
-      }
     }
     return null;
   }
diff --git a/python/testData/inspections/PyUnresolvedReferencesInspection/percentStringWithDictCall.py b/python/testData/inspections/PyUnresolvedReferencesInspection/percentStringWithDictCall.py
new file mode 100644
index 000000000000..5e0bbe3a8f88
--- /dev/null
+++ b/python/testData/inspections/PyUnresolvedReferencesInspection/percentStringWithDictCall.py
@@ -0,0 +1 @@
+var = "%s <warning descr="Unresolved reference '%s'">%s</warning>" % dict(), 1
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/PyResolveTest.java b/python/testSrc/com/jetbrains/python/PyResolveTest.java
index 7ea9e3cb2ee0..a24620e2bf54 100644
--- a/python/testSrc/com/jetbrains/python/PyResolveTest.java
+++ b/python/testSrc/com/jetbrains/python/PyResolveTest.java
@@ -714,7 +714,7 @@ public class PyResolveTest extends PyResolveTestCase {
   //PY-2748
   public void testPercentStringWithRefAsArgument() {
     PsiElement target = resolve();
-    assertEquals(null, target);    
+    assertEquals("tuple", target.getText());    
   }
 
   //PY-2748
@@ -744,8 +744,8 @@ public class PyResolveTest extends PyResolveTestCase {
   // PY-2748
   public void testPercentStringPosParenDictCall() {
     PsiElement target = resolve();
-    assertInstanceOf(target, PyReferenceExpression.class);
-    assertEquals("dict", ((PyReferenceExpression)target).getName());
+    assertInstanceOf(target, PyCallExpression.class);
+    assertEquals("dict()", target.getText());
   }
 
 
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
index 22d73b0e1744..b50f92713753 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyUnresolvedReferencesInspectionTest.java
@@ -667,6 +667,11 @@ public class PyUnresolvedReferencesInspectionTest extends PyInspectionTestCase {
     doTest();
   }
 
+  // PY-18115
+  public void testPercentStringWithDictCall() {
+    doTest();
+  }
+
   // PY-18254
   public void testVarargsAnnotatedWithFunctionComment() {
     doTest();