MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 15:27:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

extracting JSP-specific API to JspPsiUtil

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-08-31 18:22:53 +04:00
parent 362da089dc
commit 5f1763c593
33 changed files with 69 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/analysis/JavaAnalysisScope.java
+1 -2
View File
@@ -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<Module> modules = new HashSet<Module>();
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;
java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java
+1 -1
View File
@@ -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();
java/java-impl/src/com/intellij/codeInsight/ExceptionUtil.java
+1 -2
View File
@@ -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) {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
+2 -3
View File
@@ -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);
}
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+1 -1
View File
@@ -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);
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ImportClassFixBase.java
+1 -2
View File
@@ -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<T extends PsiElement & PsiReference> 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() {
java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithIfExpressionSurrounder.java
+1 -2
View File
@@ -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;
}
java/java-impl/src/com/intellij/codeInspection/reference/RefClassImpl.java
+1 -2
View File
@@ -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) {
java/java-impl/src/com/intellij/codeInspection/wrongPackageStatement/WrongPackageStatementInspection.java
+1 -2
View File
@@ -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();
java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java
+3 -4
View File
@@ -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());
}
java/java-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/psi/impl/PsiImplUtil.java
+1 -1
View File
@@ -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) {
java/java-impl/src/com/intellij/psi/impl/search/JspIndexPatternBuilder.java
+3 -3
View File
@@ -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());
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportHelper.java
+1 -2
View File
@@ -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<String> namesToImportStaticly){
Set<String> names = new THashSet<String>();
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);
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
Set<PsiImportStatementBase> allImports = new THashSet<PsiImportStatementBase>(Arrays.asList(imports));
final Collection<PsiImportStatementBase> redundants;
if (PsiUtil.isInJspFile(file)) {
if (JspPsiUtil.isInJspFile(file)) {
// remove only duplicate imports
redundants = new THashSet<PsiImportStatementBase>(TObjectHashingStrategy.IDENTITY);
redundants.addAll(Arrays.asList(imports));
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ReferenceAdjuster.java
+2 -3
View File
@@ -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;
java/java-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
+2 -3
View File
@@ -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;
}
}
java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java
+3 -3
View File
@@ -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;
}
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
+2 -3
View File
@@ -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();
java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/copy/JavaCopyFilesOrDirectoriesHandler.java
+1 -2
View File
@@ -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;
}
}
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/introduceField/LocalToFieldHandler.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveJavaFileHandler.java
+1 -2
View File
@@ -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
java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
+1 -2
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/rename/JavaVetoRenameCondition.java
+2 -2
View File
@@ -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<PsiElement> {
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;
}
}
java/java-impl/src/com/intellij/usages/impl/rules/ClassGroupingRule.java
+1 -2
View File
@@ -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;
}
}