MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-20058 Fix the check that we should suppress E402 in Jupyter notebooks

Browse Source 
So that it ignores preceding comments and imports and, overall,
mutes this error not only on the first import statement in a cell.

Also I accidentally used the interface PyImportStatement instead of
PyImportStatementBase before, so, the previous fix didn't handle the
original case with "from __future__ import print_function".
This commit is contained in:
Mikhail Golubev
2016-08-15 20:19:33 +03:00
parent 590006387f
commit 10fffd25a8
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbPep8ProblemSuppressor.java
+5 -8
View File
@@ -3,10 +3,7 @@ package org.jetbrains.plugins.ipnb;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.psi.PyEmptyExpression;
import com.jetbrains.python.psi.PyExpressionStatement;
import com.jetbrains.python.psi.PyFile;
import com.jetbrains.python.psi.PyImportStatement;
import com.jetbrains.python.psi.*;
import com.jetbrains.python.psi.impl.PyPsiUtils;
import com.jetbrains.python.validation.Pep8ExternalAnnotator;
import com.jetbrains.python.validation.Pep8ProblemSuppressor;
@@ -32,18 +29,18 @@ public class IpnbPep8ProblemSuppressor implements Pep8ProblemSuppressor {
// Ignore warnings about imports not at the top of file if there are magic commands before
if (problem.getCode().equals("E402") && targetElement != null) {
final PyImportStatement importStatement = PsiTreeUtil.getParentOfType(targetElement, PyImportStatement.class);
final PyImportStatementBase importStatement = PsiTreeUtil.getParentOfType(targetElement, PyImportStatementBase.class);
if (importStatement != null && importStatement.getParent() == file) {
boolean containsMagicCommandsBefore = false;
PsiElement prev = PyPsiUtils.getPrevNonWhitespaceSibling(importStatement);
PsiElement prev = PyPsiUtils.getPrevNonCommentSibling(importStatement, true);
while (prev != null) {
if (prev instanceof PyEmptyExpression && prev.getText().startsWith("%")) {
containsMagicCommandsBefore = true;
}
else if (!isModuleLevelDocstring(prev, (PyFile)file)) {
else if (!(isModuleLevelDocstring(prev, (PyFile)file) || prev instanceof PyImportStatementBase)) {
return false;
}
prev = PyPsiUtils.getPrevNonWhitespaceSibling(prev);
prev = PyPsiUtils.getPrevNonCommentSibling(prev, true);
}
return containsMagicCommandsBefore;
}