From 7beaa6dacef228e7ae2d254ea1816e630caaa10b Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Tue, 20 Mar 2018 17:45:11 +0300
Subject: [PATCH] PY-27940 Try to parse pycodestyle.py errors even if stderr is
 not empty

They haven't updated the script for the recent changes of re module
in Python 3.7, and, otherwise, FutureWarnings in its output prevent us
from displaying any messages from the linter at all.
---
 .../python/validation/Pep8ExternalAnnotator.java  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java b/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
index 180274dcb514..c70a0f67c4e7 100644
--- a/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
+++ b/python/src/com/jetbrains/python/validation/Pep8ExternalAnnotator.java
@@ -50,6 +50,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.intellij.util.containers.ContainerUtil;
 import com.jetbrains.python.PyTokenTypes;
 import com.jetbrains.python.PythonFileType;
 import com.jetbrains.python.PythonHelper;
@@ -234,18 +235,14 @@ public class Pep8ExternalAnnotator extends ExternalAnnotator<Pep8ExternalAnnotat
     Results results = new Results(collectedInfo.level);
     if (output.isTimeout()) {
       LOG.info("Timeout running pycodestyle.py");
+      return results;
     }
-    else if (output.getStderrLines().isEmpty()) {
-      for (String line : output.getStdoutLines()) {
-        final Problem problem = parseProblem(line);
-        if (problem != null) {
-          results.problems.add(problem);
-        }
-      }
-    }
-    else if (((ApplicationInfoImpl) ApplicationInfo.getInstance()).isEAP()) {
+    if (!output.getStderr().isEmpty() && ((ApplicationInfoImpl) ApplicationInfo.getInstance()).isEAP()) {
       LOG.info("Error running pycodestyle.py: " + output.getStderr());
     }
+    for (String line : output.getStdoutLines()) {
+      ContainerUtil.addIfNotNull(results.problems, parseProblem(line));
+    }
     return results;
   }