From 2514c5021ec4c65eeef27434aebf8d77302c8e88 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Fri, 23 Sep 2016 14:36:53 +0300
Subject: [PATCH] PY-20810 Temporary suppress pycodestyle's E701 errors on
 variable annotations

---
 .../python/validation/Pep8ExternalAnnotator.java          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java b/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
index 5ddae0da08ec..a2c56c075c32 100644
--- a/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
+++ b/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
@@ -49,6 +49,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.util.IncorrectOperationException;
+import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.PythonFileType;
 import com.jetbrains.python.PythonHelper;
 import com.jetbrains.python.PythonLanguage;
@@ -274,6 +275,13 @@ public class Pep8ExternalAnnotator extends ExternalAnnotator<Pep8ExternalAnnotat
       }
 
       if (problemElement != null) {
+        // TODO Remove: a workaround until the bundled pycodestyle.py supports Python 3.6 variable annotations by itself
+        if (problem.myCode.equals("E701") &&
+            problemElement.getNode().getElementType() == PyTokenTypes.COLON &&
+            problemElement.getParent() instanceof PyAnnotation) {
+          continue;
+        }
+        
         TextRange problemRange = problemElement.getTextRange();
         // Multi-line warnings are shown only in the gutter and it's not the desired behavior from the usability point of view.
         // So we register it only on that line where pycodestyle.py found the problem originally.