From 9a52af555314fa4459d01036bc7f31f636c39276 Mon Sep 17 00:00:00 2001
From: "Andrei-Silviu DRAGNEA (24887)" <andrei.dragnea@stud.acs.upb.ro>
Date: Sat, 23 Dec 2017 21:47:17 +0200
Subject: [PATCH] [PY-27710] Fix for erroneous "Too few arguments for format
 string"

---
 .../python/codeInsight/PySubstitutionChunkReference.java     | 2 +-
 ...NewStylePositionalSubstitutionAfterKeywordSubstitution.py | 1 +
 .../python/inspections/PyStringFormatInspectionTest.java     | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 python/testData/inspections/PyStringFormatInspection/NewStylePositionalSubstitutionAfterKeywordSubstitution.py

diff --git a/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java b/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
index 4ffe67a738fc..5e70d5a8d6b3 100644
--- a/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
+++ b/python/src/com/jetbrains/python/codeInsight/PySubstitutionChunkReference.java
@@ -74,7 +74,7 @@ public class PySubstitutionChunkReference extends PsiReferenceBase<PyStringLiter
 
   @Nullable
   private PsiElement resolvePositionalFormat(@NotNull PyArgumentList argumentList) {
-    final int position = myChunk.getPosition() == null ? myPosition : myChunk.getPosition();
+    final int position = myChunk.getAutoPosition() == null ? myPosition : myChunk.getAutoPosition();
     int n = 0;
     boolean notSureAboutStarArgs = false;
     PyStarArgument firstStarArg = null;
diff --git a/python/testData/inspections/PyStringFormatInspection/NewStylePositionalSubstitutionAfterKeywordSubstitution.py b/python/testData/inspections/PyStringFormatInspection/NewStylePositionalSubstitutionAfterKeywordSubstitution.py
new file mode 100644
index 000000000000..7138ded8e069
--- /dev/null
+++ b/python/testData/inspections/PyStringFormatInspection/NewStylePositionalSubstitutionAfterKeywordSubstitution.py
@@ -0,0 +1 @@
+'{a} {}'.format(6, a=2)
\ No newline at end of file
diff --git a/python/testSrc/com/jetbrains/python/inspections/PyStringFormatInspectionTest.java b/python/testSrc/com/jetbrains/python/inspections/PyStringFormatInspectionTest.java
index d8a58a99cf68..9a220c0e9883 100644
--- a/python/testSrc/com/jetbrains/python/inspections/PyStringFormatInspectionTest.java
+++ b/python/testSrc/com/jetbrains/python/inspections/PyStringFormatInspectionTest.java
@@ -124,6 +124,11 @@ public class PyStringFormatInspectionTest extends PyInspectionTestCase {
   public void testNewStyleCallExpressionArgument() {
     doTest();
   }
+
+  // PY-27710
+  public void testNewStylePositionalSubstitutionAfterKeywordSubstitution() {
+    doTest();
+  }
   
   public void testPercentStringWithFormatStringReplacementSymbols() {
     doTest();