diff --git a/java/compiler/impl/src/com/intellij/compiler/make/ChangedConstantsDependencyProcessor.java b/java/compiler/impl/src/com/intellij/compiler/make/ChangedConstantsDependencyProcessor.java index ab26de70f863..cae6a2c78b24 100644 --- a/java/compiler/impl/src/com/intellij/compiler/make/ChangedConstantsDependencyProcessor.java +++ b/java/compiler/impl/src/com/intellij/compiler/make/ChangedConstantsDependencyProcessor.java @@ -249,7 +249,7 @@ class ChangedConstantsDependencyProcessor { while (!(element instanceof PsiFile)) { if (element instanceof PsiClass && element.getParent() instanceof PsiJavaFile) { // top-level class final PsiClass psiClass = (PsiClass)element; - if (PsiUtil.isInJspFile(psiClass)) { + if (JspPsiUtil.isInJspFile(psiClass)) { return null; } final PsiFile containingFile = psiClass.getContainingFile(); diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java b/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java index 82f46be65899..508363ac1d89 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/ContextUtil.java @@ -10,7 +10,6 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.StringBuilderSpinAllocator; import com.sun.jdi.Location; @@ -147,7 +146,7 @@ public class ContextUtil { } PsiElement element; - final PsiElement rootElement = PsiUtil.isInJspFile(psiFile) ? (PsiUtil.getJspFile(psiFile)).getJavaClass() : psiFile; + final PsiElement rootElement = JspPsiUtil.isInJspFile(psiFile) ? (JspPsiUtil.getJspFile(psiFile)).getJavaClass() : psiFile; while(true) { final CharSequence charsSequence = document.getCharsSequence(); for (; startOffset < charsSequence.length(); startOffset++) { diff --git a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java index ca928a0863a3..1d4b77ac206f 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java +++ b/java/debugger/openapi/src/com/intellij/debugger/SourcePosition.java @@ -27,7 +27,6 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; /** @@ -207,8 +206,8 @@ public abstract class SourcePosition implements Navigatable{ public static SourcePosition createFromElement(PsiElement element) { final PsiElement navigationElement = element.getNavigationElement(); final PsiFile psiFile; - if (PsiUtil.isInJspFile(navigationElement)) { - psiFile = PsiUtil.getJspFile(navigationElement); + if (JspPsiUtil.isInJspFile(navigationElement)) { + psiFile = JspPsiUtil.getJspFile(navigationElement); } else { psiFile = navigationElement.getContainingFile(); diff --git a/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java b/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java index 0083d93d4430..ac41e5a847b2 100644 --- a/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java +++ b/java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java @@ -14,7 +14,6 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.PackageScope; -import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -39,7 +38,7 @@ public class JavaAnalysisScope extends AnalysisScope { final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(defaultProject).getFileIndex(); final HashSet modules = new HashSet(); if (myType == FILE) { - if (myElement instanceof PsiJavaFile && !PsiUtil.isInJspFile(myElement)) { + if (myElement instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(myElement)) { PsiJavaFile psiJavaFile = (PsiJavaFile)myElement; final PsiClass[] classes = psiJavaFile.getClasses(); boolean onlyPackLocalClasses = true; diff --git a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java index 601323fc0c14..6401b6dc6749 100644 --- a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java @@ -64,7 +64,7 @@ public class CodeInsightUtil { break; } if (parent instanceof PsiCodeBlock) break; - if (PsiUtil.isInJspFile(parent) && parent instanceof PsiFile) break; + if (JspPsiUtil.isInJspFile(parent) && parent instanceof PsiFile) break; if (parent instanceof PsiCodeFragment) break; if (parent == null || parent instanceof PsiFile) return PsiElement.EMPTY_ARRAY; parent = parent.getParent(); diff --git a/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java index 58f148e99479..d1a3a8d7d180 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java @@ -6,7 +6,6 @@ import com.intellij.psi.*; import com.intellij.psi.controlFlow.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; @@ -441,7 +440,7 @@ public class ExceptionUtil { JavaCodeFragment.ExceptionHandler exceptionHandler = codeFragment.getExceptionHandler(); return exceptionHandler != null && exceptionHandler.isHandledException(exceptionType); } - else if (PsiUtil.isInJspFile(parent) && parent instanceof PsiFile) { + else if (JspPsiUtil.isInJspFile(parent) && parent instanceof PsiFile) { return true; } else if (parent instanceof PsiFile) { 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 71124154fd6d..a6a33e009be5 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 @@ -53,7 +53,6 @@ import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.Processor; import com.intellij.util.Query; @@ -204,8 +203,8 @@ public class PostHighlightingPass extends TextEditorHighlightingPass { HighlightDisplayKey deadCodeKey = HighlightDisplayKey.find(DeadCodeInspection.SHORT_NAME); myDeadCodeInspection = (DeadCodeInspection)profile.getInspectionTool(DeadCodeInspection.SHORT_NAME, myFile); myDeadCodeEnabled = profile.isToolEnabled(deadCodeKey, myFile); - if (unusedImportEnabled && PsiUtil.isInJspFile(myFile)) { - final JspFile jspFile = PsiUtil.getJspFile(myFile); + if (unusedImportEnabled && JspPsiUtil.isInJspFile(myFile)) { + final JspFile jspFile = JspPsiUtil.getJspFile(myFile); if (jspFile != null) { unusedImportEnabled = !JspSpiUtil.isIncludedOrIncludesSomething(jspFile); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java index 04ad74d816a3..d85890989e73 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java @@ -276,7 +276,7 @@ public class HighlightControlFlowUtil { scope = PsiTreeUtil.getParentOfType(scope, PsiCodeBlock.class); } - topBlock = PsiUtil.isInJspFile(scope) && scope instanceof PsiFile ? scope : PsiUtil.getTopLevelEnclosingCodeBlock(expression, scope); + topBlock = JspPsiUtil.isInJspFile(scope) && scope instanceof PsiFile ? scope : PsiUtil.getTopLevelEnclosingCodeBlock(expression, scope); if (variable instanceof PsiField) { // non final field already initalized with default value if (!variable.hasModifierProperty(PsiModifier.FINAL)) return null; 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 d8730725d94c..32099c37575f 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 @@ -631,7 +631,7 @@ public class HighlightUtil { } private static HighlightInfoType getUnhandledExceptionHighlightType(final PsiElement element) { - if (!PsiUtil.isInJspFile(element)) { + if (!JspPsiUtil.isInJspFile(element)) { return HighlightInfoType.UNHANDLED_EXCEPTION; } PsiMethod targetMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java index 549ac8e4b7ca..6c273d3e405f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java @@ -13,7 +13,6 @@ import com.intellij.codeInsight.hint.QuestionAction; import com.intellij.codeInsight.hint.HintManager; import com.intellij.codeInspection.HintAction; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.psi.search.PsiShortNamesCache; import com.intellij.psi.search.GlobalSearchScope; @@ -122,7 +121,7 @@ public abstract class ImportClassFixBase im if (classes.length == 1 && CodeStyleSettingsManager.getSettings(project).ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY && (allowCaretNearRef || !isCaretNearRef(editor, myRef)) - && !PsiUtil.isInJspFile(psiFile) + && !JspPsiUtil.isInJspFile(psiFile) && codeAnalyzer.canChangeFileSilently(psiFile) && !hasUnresolvedImportWhichCanImport(psiFile, classes[0].getName())) { CommandProcessor.getInstance().runUndoTransparentAction(new Runnable() { diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java index 4b1da9a5066d..0198e82afc1f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java @@ -8,7 +8,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; @@ -19,7 +18,7 @@ class JavaWithIfExpressionSurrounder extends JavaExpressionSurrounder{ PsiElement parent = expr.getParent(); if (!(parent instanceof PsiExpressionStatement)) return false; final PsiElement element = parent.getParent(); - if (!(element instanceof PsiCodeBlock) && !(PsiUtil.isInJspFile(element) && element instanceof PsiFile)) return false; + if (!(element instanceof PsiCodeBlock) && !(JspPsiUtil.isInJspFile(element) && element instanceof PsiFile)) return false; return true; } diff --git a/java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java b/java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java index 3ba0b27acee1..b271c9cec4c4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java @@ -15,7 +15,6 @@ import com.intellij.openapi.module.ModuleUtil; import com.intellij.psi.*; import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.psi.util.PsiUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,7 +61,7 @@ public class RefClassImpl extends RefJavaElementImpl implements RefClass { PsiElement psiParent = psiClass.getParent(); if (psiParent instanceof PsiFile) { if (isSyntheticJSP()) { - final RefFileImpl refFile = (RefFileImpl)getRefManager().getReference(PsiUtil.getJspFile(psiClass)); + final RefFileImpl refFile = (RefFileImpl)getRefManager().getReference(JspPsiUtil.getJspFile(psiClass)); LOG.assertTrue(refFile != null); refFile.add(this); } else if (psiParent instanceof PsiJavaFile) { diff --git a/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java b/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java index e257ab9e61e5..22a44744a1a4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java @@ -21,7 +21,6 @@ import com.intellij.codeInspection.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.Comparing; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,7 +38,7 @@ public class WrongPackageStatementInspection extends BaseJavaLocalInspectionTool // does not work in tests since CodeInsightTestCase copies file into temporary location if (ApplicationManager.getApplication().isUnitTestMode()) return null; if (file instanceof PsiJavaFile) { - if (PsiUtil.isInJspFile(file)) return null; + if (JspPsiUtil.isInJspFile(file)) return null; PsiJavaFile javaFile = (PsiJavaFile)file; // highlight the first class in the file only PsiClass[] classes = javaFile.getClasses(); diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java index f507c593a368..9f8c2ce3f25a 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java @@ -24,7 +24,6 @@ import com.intellij.psi.jsp.JspFile; import com.intellij.psi.presentation.java.ClassPresentationUtil; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.ui.LayeredIcon; import org.jetbrains.annotations.Nullable; @@ -133,8 +132,8 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i myHighlightedText.getEnding().addText(buffer.toString(), mainTextAttributes); } } - else if (PsiUtil.isInJspFile(enclosingElement) && enclosingElement instanceof PsiFile) { - final JspFile file = PsiUtil.getJspFile(enclosingElement); + else if (JspPsiUtil.isInJspFile(enclosingElement) && enclosingElement instanceof PsiFile) { + final JspFile file = JspPsiUtil.getJspFile(enclosingElement); myHighlightedText.getEnding().addText(file.getName(), mainTextAttributes); } else { @@ -143,7 +142,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i if (myUsageCount > 1) { myHighlightedText.getEnding().addText(IdeBundle.message("node.call.hierarchy.N.usages", myUsageCount), HierarchyNodeDescriptor.getUsageCountPrefixAttributes()); } - if (!(PsiUtil.isInJspFile(enclosingElement) && enclosingElement instanceof PsiFile)) { + if (!(JspPsiUtil.isInJspFile(enclosingElement) && enclosingElement instanceof PsiFile)) { final String packageName = JavaHierarchyUtil.getPackageName(enclosingElement instanceof PsiMethod ? ((PsiMethod)enclosingElement).getContainingClass() : (PsiClass)enclosingElement); myHighlightedText.getEnding().addText(" (" + packageName + ")", HierarchyNodeDescriptor.getPackageNameAttributes()); } diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 4d1039991813..4c5d37573141 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -276,7 +276,7 @@ public class PsiClassImplUtil { return new LocalSearchScope(aClass); } PsiFile file = aClass.getContainingFile(); - if (PsiUtil.isInJspFile(file)) return maximalUseScope; + if (JspPsiUtil.isInJspFile(file)) return maximalUseScope; final PsiClass containingClass = aClass.getContainingClass(); if (aClass.hasModifierProperty(PsiModifier.PUBLIC)) { return containingClass != null ? containingClass.getUseScope() : maximalUseScope; diff --git a/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java index 2d4808b62e39..7f800af411bf 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -289,7 +289,7 @@ public class PsiImplUtil { final PsiManagerEx psiManager = (PsiManagerEx)member.getManager(); final GlobalSearchScope maximalUseScope = psiManager.getFileManager().getUseScope(member); PsiFile file = member.getContainingFile(); - if (PsiUtil.isInJspFile(file)) return maximalUseScope; + if (JspPsiUtil.isInJspFile(file)) return maximalUseScope; PsiClass aClass = member.getContainingClass(); if (aClass instanceof PsiAnonymousClass) { diff --git a/java/java-impl/src/com/intellij/psi/impl/search/JspIndexPatternBuilder.java b/java/java-impl/src/com/intellij/psi/impl/search/JspIndexPatternBuilder.java index fb52b88e5a3d..1f2e4a23d8c8 100644 --- a/java/java-impl/src/com/intellij/psi/impl/search/JspIndexPatternBuilder.java +++ b/java/java-impl/src/com/intellij/psi/impl/search/JspIndexPatternBuilder.java @@ -11,13 +11,13 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator; import com.intellij.openapi.editor.impl.DocumentImpl; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; +import com.intellij.psi.JspPsiUtil; import com.intellij.psi.impl.cache.impl.id.IdTableBuilding; import com.intellij.psi.impl.source.tree.StdTokenSets; import com.intellij.psi.jsp.JspFile; import com.intellij.psi.jsp.JspTokenType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.text.CharSequenceSubSequence; /** @@ -25,7 +25,7 @@ import com.intellij.util.text.CharSequenceSubSequence; */ public class JspIndexPatternBuilder implements IndexPatternBuilder { public Lexer getIndexingLexer(final PsiFile file) { - if (PsiUtil.isInJspFile(file)) { + if (JspPsiUtil.isInJspFile(file)) { EditorHighlighter highlighter; final Document document = PsiDocumentManager.getInstance(file.getProject()).getDocument(file); @@ -47,7 +47,7 @@ public class JspIndexPatternBuilder implements IndexPatternBuilder { } public TokenSet getCommentTokenSet(final PsiFile file) { - final JspFile jspFile = PsiUtil.getJspFile(file); + final JspFile jspFile = JspPsiUtil.getJspFile(file); TokenSet commentTokens = TokenSet.orSet(JavaIndexPatternBuilder.XML_COMMENT_BIT_SET, StdTokenSets.COMMENT_BIT_SET); final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(jspFile.getViewProvider().getTemplateDataLanguage()); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java index 99099caea88f..867bc0919239 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java @@ -21,7 +21,6 @@ import com.intellij.psi.jsp.JspSpiUtil; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import gnu.trove.THashSet; @@ -521,7 +520,7 @@ public class ImportHelper{ private static String[] collectNamesToImport(PsiJavaFile file, Set namesToImportStaticly){ Set names = new THashSet(); - final JspFile jspFile = PsiUtil.getJspFile(file); + final JspFile jspFile = JspPsiUtil.getJspFile(file); collectNamesToImport(names, file, namesToImportStaticly, jspFile); if (jspFile != null) { PsiFile[] files = ArrayUtil.mergeArrays(JspSpiUtil.getIncludingFiles(jspFile), JspSpiUtil.getIncludedFiles(jspFile), PsiFile.class); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java index a1d226eac9ae..6b52e2648d43 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java @@ -99,7 +99,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager { Set allImports = new THashSet(Arrays.asList(imports)); final Collection redundants; - if (PsiUtil.isInJspFile(file)) { + if (JspPsiUtil.isInJspFile(file)) { // remove only duplicate imports redundants = new THashSet(TObjectHashingStrategy.IDENTITY); redundants.addAll(Arrays.asList(imports)); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java index caa2f1f6b5d6..90faa7a4197e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java @@ -13,7 +13,6 @@ import com.intellij.psi.impl.source.jsp.jspJava.JspClass; import com.intellij.psi.impl.source.tree.*; import com.intellij.psi.jsp.JspFile; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -135,8 +134,8 @@ public class ReferenceAdjuster implements Constants { return; } - if (parent.getPsi() instanceof PsiFile && PsiUtil.isInJspFile(parent.getPsi())) { - final JspFile jspFile = (PsiUtil.getJspFile(parent.getPsi())); + if (parent.getPsi() instanceof PsiFile && JspPsiUtil.isInJspFile(parent.getPsi())) { + final JspFile jspFile = (JspPsiUtil.getJspFile(parent.getPsi())); JspClass jspClass = (JspClass) jspFile.getJavaClass(); addReferencesInRange(array, (TreeElement)jspClass.getNode(), startOffset, endOffset); return; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java index edc9573d83b3..828ab0ee6157 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java @@ -8,7 +8,6 @@ import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.JavaScopeProcessorEvent; import com.intellij.psi.scope.NameHint; -import com.intellij.psi.util.PsiUtil; import com.intellij.util.SmartList; import java.util.Iterator; @@ -121,9 +120,9 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi return true; } - if (PsiUtil.isInJspFile(aClass.getContainingFile())) { + if (JspPsiUtil.isInJspFile(aClass.getContainingFile())) { PsiFile file = FileContextUtil.getContextFile(myPlace); - if (PsiUtil.isInJspFile(file)) { + if (JspPsiUtil.isInJspFile(file)) { return true; } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java index 16cc67699a27..21b98ff06dc9 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java @@ -48,7 +48,7 @@ public class JavaResolveUtil { if (visibility == JavaCodeFragment.VisibilityChecker.Visibility.NOT_VISIBLE) return false; } } - else if (placeContainingFile instanceof XmlFile && !PsiUtil.isInJspFile(placeContainingFile)) return true; + else if (placeContainingFile instanceof XmlFile && !JspPsiUtil.isInJspFile(placeContainingFile)) return true; // We don't care about access rights in javadoc if (isInJavaDoc(place)) return true; @@ -59,8 +59,8 @@ public class JavaResolveUtil { int effectiveAccessLevel = PsiUtil.getAccessLevel(modifierList); PsiFile file = FileContextUtil.getContextFile(place); //TODO: implementation method!!!! - if (PsiUtil.isInJspFile(file) && PsiUtil.isInJspFile(member.getContainingFile())) return true; - if (file instanceof XmlFile && !PsiUtil.isInJspFile(file)) return true; + if (JspPsiUtil.isInJspFile(file) && JspPsiUtil.isInJspFile(member.getContainingFile())) return true; + if (file instanceof XmlFile && !JspPsiUtil.isInJspFile(file)) return true; if (effectiveAccessLevel == PsiUtil.ACCESS_LEVEL_PUBLIC) { return true; } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java index a0715de463a0..999359bafb02 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java @@ -21,7 +21,6 @@ import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.psi.tree.ChildRoleBase; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PsiUtil; import com.intellij.ui.RowIcon; import com.intellij.util.CharTable; import com.intellij.util.Icons; @@ -264,11 +263,11 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca @NotNull public SearchScope getUseScope() { - if (PsiUtil.isInJspFile(this)) { + if (JspPsiUtil.isInJspFile(this)) { if (getTreeParent().getElementType() == JavaElementType.DECLARATION_STATEMENT && getTreeParent().getTreeParent() instanceof JspCodeBlock && getTreeParent().getTreeParent().getTreeParent().getElementType() == JspElementType.HOLDER_METHOD) { //? - final JspFile jspFile = PsiUtil.getJspFile(this); + final JspFile jspFile = JspPsiUtil.getJspFile(this); final JspContextManager contextManager = JspContextManager.getInstance(getProject()); if (contextManager == null) { return super.getUseScope(); diff --git a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java index 83c53faceab9..c6c2c9488613 100644 --- a/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java @@ -81,7 +81,7 @@ public class AnonymousToInnerHandler implements RefactoringActionHandler { return; } PsiElement targetContainer = findTargetContainer(myAnonClass); - if (PsiUtil.isInJspFile(targetContainer) && targetContainer instanceof PsiFile) { + if (JspPsiUtil.isInJspFile(targetContainer) && targetContainer instanceof PsiFile) { String message = RefactoringBundle.message("error.not.supported.for.jsp", REFACTORING_NAME); showErrorMessage(editor, message); return; diff --git a/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java index bff8b4293327..a6ee82affcf9 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java @@ -1,7 +1,6 @@ package com.intellij.refactoring.copy; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; /** * @author yole @@ -10,7 +9,7 @@ public class JavaCopyFilesOrDirectoriesHandler extends CopyFilesOrDirectoriesHan protected boolean canCopyFiles(final PsiElement[] elements) { for (PsiElement element : elements) { if (!(element instanceof PsiFile) || - element instanceof PsiJavaFile && !PsiUtil.isInJspFile(element)) { + element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element)) { return false; } } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java index 9dc34b1d6aab..62bf188ef677 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java @@ -75,7 +75,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase myParentClass = getParentClass(selectedExpr); if (myParentClass == null) { - if (PsiUtil.isInJspFile(file)) { + if (JspPsiUtil.isInJspFile(file)) { CommonRefactoringUtil.showErrorHint(project, editor, RefactoringBundle.message("error.not.supported.for.jsp", getRefactoringName()), getRefactoringName(), getHelpID()); return false; diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java index 02c351bdb9eb..44ad6b30b4e2 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java @@ -97,7 +97,7 @@ public class LocalToFieldHandler { aClass = (PsiClass)parent; break; } - if (parent instanceof PsiFile && PsiUtil.isInJspFile(parent)) { + if (parent instanceof PsiFile && JspPsiUtil.isInJspFile(parent)) { String message = RefactoringBundle.message("error.not.supported.for.jsp", REFACTORING_NAME); CommonRefactoringUtil.showErrorHint(myProject, editor, message, REFACTORING_NAME, HelpID.LOCAL_TO_FIELD); return false; diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java index 2c965b7417c7..eb6ec8362833 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java @@ -7,7 +7,6 @@ package com.intellij.refactoring.move.moveClassesOrPackages; import com.intellij.codeInsight.ChangeContextUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler; import com.intellij.refactoring.util.MoveRenameUsageInfo; import com.intellij.usageView.UsageInfo; @@ -21,7 +20,7 @@ import java.util.Map; public class MoveJavaFileHandler extends MoveFileHandler { @Override public boolean canProcessElement(PsiFile element) { - return element instanceof PsiJavaFile && !PsiUtil.isInJspFile(element); + return element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element); } @Override diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java index 73080aaf08be..63b7cb84f854 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java @@ -2,7 +2,6 @@ package com.intellij.refactoring.move.moveFilesOrDirectories; import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.copy.JavaCopyFilesOrDirectoriesHandler; import com.intellij.refactoring.move.MoveCallback; @@ -18,7 +17,7 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan allJava &= JavaCopyFilesOrDirectoriesHandler.hasPackages((PsiDirectory)element); } else if (element instanceof PsiFile) { - allJava &= element instanceof PsiJavaFile && !PsiUtil.isInJspFile(element); + allJava &= element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element); } else { return false; diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java index f750f1179d47..be0bb458551b 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java @@ -3,10 +3,10 @@ package com.intellij.refactoring.rename; import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiJavaFile; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.JspPsiUtil; public class JavaVetoRenameCondition implements Condition { public boolean value(final PsiElement element) { - return element instanceof PsiJavaFile && !PsiUtil.isInJspFile(element) && ((PsiJavaFile) element).getClasses().length > 0; + return element instanceof PsiJavaFile && !JspPsiUtil.isInJspFile(element) && ((PsiJavaFile) element).getClasses().length > 0; } } diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java index 2b44088727a5..f3ce37fcc949 100644 --- a/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java +++ b/java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java @@ -25,7 +25,6 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.jsp.JspFile; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; import com.intellij.usageView.UsageInfo; import com.intellij.usages.Usage; import com.intellij.usages.UsageGroup; @@ -73,7 +72,7 @@ public class ClassGroupingRule implements UsageGroupingRule { } else { // skip JspClass synthetic classes. - if (containingClass.getParent() instanceof PsiFile && PsiUtil.isInJspFile(containingClass)) { + if (containingClass.getParent() instanceof PsiFile && JspPsiUtil.isInJspFile(containingClass)) { containingClass = null; } } diff --git a/java/openapi/src/com/intellij/psi/util/PsiUtil.java b/java/openapi/src/com/intellij/psi/util/PsiUtil.java index 5a90d78163e9..5b4686603bad 100644 --- a/java/openapi/src/com/intellij/psi/util/PsiUtil.java +++ b/java/openapi/src/com/intellij/psi/util/PsiUtil.java @@ -25,7 +25,6 @@ import com.intellij.psi.*; import com.intellij.psi.impl.source.jsp.jspJava.JspClassLevelDeclarationStatement; import com.intellij.psi.infos.MethodCandidateInfo.ApplicabilityLevel; import com.intellij.psi.javadoc.PsiDocComment; -import com.intellij.psi.jsp.JspFile; import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.search.LocalSearchScope; @@ -204,7 +203,7 @@ public final class PsiUtil extends PsiUtilBase { if (element instanceof PsiClass && !isLocalOrAnonymousClass((PsiClass)element)) { break; } - if (isInJspFile(element) && element instanceof PsiFile) { + if (JspPsiUtil.isInJspFile(element) && element instanceof PsiFile) { return element; } if (element == scope) break; @@ -213,10 +212,6 @@ public final class PsiUtil extends PsiUtilBase { return blockSoFar; } - public static boolean isInJspFile(@Nullable final PsiElement element) { - return getJspFile(element) != null; - } - public static boolean isLocalOrAnonymousClass(PsiClass psiClass) { return psiClass instanceof PsiAnonymousClass || isLocalClass(psiClass); } @@ -588,17 +583,6 @@ public final class PsiUtil extends PsiUtilBase { return null; } - public static JspFile getJspFile(final PsiElement element) { - final PsiFile psiFile = getTemplateLanguageFile(element); - return psiFile instanceof JspFile ? (JspFile)psiFile : null; - - /*final FileViewProvider provider = element.getContainingFile().getViewProvider(); - PsiFile file = provider.getPsi(StdLanguages.JSP); - if (file instanceof JspFile) return (JspFile)file; - file = provider.getPsi(StdLanguages.JSPX); - return file instanceof JspFile ? (JspFile)file : null;*/ - } - public static PsiType captureToplevelWildcards(final PsiType type, final PsiElement context) { if (type instanceof PsiClassType) { final PsiClassType.ClassResolveResult result = ((PsiClassType)type).resolveGenerics(); diff --git a/jsp/openapi/src/com/intellij/psi/JspPsiUtil.java b/jsp/openapi/src/com/intellij/psi/JspPsiUtil.java new file mode 100644 index 000000000000..2efbc8f6e357 --- /dev/null +++ b/jsp/openapi/src/com/intellij/psi/JspPsiUtil.java @@ -0,0 +1,25 @@ +package com.intellij.psi; + +import org.jetbrains.annotations.Nullable; +import com.intellij.psi.jsp.JspFile; +import com.intellij.psi.util.PsiUtilBase; + +/** + * @author yole + */ +public class JspPsiUtil { + public static boolean isInJspFile(@Nullable final PsiElement element) { + return getJspFile(element) != null; + } + + public static JspFile getJspFile(final PsiElement element) { + final PsiFile psiFile = PsiUtilBase.getTemplateLanguageFile(element); + return psiFile instanceof JspFile ? (JspFile)psiFile : null; + + /*final FileViewProvider provider = element.getContainingFile().getViewProvider(); + PsiFile file = provider.getPsi(StdLanguages.JSP); + if (file instanceof JspFile) return (JspFile)file; + file = provider.getPsi(StdLanguages.JSPX); + return file instanceof JspFile ? (JspFile)file : null;*/ + } +}