diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java index 5466d4ae930f..50d0eec4b414 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/CompletionElement.java @@ -16,7 +16,7 @@ package com.intellij.codeInsight.completion.scope; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.PsiUtilBase; /** * Created by IntelliJ IDEA. @@ -64,7 +64,7 @@ public class CompletionElement{ return field.getContainingClass().getQualifiedName() + "#" + s; } else if(myElement instanceof PsiElement){ - name = PsiUtil.getName((PsiElement)myElement); + name = PsiUtilBase.getName((PsiElement)myElement); } else{ name = ""; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java index b3fe96ef26ea..5f18ce30add7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java @@ -30,6 +30,7 @@ import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.PsiUtilBase; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -228,7 +229,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme } public boolean satisfies(@NotNull PsiElement element, @NotNull ResolveState state) { - final String name = PsiUtil.getName(element); + final String name = PsiUtilBase.getName(element); if (StringUtil.isNotEmpty(name) && (myMatcher == null || myMatcher.value(name))) { if (myFilter.isClassAcceptable(element.getClass()) && myFilter.isAcceptable(new CandidateInfo(element, state.get(PsiSubstitutor.KEY)), myElement)) { return true; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java index 62e6e4f75e71..007595554526 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java @@ -74,7 +74,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Processor; import gnu.trove.THashSet; import gnu.trove.TObjectIntHashMap; @@ -271,7 +271,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { private HighlightInfo processIdentifier(PsiIdentifier identifier, ProgressIndicator progress) { if (InspectionManagerEx.inspectionResultSuppressed(identifier, myUnusedSymbolInspection)) return null; PsiElement parent = identifier.getParent(); - if (PsiUtilBase.hasErrorElementChild(parent)) return null; + if (PsiUtilCore.hasErrorElementChild(parent)) return null; if (parent instanceof PsiLocalVariable && myUnusedSymbolInspection.LOCAL_VARIABLE) { return processLocalVariable((PsiLocalVariable)parent, progress); @@ -430,7 +430,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { PsiElement declarationScope = parameter.getDeclarationScope(); if (declarationScope instanceof PsiMethod) { PsiMethod method = (PsiMethod)declarationScope; - if (PsiUtilBase.hasErrorElementChild(method)) return null; + if (PsiUtilCore.hasErrorElementChild(method)) return null; if ((method.isConstructor() || method.hasModifierProperty(PsiModifier.PRIVATE) || method.hasModifierProperty(PsiModifier.STATIC) || @@ -664,7 +664,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { // jsp include directive hack if (importStatement instanceof JspxImportStatement && ((JspxImportStatement)importStatement).isForeignFileImport()) return null; - if (PsiUtilBase.hasErrorElementChild(importStatement)) return null; + if (PsiUtilCore.hasErrorElementChild(importStatement)) return null; boolean isRedundant = myRefCountHolder.isRedundant(importStatement); if (!isRedundant && !(importStatement instanceof PsiImportStaticStatement)) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java index a04a97232faf..1d5b72e67dbf 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightClassUtil.java @@ -63,7 +63,7 @@ public class HighlightClassUtil { static HighlightInfo checkAbstractInstantiation(PsiJavaCodeReferenceElement ref, PsiElement resolved) { PsiElement parent = ref.getParent(); HighlightInfo highlightInfo = null; - if (parent instanceof PsiNewExpression && !PsiUtilBase.hasErrorElementChild(parent)) { + if (parent instanceof PsiNewExpression && !PsiUtilCore.hasErrorElementChild(parent)) { if (((PsiNewExpression)parent).getType() instanceof PsiArrayType) return null; if (resolved instanceof PsiClass) { highlightInfo = checkInstantiationOfAbstractClass((PsiClass)resolved, ref); @@ -71,7 +71,7 @@ public class HighlightClassUtil { } else if (parent instanceof PsiAnonymousClass && parent.getParent() instanceof PsiNewExpression - && !PsiUtilBase.hasErrorElementChild(parent.getParent())) { + && !PsiUtilCore.hasErrorElementChild(parent.getParent())) { PsiAnonymousClass aClass = (PsiAnonymousClass)parent; highlightInfo = checkClassWithAbstractMethods(aClass, ref.getTextRange()); } @@ -258,7 +258,7 @@ public class HighlightClassUtil { return null; } PsiField field = (PsiField)keyword.getParent().getParent(); - if (PsiUtilBase.hasErrorElementChild(field)) return null; + if (PsiUtilCore.hasErrorElementChild(field)) return null; // except compile time constants if (PsiUtil.isCompileTimeConstant(field)) { return null; @@ -279,7 +279,7 @@ public class HighlightClassUtil { return null; } PsiMethod method = (PsiMethod)keyword.getParent().getParent(); - if (PsiUtilBase.hasErrorElementChild(method)) return null; + if (PsiUtilCore.hasErrorElementChild(method)) return null; HighlightInfo errorResult = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, keyword, STATIC_DECLARATION_IN_INNER_CLASS); @@ -296,7 +296,7 @@ public class HighlightClassUtil { return null; } PsiClassInitializer initializer = (PsiClassInitializer)keyword.getParent().getParent(); - if (PsiUtilBase.hasErrorElementChild(initializer)) return null; + if (PsiUtilCore.hasErrorElementChild(initializer)) return null; HighlightInfo errorResult = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, keyword, STATIC_DECLARATION_IN_INNER_CLASS); @@ -332,7 +332,7 @@ public class HighlightClassUtil { return null; } PsiClass aClass = (PsiClass)keyword.getParent(); - if (PsiUtilBase.hasErrorElementChild(aClass)) return null; + if (PsiUtilCore.hasErrorElementChild(aClass)) return null; // highlight 'static' keyword if any, or class or interface if not PsiElement context = null; PsiModifierList modifierList = aClass.getModifierList(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java index 988fba88b4b7..f3899c1d25f1 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java @@ -749,7 +749,7 @@ public class HighlightMethodUtil { && !method.hasModifierProperty(PsiModifier.NATIVE) && aClass != null && !aClass.isInterface() - && !PsiUtilBase.hasErrorElementChild(method)) { + && !PsiUtilCore.hasErrorElementChild(method)) { int start = method.getModifierList().getTextRange().getStartOffset(); int end = method.getTextRange().getEndOffset(); @@ -773,7 +773,7 @@ public class HighlightMethodUtil { && aClass != null && !aClass.hasModifierProperty(PsiModifier.ABSTRACT) && !aClass.isEnum() - && !PsiUtilBase.hasErrorElementChild(method)) { + && !PsiUtilCore.hasErrorElementChild(method)) { errorResult = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, elementToHighlight, JavaErrorMessages.message("abstract.method.in.non.abstract.class")); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index a528966d4f75..b4f8c866789f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -774,7 +774,7 @@ public class HighlightUtil { @Nullable private static Map> getIncompatibleModifierMap(PsiModifierList modifierList) { PsiElement parent = modifierList.getParent(); - if (parent == null || PsiUtilBase.hasErrorElementChild(parent)) return null; + if (parent == null || PsiUtilCore.hasErrorElementChild(parent)) return null; return parent instanceof PsiClass ? ((PsiClass)parent).isInterface() ? ourInterfaceIncompatibleModifiers : ourClassIncompatibleModifiers : parent instanceof PsiMethod @@ -787,7 +787,7 @@ public class HighlightUtil { @Nullable public static String getIncompatibleModifier(String modifier, PsiModifierList modifierList) { PsiElement parent = modifierList.getParent(); - if (parent == null || PsiUtilBase.hasErrorElementChild(parent)) return null; + if (parent == null || PsiUtilCore.hasErrorElementChild(parent)) return null; final Map> incompatibleModifierMap = getIncompatibleModifierMap(modifierList); if (incompatibleModifierMap == null) return null; return getIncompatibleModifier(modifier, modifierList, incompatibleModifierMap); @@ -798,7 +798,7 @@ public class HighlightUtil { public static HighlightInfo checkNotAllowedModifier(PsiKeyword keyword, PsiModifierList modifierList) { PsiElement modifierOwner = modifierList.getParent(); if (modifierOwner == null) return null; - if (PsiUtilBase.hasErrorElementChild(modifierOwner)) return null; + if (PsiUtilCore.hasErrorElementChild(modifierOwner)) return null; @Modifier String modifier = keyword.getText(); final Map> incompatibleModifierMap = getIncompatibleModifierMap(modifierList); if (incompatibleModifierMap == null) return null; @@ -1201,7 +1201,7 @@ public class HighlightUtil { @Nullable static HighlightInfo checkNotAStatement(PsiStatement statement) { - if (!PsiUtil.isStatement(statement) && !PsiUtilBase.hasErrorElementChild(statement)) { + if (!PsiUtil.isStatement(statement) && !PsiUtilCore.hasErrorElementChild(statement)) { return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, statement, JavaErrorMessages.message("not.a.statement")); } return null; @@ -1682,7 +1682,7 @@ public class HighlightUtil { typeOwner instanceof PsiClassObjectAccessExpression && TypeConversionUtil.isVoidType(((PsiClassObjectAccessExpression)typeOwner).getOperand().getType()) || // do not highlight incomplete declarations - typeOwner != null && PsiUtilBase.hasErrorElementChild(typeOwner)) { + typeOwner != null && PsiUtilCore.hasErrorElementChild(typeOwner)) { return null; } else if (typeOwner instanceof JavaCodeFragment) { diff --git a/java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenToStaticImportProcessor.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenToStaticImportProcessor.java index 20050e3b1c01..e210fa99c82c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenToStaticImportProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/impl/ShortenToStaticImportProcessor.java @@ -28,6 +28,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,7 +60,7 @@ public class ShortenToStaticImportProcessor implements TemplateOptionalProcessor List> staticImportTargets = new ArrayList>(); for ( - PsiElement element = PsiUtilBase.getElementAtOffset(file, templateRange.getStartOffset()); + PsiElement element = PsiUtilCore.getElementAtOffset(file, templateRange.getStartOffset()); element != null && element.getTextRange().getStartOffset() < templateRange.getEndOffset(); element = getNext(element)) { diff --git a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java index a82f5ca28816..baa5a32af615 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java @@ -33,7 +33,7 @@ import com.intellij.psi.impl.source.tree.JavaElementType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; /** @@ -82,7 +82,7 @@ public class JavaParserDefinition implements ParserDefinition { return ((JavaStubElementType)type).createPsi(node); } - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } public PsiFile createFile(final FileViewProvider viewProvider) { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java b/java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java index 18c3ba7a8545..3dab04d34b94 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/ElementToWorkOn.java @@ -23,13 +23,10 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pass; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.*; import com.intellij.refactoring.IntroduceTargetChooser; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; -import com.intellij.psi.util.PsiExpressionTrimRenderer; import com.intellij.refactoring.util.CommonRefactoringUtil; import java.util.List; @@ -92,7 +89,7 @@ public class ElementToWorkOn { final int offset = editor.getCaretModel().getOffset(); final PsiElement[] statementsInRange = IntroduceVariableBase.findStatementsAtOffset(editor, file, offset); - if (statementsInRange.length == 1 && (PsiUtilBase.hasErrorElementChild(statementsInRange[0]) || !PsiUtil.isStatement(statementsInRange[0]))) { + if (statementsInRange.length == 1 && (PsiUtilCore.hasErrorElementChild(statementsInRange[0]) || !PsiUtil.isStatement(statementsInRange[0]))) { editor.getSelectionModel().selectLineAtCaret(); final ElementToWorkOn elementToWorkOn = getElementToWorkOn(editor, file, refactoringName, helpId, project, localVar, expr); if (elementToWorkOn == null || elementToWorkOn.getLocalVariable() == null && elementToWorkOn.getExpression() == null) { diff --git a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java index 4891cdac0b56..e350daa2b3af 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableBase.java @@ -46,10 +46,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.*; import com.intellij.psi.impl.PsiDiamondTypeUtil; import com.intellij.psi.impl.source.tree.java.ReplaceExpressionUtil; -import com.intellij.psi.util.PsiExpressionTrimRenderer; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.*; import com.intellij.refactoring.*; import com.intellij.refactoring.introduce.inplace.AbstractInplaceIntroducer; import com.intellij.refactoring.introduce.inplace.OccurrencesChooser; @@ -96,7 +93,7 @@ public abstract class IntroduceVariableBase extends IntroduceHandlerBase impleme final PsiElement[] statementsInRange = findStatementsAtOffset(editor, file, offset); //try line selection - if (statementsInRange.length == 1 && (PsiUtil.hasErrorElementChild(statementsInRange[0]) || + if (statementsInRange.length == 1 && (PsiUtilCore.hasErrorElementChild(statementsInRange[0]) || !PsiUtil.isStatement(statementsInRange[0]) || statementsInRange[0].getTextRange().getStartOffset() >= offset || statementsInRange[0].getTextRange().getEndOffset() <= offset || diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java index 8b26f4bc2692..5380326a2b38 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveJavaMemberHandler.java @@ -21,10 +21,7 @@ import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.JavaResolveUtil; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.MethodSignatureUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.*; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.*; import com.intellij.util.IncorrectOperationException; @@ -257,7 +254,7 @@ public class MoveJavaMemberHandler implements MoveMemberHandler { final Comparator fieldComparator = new Comparator() { public int compare(final PsiField o1, final PsiField o2) { - return -PsiUtilBase.compareElementsByPosition(o1, o2); + return -PsiUtilCore.compareElementsByPosition(o1, o2); } }; diff --git a/java/openapi/src/com/intellij/psi/util/PsiUtil.java b/java/openapi/src/com/intellij/psi/util/PsiUtil.java index cc5d074638b4..d4db90343f57 100644 --- a/java/openapi/src/com/intellij/psi/util/PsiUtil.java +++ b/java/openapi/src/com/intellij/psi/util/PsiUtil.java @@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; -public final class PsiUtil extends PsiUtilBase { +public final class PsiUtil extends PsiUtilCore { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.util.PsiUtil"); public static final int ACCESS_LEVEL_PUBLIC = 4; public static final int ACCESS_LEVEL_PROTECTED = 3; diff --git a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java index e5186aad8fb0..9e2206215cda 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiUtilCore.java @@ -17,19 +17,261 @@ package com.intellij.psi.util; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiFileSystemItem; +import com.intellij.psi.*; +import com.intellij.psi.scope.PsiScopeProcessor; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.SearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import javax.swing.*; import java.util.Collection; /** * @author yole */ public class PsiUtilCore { + @SuppressWarnings("ConstantConditions") + public static final PsiElement NULL_PSI_ELEMENT = new PsiElement() { + @NotNull + public Project getProject() { + throw new PsiInvalidElementAccessException(this); + } + + @NotNull + public Language getLanguage() { + throw new IllegalAccessError(); + } + + public PsiManager getManager() { + return null; + } + + @NotNull + public PsiElement[] getChildren() { + return new PsiElement[0]; + } + + public PsiElement getParent() { + return null; + } + + @Nullable + public PsiElement getFirstChild() { + return null; + } + + @Nullable + public PsiElement getLastChild() { + return null; + } + + @Nullable + public PsiElement getNextSibling() { + return null; + } + + @Nullable + public PsiElement getPrevSibling() { + return null; + } + + public PsiFile getContainingFile() { + throw new PsiInvalidElementAccessException(this); + } + + public TextRange getTextRange() { + return null; + } + + public int getStartOffsetInParent() { + return 0; + } + + public int getTextLength() { + return 0; + } + + public PsiElement findElementAt(int offset) { + return null; + } + + @Nullable + public PsiReference findReferenceAt(int offset) { + return null; + } + + public int getTextOffset() { + return 0; + } + + public String getText() { + return null; + } + + @NotNull + public char[] textToCharArray() { + return new char[0]; + } + + public PsiElement getNavigationElement() { + return null; + } + + public PsiElement getOriginalElement() { + return null; + } + + public boolean textMatches(@NotNull CharSequence text) { + return false; + } + + public boolean textMatches(@NotNull PsiElement element) { + return false; + } + + public boolean textContains(char c) { + return false; + } + + public void accept(@NotNull PsiElementVisitor visitor) { + + } + + public void acceptChildren(@NotNull PsiElementVisitor visitor) { + + } + + public PsiElement copy() { + return null; + } + + public PsiElement add(@NotNull PsiElement element) { + return null; + } + + public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) { + return null; + } + + public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) { + return null; + } + + public void checkAdd(@NotNull PsiElement element) { + + } + + public PsiElement addRange(PsiElement first, PsiElement last) { + return null; + } + + public PsiElement addRangeBefore(@NotNull PsiElement first, @NotNull PsiElement last, PsiElement anchor) { + return null; + } + + public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) { + return null; + } + + public void delete() { + + } + + public void checkDelete() { + + } + + public void deleteChildRange(PsiElement first, PsiElement last) { + + } + + public PsiElement replace(@NotNull PsiElement newElement) { + return null; + } + + public boolean isValid() { + return false; + } + + public boolean isWritable() { + return false; + } + + @Nullable + public PsiReference getReference() { + return null; + } + + @NotNull + public PsiReference[] getReferences() { + return new PsiReference[0]; + } + + public T getCopyableUserData(Key key) { + return null; + } + + public void putCopyableUserData(Key key, T value) { + + } + + public boolean processDeclarations(@NotNull PsiScopeProcessor processor, + @NotNull ResolveState state, + PsiElement lastParent, + @NotNull PsiElement place) { + return false; + } + + public PsiElement getContext() { + return null; + } + + public boolean isPhysical() { + return false; + } + + @NotNull + public GlobalSearchScope getResolveScope() { + return GlobalSearchScope.EMPTY_SCOPE; + } + + @NotNull + public SearchScope getUseScope() { + return GlobalSearchScope.EMPTY_SCOPE; + } + + public ASTNode getNode() { + return null; + } + + public T getUserData(@NotNull Key key) { + return null; + } + + public void putUserData(@NotNull Key key, T value) { + + } + + public Icon getIcon(int flags) { + return null; + } + + public boolean isEquivalentTo(final PsiElement another) { + return this == another; + } + + @Override + public String toString() { + return "NULL_PSI_ELEMENT"; + } + }; + @NotNull public static PsiElement[] toPsiElementArray(@NotNull Collection collection) { if (collection.isEmpty()) return PsiElement.EMPTY_ARRAY; @@ -60,4 +302,42 @@ public class PsiUtilCore { return containingFile.getVirtualFile(); } + + public static int compareElementsByPosition(final PsiElement element1, final PsiElement element2) { + if (element1 != null && element2 != null) { + final PsiFile psiFile1 = element1.getContainingFile(); + final PsiFile psiFile2 = element2.getContainingFile(); + if (Comparing.equal(psiFile1, psiFile2)){ + final TextRange textRange1 = element1.getTextRange(); + final TextRange textRange2 = element2.getTextRange(); + if (textRange1 != null && textRange2 != null) { + return textRange1.getStartOffset() - textRange2.getStartOffset(); + } + } else if (psiFile1 != null && psiFile2 != null){ + final String name1 = psiFile1.getName(); + final String name2 = psiFile2.getName(); + return name1.compareToIgnoreCase(name2); + } + } + return 0; + } + + public static boolean hasErrorElementChild(PsiElement element) { + for (PsiElement child = element.getFirstChild(); child != null; child = child.getNextSibling()) { + if (child instanceof PsiErrorElement) return true; + } + return false; + } + + @NotNull + public static PsiElement getElementAtOffset(@NotNull PsiFile file, int offset) { + PsiElement elt = file.findElementAt(offset); + if (elt == null && offset > 0) { + elt = file.findElementAt(offset - 1); + } + if (elt == null) { + return file; + } + return elt; + } } diff --git a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java index 215835a96969..ccf565b7fc50 100644 --- a/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java +++ b/platform/lang-api/src/com/intellij/psi/util/PsiUtilBase.java @@ -32,8 +32,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.AsyncResult; -import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -41,9 +39,6 @@ import com.intellij.openapi.vfs.VirtualFileSystem; import com.intellij.psi.*; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; -import com.intellij.psi.scope.PsiScopeProcessor; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.search.SearchScope; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,241 +47,6 @@ import javax.swing.*; import java.util.Collection; public class PsiUtilBase extends PsiUtilCore { - @SuppressWarnings("ConstantConditions") - public static final PsiElement NULL_PSI_ELEMENT = new PsiElement() { - @NotNull - public Project getProject() { - throw new PsiInvalidElementAccessException(this); - } - - @NotNull - public Language getLanguage() { - throw new IllegalAccessError(); - } - - public PsiManager getManager() { - return null; - } - - @NotNull - public PsiElement[] getChildren() { - return new PsiElement[0]; - } - - public PsiElement getParent() { - return null; - } - - @Nullable - public PsiElement getFirstChild() { - return null; - } - - @Nullable - public PsiElement getLastChild() { - return null; - } - - @Nullable - public PsiElement getNextSibling() { - return null; - } - - @Nullable - public PsiElement getPrevSibling() { - return null; - } - - public PsiFile getContainingFile() { - throw new PsiInvalidElementAccessException(this); - } - - public TextRange getTextRange() { - return null; - } - - public int getStartOffsetInParent() { - return 0; - } - - public int getTextLength() { - return 0; - } - - public PsiElement findElementAt(int offset) { - return null; - } - - @Nullable - public PsiReference findReferenceAt(int offset) { - return null; - } - - public int getTextOffset() { - return 0; - } - - public String getText() { - return null; - } - - @NotNull - public char[] textToCharArray() { - return new char[0]; - } - - public PsiElement getNavigationElement() { - return null; - } - - public PsiElement getOriginalElement() { - return null; - } - - public boolean textMatches(@NotNull CharSequence text) { - return false; - } - - public boolean textMatches(@NotNull PsiElement element) { - return false; - } - - public boolean textContains(char c) { - return false; - } - - public void accept(@NotNull PsiElementVisitor visitor) { - - } - - public void acceptChildren(@NotNull PsiElementVisitor visitor) { - - } - - public PsiElement copy() { - return null; - } - - public PsiElement add(@NotNull PsiElement element) { - return null; - } - - public PsiElement addBefore(@NotNull PsiElement element, PsiElement anchor) { - return null; - } - - public PsiElement addAfter(@NotNull PsiElement element, PsiElement anchor) { - return null; - } - - public void checkAdd(@NotNull PsiElement element) { - - } - - public PsiElement addRange(PsiElement first, PsiElement last) { - return null; - } - - public PsiElement addRangeBefore(@NotNull PsiElement first, @NotNull PsiElement last, PsiElement anchor) { - return null; - } - - public PsiElement addRangeAfter(PsiElement first, PsiElement last, PsiElement anchor) { - return null; - } - - public void delete() { - - } - - public void checkDelete() { - - } - - public void deleteChildRange(PsiElement first, PsiElement last) { - - } - - public PsiElement replace(@NotNull PsiElement newElement) { - return null; - } - - public boolean isValid() { - return false; - } - - public boolean isWritable() { - return false; - } - - @Nullable - public PsiReference getReference() { - return null; - } - - @NotNull - public PsiReference[] getReferences() { - return new PsiReference[0]; - } - - public T getCopyableUserData(Key key) { - return null; - } - - public void putCopyableUserData(Key key, T value) { - - } - - public boolean processDeclarations(@NotNull PsiScopeProcessor processor, - @NotNull ResolveState state, - PsiElement lastParent, - @NotNull PsiElement place) { - return false; - } - - public PsiElement getContext() { - return null; - } - - public boolean isPhysical() { - return false; - } - - @NotNull - public GlobalSearchScope getResolveScope() { - return GlobalSearchScope.EMPTY_SCOPE; - } - - @NotNull - public SearchScope getUseScope() { - return GlobalSearchScope.EMPTY_SCOPE; - } - - public ASTNode getNode() { - return null; - } - - public T getUserData(@NotNull Key key) { - return null; - } - - public void putUserData(@NotNull Key key, T value) { - - } - - public Icon getIcon(int flags) { - return null; - } - - public boolean isEquivalentTo(final PsiElement another) { - return this == another; - } - - @Override - public String toString() { - return "NULL_PSI_ELEMENT"; - } - }; public static final PsiParser NULL_PARSER = new PsiParser() { @NotNull @@ -309,25 +69,6 @@ public class PsiUtilBase extends PsiUtilCore { throw new RuntimeException("invalid element"); } - public static int compareElementsByPosition(final PsiElement element1, final PsiElement element2) { - if (element1 != null && element2 != null) { - final PsiFile psiFile1 = element1.getContainingFile(); - final PsiFile psiFile2 = element2.getContainingFile(); - if (Comparing.equal(psiFile1, psiFile2)){ - final TextRange textRange1 = element1.getTextRange(); - final TextRange textRange2 = element2.getTextRange(); - if (textRange1 != null && textRange2 != null) { - return textRange1.getStartOffset() - textRange2.getStartOffset(); - } - } else if (psiFile1 != null && psiFile2 != null){ - final String name1 = psiFile1.getName(); - final String name2 = psiFile2.getName(); - return name1.compareToIgnoreCase(name2); - } - } - return 0; - } - @NotNull public static Language getLanguageAtOffset (@NotNull PsiFile file, int offset) { final PsiElement elt = file.findElementAt(offset); @@ -523,25 +264,6 @@ public class PsiUtilBase extends PsiUtilCore { return reallyEvaluateLanguageInRange(start, end, file); } - @NotNull - public static PsiElement getElementAtOffset(@NotNull PsiFile file, int offset) { - PsiElement elt = file.findElementAt(offset); - if (elt == null && offset > 0) { - elt = file.findElementAt(offset - 1); - } - if (elt == null) { - return file; - } - return elt; - } - - public static boolean hasErrorElementChild(PsiElement element) { - for (PsiElement child = element.getFirstChild(); child != null; child = child.getNextSibling()) { - if (child instanceof PsiErrorElement) return true; - } - return false; - } - @NotNull public static ASTNode getRoot(@NotNull ASTNode node) { ASTNode child = node; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java index 9e679c05bca9..50ef6da59964 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CollectHighlightsUtil.java @@ -29,7 +29,7 @@ import com.intellij.psi.PsiCodeFragment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.containers.Stack; import gnu.trove.TIntStack; import org.jetbrains.annotations.NotNull; @@ -85,20 +85,20 @@ public class CollectHighlightsUtil { final Stack children = new Stack(STARTING_TREE_HEIGHT); PsiElement element = commonParent; - PsiElement child = PsiUtilBase.NULL_PSI_ELEMENT; + PsiElement child = PsiUtilCore.NULL_PSI_ELEMENT; while (true) { ProgressManager.checkCanceled(); for (Condition filter : filters) { if (!filter.value(element)) { - assert child == PsiUtilBase.NULL_PSI_ELEMENT; + assert child == PsiUtilCore.NULL_PSI_ELEMENT; child = null; // do not want to process children break; } } boolean startChildrenVisiting; - if (child == PsiUtilBase.NULL_PSI_ELEMENT) { + if (child == PsiUtilCore.NULL_PSI_ELEMENT) { startChildrenVisiting = true; child = element.getFirstChild(); } @@ -126,7 +126,7 @@ public class CollectHighlightsUtil { starts.push(offset); elements.push(element); element = child; - child = PsiUtilBase.NULL_PSI_ELEMENT; + child = PsiUtilCore.NULL_PSI_ELEMENT; } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/Divider.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/Divider.java index cee89801ef82..401aab96e5df 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/Divider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/Divider.java @@ -24,7 +24,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.containers.Stack; import gnu.trove.TIntStack; import org.jetbrains.annotations.NotNull; @@ -72,20 +72,20 @@ public class Divider { final Stack children = new Stack(STARTING_TREE_HEIGHT); PsiElement element = root; - PsiElement child = PsiUtilBase.NULL_PSI_ELEMENT; + PsiElement child = PsiUtilCore.NULL_PSI_ELEMENT; while (true) { ProgressManager.checkCanceled(); for (Condition filter : filters) { if (!filter.value(element)) { - assert child == PsiUtilBase.NULL_PSI_ELEMENT; + assert child == PsiUtilCore.NULL_PSI_ELEMENT; child = null; // do not want to process children break; } } boolean startChildrenVisiting; - if (child == PsiUtilBase.NULL_PSI_ELEMENT) { + if (child == PsiUtilCore.NULL_PSI_ELEMENT) { startChildrenVisiting = true; child = element.getFirstChild(); } @@ -120,7 +120,7 @@ public class Divider { starts.push(offset); elements.push(element); element = child; - child = PsiUtilBase.NULL_PSI_ELEMENT; + child = PsiUtilCore.NULL_PSI_ELEMENT; } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java index 28fde7b0f636..6c19d61e5010 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterAfterUnmatchedBraceHandler.java @@ -40,7 +40,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.TokenType; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.IncorrectOperationException; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; @@ -171,7 +171,7 @@ public class EnterAfterUnmatchedBraceHandler extends EnterHandlerDelegateAdapter * @return offset to use for inserting closing brace */ private static int calculateOffsetToInsertClosingBrace(PsiFile file, CharSequence text, final int offset) { - PsiElement element = PsiUtilBase.getElementAtOffset(file, offset); + PsiElement element = PsiUtilCore.getElementAtOffset(file, offset); ASTNode node = element.getNode(); if (node != null && node.getElementType() == TokenType.WHITE_SPACE) { return CharArrayUtil.shiftForwardUntil(text, offset, "\n"); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java index fd143315a1ab..3bf7df9d52de 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewComparator.java @@ -36,7 +36,7 @@ import com.intellij.openapi.editor.Document; import com.intellij.profile.codeInspection.ui.InspectionsConfigTreeComparator; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import java.util.Comparator; @@ -121,14 +121,14 @@ public class InspectionResultsViewComparator implements Comparator { private static int compareEntity(final RefEntity entity, final PsiElement element) { if (entity instanceof RefElement) { - return PsiUtilBase.compareElementsByPosition(((RefElement)entity).getElement(), element); + return PsiUtilCore.compareElementsByPosition(((RefElement)entity).getElement(), element); } return -1; } private static int compareEntities(final RefEntity entity1, final RefEntity entity2) { if (entity1 instanceof RefElement && entity2 instanceof RefElement) { - return PsiUtilBase.compareElementsByPosition(((RefElement)entity1).getElement(), ((RefElement)entity2).getElement()); + return PsiUtilCore.compareElementsByPosition(((RefElement)entity1).getElement(), ((RefElement)entity2).getElement()); } else if (entity1 != null && entity2 != null) { return entity1.getName().compareToIgnoreCase(entity2.getName()); } diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesHandler.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesHandler.java index d8f46b768ed2..3c493af64bbe 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesHandler.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesHandler.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiReferenceService; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.refactoring.util.TextOccurrencesUtil; import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; @@ -45,7 +45,7 @@ import java.util.Collections; */ public abstract class FindUsagesHandler { // return this handler if you want to cancel the search - public static final FindUsagesHandler NULL_HANDLER = new FindUsagesHandler(PsiUtilBase.NULL_PSI_ELEMENT){}; + public static final FindUsagesHandler NULL_HANDLER = new FindUsagesHandler(PsiUtilCore.NULL_PSI_ELEMENT){}; private final PsiElement myPsiElement; diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java index 0831e0787e1b..57ade2616a2e 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/PlainTextParserDefinition.java @@ -33,7 +33,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.PsiPlainTextFileImpl; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; public class PlainTextParserDefinition implements ParserDefinition { @@ -75,7 +75,7 @@ public class PlainTextParserDefinition implements ParserDefinition { @NotNull public PsiElement createElement(ASTNode node) { - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } public PsiFile createFile(FileViewProvider viewProvider) { diff --git a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.java b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.java index e6d47d1c56fa..c185de41360e 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.java @@ -26,6 +26,7 @@ import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -79,7 +80,7 @@ public class GotoTestOrCodeHandler extends GotoTargetHandler { @NotNull public static PsiElement getSelectedElement(Editor editor, PsiFile file) { - return PsiUtilBase.getElementAtOffset(file, editor.getCaretModel().getOffset()); + return PsiUtilCore.getElementAtOffset(file, editor.getCaretModel().getOffset()); } @Override diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java index c2aeb66ed3ea..01cc2bb0e096 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -275,7 +275,7 @@ public class TrivialIfInspection extends BaseInspection { if (condition == null) { return; } - if (PsiUtil.hasErrorElementChild(ifStatement)) { + if (PsiUtilCore.hasErrorElementChild(ifStatement)) { return; } if (isSimplifiableAssignment(ifStatement)) { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/ErrorUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/ErrorUtil.java index 71af6aa4b4b0..831ace642fe4 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/ErrorUtil.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/ErrorUtil.java @@ -18,7 +18,7 @@ package com.siyeh.ipp.psiutils; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; import com.intellij.psi.PsiRecursiveElementWalkingVisitor; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.PsiUtilCore; public class ErrorUtil{ @@ -30,7 +30,7 @@ public class ErrorUtil{ */ public static boolean containsError(PsiElement element){ // check only immediate children, full tree traversal is too expensive - return PsiUtil.hasErrorElementChild(element); + return PsiUtilCore.hasErrorElementChild(element); } /** diff --git a/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlParserDefinition.java b/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlParserDefinition.java index 460f4b022503..4d5d95468cb0 100644 --- a/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlParserDefinition.java +++ b/plugins/android/src/org/jetbrains/android/fileTypes/AndroidIdlParserDefinition.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; /** @@ -73,7 +73,7 @@ public class AndroidIdlParserDefinition implements ParserDefinition { @NotNull public PsiElement createElement(ASTNode node) { - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } public PsiFile createFile(FileViewProvider viewProvider) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java index 6b81dd5210fe..5e799fce6ba4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/move/MoveGroovyMemberHandler.java @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.JavaResolveUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.move.moveMembers.MoveMemberHandler; import com.intellij.refactoring.move.moveMembers.MoveMembersOptions; @@ -222,7 +222,7 @@ public class MoveGroovyMemberHandler implements MoveMemberHandler { if (!referencedFields.isEmpty()) { Collections.sort(referencedFields, new Comparator() { public int compare(final PsiField o1, final PsiField o2) { - return -PsiUtilBase.compareElementsByPosition(o1, o2); + return -PsiUtilCore.compareElementsByPosition(o1, o2); } }); return referencedFields.get(0); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ChooseFileIntentionAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ChooseFileIntentionAction.java index 6419d01f4fee..a3e4a877d2f1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ChooseFileIntentionAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/ChooseFileIntentionAction.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlTag; import com.intellij.util.IncorrectOperationException; import com.intellij.util.xml.DomElement; @@ -90,7 +90,7 @@ public class ChooseFileIntentionAction implements IntentionAction { } private MavenDomDependency getDependency(PsiFile file, Editor editor) { - PsiElement el = PsiUtilBase.getElementAtOffset(file, editor.getCaretModel().getOffset()); + PsiElement el = PsiUtilCore.getElementAtOffset(file, editor.getCaretModel().getOffset()); XmlTag tag = PsiTreeUtil.getParentOfType(el, XmlTag.class, false); if (tag == null) return null; diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java index fd0b9c6e778c..70c0429192e6 100644 --- a/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java +++ b/xml/impl/src/com/intellij/codeInsight/editorActions/XmlCopyPastePreProcessor.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.impl.source.xml.behavior.EncodeEachSymbolPolicy; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlElement; import com.intellij.psi.xml.XmlElementType; @@ -49,7 +49,7 @@ public class XmlCopyPastePreProcessor implements CopyPastePreProcessor { final Document document = editor.getDocument(); PsiDocumentManager.getInstance(project).commitDocument(document); int caretOffset = editor.getCaretModel().getOffset(); - PsiElement element = PsiUtilBase.getElementAtOffset(file, caretOffset); + PsiElement element = PsiUtilCore.getElementAtOffset(file, caretOffset); ASTNode node = element.getNode(); if (node != null) { diff --git a/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java b/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java index a62d97255aff..f79b0075fe43 100644 --- a/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/html/HTMLParserDefinition.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.impl.source.html.HtmlFileImpl; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlElementType; import com.intellij.psi.xml.XmlTokenType; import com.intellij.xml.util.XmlUtil; @@ -68,7 +68,7 @@ public class HTMLParserDefinition implements ParserDefinition { @NotNull public PsiElement createElement(ASTNode node) { - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } public PsiFile createFile(FileViewProvider viewProvider) { diff --git a/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java b/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java index 53b34af95704..786a49a581e6 100644 --- a/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java +++ b/xml/impl/src/com/intellij/lang/xml/XMLParserDefinition.java @@ -28,7 +28,7 @@ import com.intellij.psi.impl.source.parsing.xml.XmlParser; import com.intellij.psi.impl.source.xml.XmlFileImpl; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlElementType; import com.intellij.psi.xml.XmlTokenType; import com.intellij.xml.util.XmlUtil; @@ -69,7 +69,7 @@ public class XMLParserDefinition implements ParserDefinition { @NotNull public PsiElement createElement(ASTNode node) { - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } public PsiFile createFile(FileViewProvider viewProvider) { diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java index 6d1beb987936..62183aae3a9c 100644 --- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java +++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java @@ -33,7 +33,7 @@ import com.intellij.psi.impl.source.resolve.ResolveCache; import com.intellij.psi.impl.source.xml.SchemaPrefixReference; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.*; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; @@ -281,12 +281,12 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { public PsiElement resolve() { final PsiElement psiElement = ResolveCache.getInstance(getElement().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, false, false); - return psiElement != PsiUtilBase.NULL_PSI_ELEMENT ? psiElement:null; + return psiElement != PsiUtilCore.NULL_PSI_ELEMENT ? psiElement:null; } private PsiElement resolveInner() { final XmlTag tag = PsiTreeUtil.getContextOfType(myElement, XmlTag.class, false); - if (tag == null) return PsiUtilBase.NULL_PSI_ELEMENT; + if (tag == null) return PsiUtilCore.NULL_PSI_ELEMENT; String canonicalText = getCanonicalText(); XmlNSDescriptorImpl nsDescriptor = getDescriptor(tag,canonicalText); @@ -303,7 +303,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { true ); - return descriptor != null ? descriptor.getDeclaration(): PsiUtilBase.NULL_PSI_ELEMENT; + return descriptor != null ? descriptor.getDeclaration(): PsiUtilCore.NULL_PSI_ELEMENT; } case AttributeReference: { //final String prefixByQualifiedName = XmlUtil.findPrefixByQualifiedName(canonicalText); @@ -316,7 +316,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { if (descriptor != null) return descriptor.getDeclaration(); - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } case TypeReference: { TypeDescriptor typeDescriptor = nsDescriptor.getTypeDescriptor(canonicalText,tag); @@ -329,7 +329,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider { } } - return PsiUtilBase.NULL_PSI_ELEMENT; + return PsiUtilCore.NULL_PSI_ELEMENT; } private XmlNSDescriptorImpl getDescriptor(final XmlTag tag, String text) {