From 925853fade5be790f1776f3fc9031716dfa4afe6 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 20 Feb 2013 14:30:30 +0400 Subject: [PATCH] excluded unused intentions/inspections from doctest dialect PY-8939 redundant inspections in doctests --- .../codeInsight/intentions/PyGenerateDocstringIntention.java | 2 ++ .../jetbrains/python/codeInsight/intentions/TypeIntention.java | 2 ++ .../python/documentation/doctest/PyDocstringVisitorFilter.java | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/PyGenerateDocstringIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/PyGenerateDocstringIntention.java index 89259692943b..47b60d49162f 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/PyGenerateDocstringIntention.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/PyGenerateDocstringIntention.java @@ -2,6 +2,7 @@ package com.jetbrains.python.codeInsight.intentions; import com.intellij.codeInsight.CodeInsightUtilBase; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; +import com.intellij.injected.editor.EditorWindow; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; @@ -36,6 +37,7 @@ public class PyGenerateDocstringIntention extends BaseIntentionAction { } public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { + if (editor instanceof EditorWindow) return false; PsiElement elementAt = PyUtil.findNonWhitespaceAtOffset(file, editor.getCaretModel().getOffset()); if (elementAt == null) { return false; diff --git a/python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java b/python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java index 95a08e8431ca..e4316174294e 100644 --- a/python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java +++ b/python/src/com/jetbrains/python/codeInsight/intentions/TypeIntention.java @@ -1,6 +1,7 @@ package com.jetbrains.python.codeInsight.intentions; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.injected.editor.EditorWindow; import com.intellij.lang.ASTNode; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -25,6 +26,7 @@ import org.jetbrains.annotations.Nullable; public abstract class TypeIntention implements IntentionAction { public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { + if (editor instanceof EditorWindow) return false; updateText(false); PsiElement elementAt = PyUtil.findNonWhitespaceAtOffset(file, editor.getCaretModel().getOffset()); diff --git a/python/src/com/jetbrains/python/documentation/doctest/PyDocstringVisitorFilter.java b/python/src/com/jetbrains/python/documentation/doctest/PyDocstringVisitorFilter.java index 90c721874fe7..177ebd098ce0 100644 --- a/python/src/com/jetbrains/python/documentation/doctest/PyDocstringVisitorFilter.java +++ b/python/src/com/jetbrains/python/documentation/doctest/PyDocstringVisitorFilter.java @@ -26,7 +26,8 @@ public class PyDocstringVisitorFilter implements PythonVisitorFilter { visitorClass == PyUnboundLocalVariableInspection.class || visitorClass == PyUnnecessaryBackslashInspection.class || visitorClass == PyByteLiteralInspection.class || visitorClass == PyNonAsciiCharInspection.class || visitorClass == PyPackageRequirementsInspection.class || visitorClass == PyMandatoryEncodingInspection.class || - visitorClass == PyInterpreterInspection.class) { + visitorClass == PyInterpreterInspection.class || visitorClass == PyDocstringTypesInspection.class || + visitorClass == PySingleQuotedDocstringInspection.class) { return false; } //annotators