Skip to content

Commit 02caa4e

Browse files
PetrGolubevintellij-monorepo-bot
PetrGolubev
authored and
intellij-monorepo-bot
committed
PY-71549 Rename few annotators
GitOrigin-RevId: 8efc73022d49f23ececc9e4c1c2671c2aabdf327
1 parent e4affd4 commit 02caa4e

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎python/python-psi-impl/resources/intellij.python.psi.impl.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<inlineActionHandler implementation="com.jetbrains.python.refactoring.inline.PyInlineLocalHandler"/>
168168
<inlineActionHandler implementation="com.jetbrains.python.refactoring.inline.PyInlineFunctionHandler"/>
169169

170-
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyAnnotatingVisitor"/>
170+
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PySyntaxAnnotator"/>
171171
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyDocStringAnnotator"/>
172172
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyDefinitionsAnnotator"/>
173173
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyGeneratorInArgumentListAnnotator"/>
@@ -179,8 +179,8 @@
179179
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyLocalVariableAnnotator"/>
180180
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyTypeParameterListAnnotator"/>
181181
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyCompositeAnnotator"/>
182-
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyHighlightingAnnotatorVisitor"/>
183-
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyBuiltinAnnotatorVisitor"/>
182+
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyFunctionHighlightingAnnotator"/>
183+
<annotator language="Python" implementationClass="com.jetbrains.python.validation.PyBuiltinAnnotator"/>
184184
<annotator language="Python" implementationClass="com.jetbrains.python.validation.UnsupportedFeatures"/>
185185

186186
<localInspection language="Python" shortName="PyUnusedLocalInspection" suppressId="PyUnusedLocal" bundle="messages.PyPsiBundle" key="INSP.NAME.unused" groupKey="INSP.GROUP.python" enabledByDefault="true" level="WEAK WARNING" implementationClass="com.jetbrains.python.inspections.unusedLocal.PyUnusedLocalInspection"/>

python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotatorVisitor.java renamed to python/python-psi-impl/src/com/jetbrains/python/validation/PyBuiltinAnnotator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
/**
2929
* Marks built-in names.
3030
*/
31-
public class PyBuiltinAnnotatorVisitor extends PyAnnotatorBase {
31+
public class PyBuiltinAnnotator extends PyAnnotatorBase {
3232
@Override
3333
protected void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) {
3434
element.accept(new MyVisitor(holder));

python/python-psi-impl/src/com/jetbrains/python/validation/PyHighlightingAnnotatorVisitor.java renamed to python/python-psi-impl/src/com/jetbrains/python/validation/PyFunctionHighlightingAnnotator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import static com.jetbrains.python.psi.PyUtil.as;
1818

1919

20-
public class PyHighlightingAnnotatorVisitor extends PyAnnotatorBase {
20+
public class PyFunctionHighlightingAnnotator extends PyAnnotatorBase {
2121
@Override
2222
protected void annotate(@NotNull PsiElement element, @NotNull PyAnnotationHolder holder) {
2323
element.accept(new MyVisitor(holder));

python/python-psi-impl/src/com/jetbrains/python/validation/PyAnnotatingVisitor.java renamed to python/python-psi-impl/src/com/jetbrains/python/validation/PySyntaxAnnotator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import java.util.List;
1010

1111

12-
public final class PyAnnotatingVisitor extends PyAnnotatorBase implements DumbAware {
12+
public final class PySyntaxAnnotator extends PyAnnotatorBase implements DumbAware {
1313
@Override
1414
public void annotate(@NotNull PsiElement psiElement, @NotNull PyAnnotationHolder holder) {
1515
List<@NotNull PsiElementVisitor> visitors = List.of(

‎python/src/com/jetbrains/python/documentation/PyDocstringVisitorFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import com.jetbrains.python.psi.PyFile;
99
import com.jetbrains.python.psi.PythonVisitorFilter;
1010
import com.jetbrains.python.validation.PyDocStringAnnotator;
11-
import com.jetbrains.python.validation.PyHighlightingAnnotatorVisitor;
11+
import com.jetbrains.python.validation.PyFunctionHighlightingAnnotator;
1212
import com.jetbrains.python.validation.PyParameterListAnnotatorVisitor;
1313
import com.jetbrains.python.validation.ReturnAnnotator;
1414
import org.jetbrains.annotations.NotNull;
@@ -35,7 +35,7 @@ public boolean isSupported(final @NotNull Class visitorClass, final @NotNull Psi
3535
return false;
3636
}
3737
//annotators
38-
if (visitorClass == PyDocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyHighlightingAnnotatorVisitor.class)
38+
if (visitorClass == PyDocStringAnnotator.class || visitorClass == PyParameterListAnnotatorVisitor.class || visitorClass == ReturnAnnotator.class || visitorClass == PyFunctionHighlightingAnnotator.class)
3939
return false;
4040
// doctest in separate file
4141
final PsiFile topLevelFile = InjectedLanguageManager.getInstance(file.getProject()).getTopLevelFile(file);

0 commit comments

Comments
 (0)