diff --git a/python/python-psi-impl/resources/intellij.python.psi.impl.xml b/python/python-psi-impl/resources/intellij.python.psi.impl.xml index f1415dfb6df0..4e9da13a4e5f 100644 --- a/python/python-psi-impl/resources/intellij.python.psi.impl.xml +++ b/python/python-psi-impl/resources/intellij.python.psi.impl.xml @@ -168,12 +168,12 @@ - + - - - - + + + + diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/PyCompatibilityVisitor.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyCompatibilityVisitor.java index 3e1219889c83..c9aeb5ccbc7d 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/PyCompatibilityVisitor.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyCompatibilityVisitor.java @@ -173,7 +173,7 @@ public abstract class PyCompatibilityVisitor extends PyElementVisitor { } PsiElement parent = node.getParent(); - if (parent instanceof PyAnnotation && StarAnnotator.isVariadicArg(parent.getParent())) { + if (parent instanceof PyAnnotation && PyStarAnnotator.isVariadicArg(parent.getParent())) { registerForAllMatchingVersions(level -> level.isOlderThan(LanguageLevel.PYTHON311) && registerForLanguageLevel(level), PyPsiBundle.message("INSP.compatibility.feature.support.starred.expressions.in.type.annotations"), diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/DocStringAnnotator.kt b/python/python-psi-impl/src/com/jetbrains/python/validation/PyDocStringAnnotator.kt similarity index 98% rename from python/python-psi-impl/src/com/jetbrains/python/validation/DocStringAnnotator.kt rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyDocStringAnnotator.kt index 97e0b53e15b7..c4c87c8962f2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/DocStringAnnotator.kt +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyDocStringAnnotator.kt @@ -25,7 +25,7 @@ import com.jetbrains.python.psi.* /** * Highlights doc strings in classes, functions, and files. */ -class DocStringAnnotator : PyAnnotatorBase() { +class PyDocStringAnnotator : PyAnnotatorBase() { override fun annotate(element: PsiElement, holder: PyAnnotationHolder) { element.accept(PyDocStringAnnotatorVisitor(holder)) } diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/FStringsAnnotator.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyFStringsAnnotator.java similarity index 98% rename from python/python-psi-impl/src/com/jetbrains/python/validation/FStringsAnnotator.java rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyFStringsAnnotator.java index df09503a5526..23ce375ed59e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/FStringsAnnotator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyFStringsAnnotator.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Mikhail Golubev */ -public final class FStringsAnnotator extends PyAnnotatorBase { +public final class PyFStringsAnnotator extends PyAnnotatorBase { @Override public void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) { diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/GeneratorInArgumentListAnnotator.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyGeneratorInArgumentListAnnotator.java similarity index 96% rename from python/python-psi-impl/src/com/jetbrains/python/validation/GeneratorInArgumentListAnnotator.java rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyGeneratorInArgumentListAnnotator.java index 2350f81558a4..9e55abd63be3 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/GeneratorInArgumentListAnnotator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyGeneratorInArgumentListAnnotator.java @@ -26,7 +26,7 @@ import com.jetbrains.python.psi.PyGeneratorExpression; import org.jetbrains.annotations.NotNull; -public final class GeneratorInArgumentListAnnotator extends PyAnnotatorBase { +public final class PyGeneratorInArgumentListAnnotator extends PyAnnotatorBase { @Override public void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) { element.accept(new MyVisitor(holder)); diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/PyMultiplePsiFilesVisitorFilter.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyMultiplePsiFilesVisitorFilter.java index 9b08c876393b..c08e56635dd2 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/PyMultiplePsiFilesVisitorFilter.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyMultiplePsiFilesVisitorFilter.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; public final class PyMultiplePsiFilesVisitorFilter implements PythonVisitorFilter { @Override public boolean isSupported(@NotNull Class visitorClass, @NotNull PsiFile file) { - if (visitorClass == StringLiteralQuotesAnnotator.class && + if (visitorClass == PyStringLiteralQuotesAnnotator.class && file.getViewProvider() instanceof MultiplePsiFilesPerDocumentFileViewProvider) { return false; } diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/StarAnnotator.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyStarAnnotator.java similarity index 97% rename from python/python-psi-impl/src/com/jetbrains/python/validation/StarAnnotator.java rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyStarAnnotator.java index 09e9e6a50cc4..62a1f1620ecc 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/StarAnnotator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyStarAnnotator.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public final class StarAnnotator extends PyAnnotatorBase { +public final class PyStarAnnotator extends PyAnnotatorBase { @Override public void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) { element.accept(new MyVisitor(holder)); diff --git a/python/python-psi-impl/src/com/jetbrains/python/validation/StringLiteralQuotesAnnotator.java b/python/python-psi-impl/src/com/jetbrains/python/validation/PyStringLiteralQuotesAnnotator.java similarity index 98% rename from python/python-psi-impl/src/com/jetbrains/python/validation/StringLiteralQuotesAnnotator.java rename to python/python-psi-impl/src/com/jetbrains/python/validation/PyStringLiteralQuotesAnnotator.java index 85cd0bb0a9cf..1c0fa848375e 100644 --- a/python/python-psi-impl/src/com/jetbrains/python/validation/StringLiteralQuotesAnnotator.java +++ b/python/python-psi-impl/src/com/jetbrains/python/validation/PyStringLiteralQuotesAnnotator.java @@ -19,7 +19,7 @@ import java.util.List; /** * Looks for well-formedness of string constants. */ -public final class StringLiteralQuotesAnnotator extends PyAnnotatorBase { +public final class PyStringLiteralQuotesAnnotator extends PyAnnotatorBase { @Override public void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) { element.accept(new MyVisitor(holder)); diff --git a/python/src/com/jetbrains/python/console/ConsoleVisitorFilter.java b/python/src/com/jetbrains/python/console/ConsoleVisitorFilter.java index 70de9cf24a44..e8063679a4c8 100644 --- a/python/src/com/jetbrains/python/console/ConsoleVisitorFilter.java +++ b/python/src/com/jetbrains/python/console/ConsoleVisitorFilter.java @@ -5,7 +5,7 @@ import com.intellij.psi.PsiFile; import com.jetbrains.python.inspections.*; import com.jetbrains.python.inspections.unusedLocal.PyUnusedLocalInspection; import com.jetbrains.python.psi.PythonVisitorFilter; -import com.jetbrains.python.validation.DocStringAnnotator; +import com.jetbrains.python.validation.PyDocStringAnnotator; import org.jetbrains.annotations.NotNull; /** @@ -28,7 +28,7 @@ public final class ConsoleVisitorFilter implements PythonVisitorFilter { } //annotators - if (visitorClass == DocStringAnnotator.class) { + if (visitorClass == PyDocStringAnnotator.class) { return false; } } diff --git a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java index bdbff14327ae..540080a2a505 100644 --- a/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java +++ b/python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java @@ -7,7 +7,7 @@ import com.jetbrains.python.inspections.*; import com.jetbrains.python.inspections.unresolvedReference.PyUnresolvedReferencesInspection; import com.jetbrains.python.psi.PyFile; import com.jetbrains.python.psi.PythonVisitorFilter; -import com.jetbrains.python.validation.DocStringAnnotator; +import com.jetbrains.python.validation.PyDocStringAnnotator; import com.jetbrains.python.validation.PyHighlightingAnnotatorVisitor; import com.jetbrains.python.validation.PyParameterListAnnotatorVisitor; import com.jetbrains.python.validation.ReturnAnnotator; @@ -35,7 +35,7 @@ public final class PyDocstringVisitorFilter implements PythonVisitorFilter { return false; } //annotators - if (visitorClass == DocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyHighlightingAnnotatorVisitor.class) + if (visitorClass == PyDocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyHighlightingAnnotatorVisitor.class) return false; // doctest in separate file final PsiFile topLevelFile = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file);