From 46da603b07100191ac6768acdceeb29999cecafc Mon Sep 17 00:00:00 2001 From: Yaroslav Pankratyev Date: Tue, 14 Nov 2017 17:19:22 +0700 Subject: [PATCH] Some recursive visitors to implement PsiRecursiveVisitor --- .../lang/regexp/psi/RegExpRecursiveElementVisitor.java | 4 +++- .../intellij/json/psi/impl/JsonRecursiveElementVisitor.java | 3 ++- .../psi/impl/source/tree/RecursiveTreeElementVisitor.java | 4 +++- .../impl/source/tree/RecursiveTreeElementWalkingVisitor.java | 3 ++- .../groovy/lang/psi/GroovyRecursiveElementVisitor.java | 3 ++- .../com/jetbrains/python/psi/PyRecursiveElementVisitor.java | 3 ++- .../src/com/intellij/psi/XmlRecursiveElementVisitor.java | 2 +- .../com/intellij/psi/XmlRecursiveElementWalkingVisitor.java | 2 +- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpRecursiveElementVisitor.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpRecursiveElementVisitor.java index 7557af7987b0..5391a53e2c37 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpRecursiveElementVisitor.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/RegExpRecursiveElementVisitor.java @@ -15,7 +15,9 @@ */ package org.intellij.lang.regexp.psi; -public class RegExpRecursiveElementVisitor extends RegExpElementVisitor { +import com.intellij.psi.PsiRecursiveVisitor; + +public class RegExpRecursiveElementVisitor extends RegExpElementVisitor implements PsiRecursiveVisitor { public void visitRegExpElement(RegExpElement element) { element.acceptChildren(this); } diff --git a/json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java b/json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java index 902b4a01a3d3..a3b4b7832605 100644 --- a/json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java +++ b/json/src/com/intellij/json/psi/impl/JsonRecursiveElementVisitor.java @@ -2,11 +2,12 @@ package com.intellij.json.psi.impl; import com.intellij.json.psi.JsonElementVisitor; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiRecursiveVisitor; /** * @author Mikhail Golubev */ -public class JsonRecursiveElementVisitor extends JsonElementVisitor { +public class JsonRecursiveElementVisitor extends JsonElementVisitor implements PsiRecursiveVisitor { public void visitElement(final PsiElement element) { element.acceptChildren(this); diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementVisitor.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementVisitor.java index 88e5e85905fa..eb9c3ce8ea3a 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementVisitor.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementVisitor.java @@ -16,7 +16,9 @@ package com.intellij.psi.impl.source.tree; -public abstract class RecursiveTreeElementVisitor extends TreeElementVisitor{ +import com.intellij.psi.PsiRecursiveVisitor; + +public abstract class RecursiveTreeElementVisitor extends TreeElementVisitor implements PsiRecursiveVisitor { @Override public void visitLeaf(LeafElement leaf) { visitNode(leaf); } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java index 82d9e3998dcd..73085873db1b 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java @@ -17,10 +17,11 @@ package com.intellij.psi.impl.source.tree; import com.intellij.lang.ASTNode; +import com.intellij.psi.PsiRecursiveVisitor; import com.intellij.util.WalkingState; import org.jetbrains.annotations.NotNull; -public abstract class RecursiveTreeElementWalkingVisitor extends TreeElementVisitor { +public abstract class RecursiveTreeElementWalkingVisitor extends TreeElementVisitor implements PsiRecursiveVisitor { private final boolean myDoTransform; protected RecursiveTreeElementWalkingVisitor() { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/GroovyRecursiveElementVisitor.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/GroovyRecursiveElementVisitor.java index e779d1351c79..6bc9d8128674 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/GroovyRecursiveElementVisitor.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/GroovyRecursiveElementVisitor.java @@ -15,12 +15,13 @@ */ package org.jetbrains.plugins.groovy.lang.psi; +import com.intellij.psi.PsiRecursiveVisitor; import org.jetbrains.annotations.NotNull; /** * @author ven */ -public abstract class GroovyRecursiveElementVisitor extends GroovyElementVisitor { +public abstract class GroovyRecursiveElementVisitor extends GroovyElementVisitor implements PsiRecursiveVisitor { @Override public void visitElement(@NotNull GroovyPsiElement element) { diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java b/python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java index f56317000382..11d98c452be0 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyRecursiveElementVisitor.java @@ -16,11 +16,12 @@ package com.jetbrains.python.psi; import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiRecursiveVisitor; /** * @author yole */ -public class PyRecursiveElementVisitor extends PyElementVisitor { +public class PyRecursiveElementVisitor extends PyElementVisitor implements PsiRecursiveVisitor { public void visitElement(final PsiElement element) { element.acceptChildren(this); } diff --git a/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementVisitor.java b/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementVisitor.java index cb63266d76b9..0d85f2fbed9b 100644 --- a/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementVisitor.java +++ b/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementVisitor.java @@ -21,7 +21,7 @@ package com.intellij.psi; import java.util.List; -public class XmlRecursiveElementVisitor extends XmlElementVisitor { +public class XmlRecursiveElementVisitor extends XmlElementVisitor implements PsiRecursiveVisitor { private final boolean myVisitAllFileRoots; public XmlRecursiveElementVisitor() { diff --git a/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementWalkingVisitor.java b/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementWalkingVisitor.java index 490eb62eb75e..16fcc9628452 100644 --- a/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementWalkingVisitor.java +++ b/xml/xml-psi-api/src/com/intellij/psi/XmlRecursiveElementWalkingVisitor.java @@ -21,7 +21,7 @@ package com.intellij.psi; import java.util.List; -public class XmlRecursiveElementWalkingVisitor extends XmlElementVisitor { +public class XmlRecursiveElementWalkingVisitor extends XmlElementVisitor implements PsiRecursiveVisitor { private final boolean myVisitAllFileRoots; private final PsiWalkingState myWalkingState = new PsiWalkingState(this){};