diff options
Diffstat (limited to 'java/java-impl/src/com/intellij/ide')
5 files changed, 238 insertions, 70 deletions
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 4dacb84d0469..4eb3a33b83e9 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 @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,12 +34,8 @@ import com.intellij.openapi.util.TextRange; import com.intellij.pom.Navigatable; import com.intellij.psi.*; import com.intellij.psi.presentation.java.ClassPresentationUtil; -import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtilBase; -import com.intellij.psi.util.PsiUtilCore; +import com.intellij.psi.util.*; import com.intellij.ui.LayeredIcon; -import com.intellij.psi.util.FileTypeUtils; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -68,7 +64,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i return myElement == null ? null : getEnclosingElement(myElement); } - static PsiMember getEnclosingElement(final PsiElement element){ + public static PsiMember getEnclosingElement(final PsiElement element){ return PsiTreeUtil.getNonStrictParentOfType(element, PsiMethod.class, PsiClass.class); } @@ -138,8 +134,8 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i } final String methodText = PsiFormatUtil.formatMethod( method, - PsiSubstitutor.EMPTY, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS, - PsiFormatUtil.SHOW_TYPE + PsiSubstitutor.EMPTY, PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_PARAMETERS, + PsiFormatUtilBase.SHOW_TYPE ); buffer.append(methodText); diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java index 5699d335c28e..45363bbef95f 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallerMethodsTreeStructure.java @@ -17,12 +17,11 @@ package com.intellij.ide.hierarchy.call; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; import com.intellij.ide.hierarchy.HierarchyTreeStructure; +import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.MethodReferencesSearch; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -63,69 +62,15 @@ public final class CallerMethodsTreeStructure extends HierarchyTreeStructure { methodsToFind.add(method); ContainerUtil.addAll(methodsToFind, method.findDeepestSuperMethods()); - final Map<PsiMember, CallHierarchyNodeDescriptor> methodToDescriptorMap = new HashMap<PsiMember, CallHierarchyNodeDescriptor>(); + final Map<PsiMember, NodeDescriptor> methodToDescriptorMap = new HashMap<PsiMember, NodeDescriptor>(); for (final PsiMethod methodToFind : methodsToFind) { + final JavaCallHierarchyData data = new JavaCallHierarchyData(originalClass, methodToFind, originalType, method, methodsToFind, descriptor, methodToDescriptorMap, myProject); + MethodReferencesSearch.search(methodToFind, searchScope, true).forEach(new Processor<PsiReference>() { @Override public boolean process(final PsiReference reference) { - if (reference instanceof PsiReferenceExpression) { - final PsiExpression qualifier = ((PsiReferenceExpression)reference).getQualifierExpression(); - if (qualifier instanceof PsiSuperExpression) { // filter super.foo() call inside foo() and similar cases (bug 8411) - final PsiClass superClass = PsiUtil.resolveClassInType(qualifier.getType()); - if (originalClass.isInheritor(superClass, true)) { - return true; - } - } - if (qualifier != null && !methodToFind.hasModifierProperty(PsiModifier.STATIC)) { - final PsiType qualifierType = qualifier.getType(); - if (qualifierType instanceof PsiClassType && - !TypeConversionUtil.isAssignable(qualifierType, originalType) && - methodToFind != method) { - final PsiClass psiClass = ((PsiClassType)qualifierType).resolve(); - if (psiClass != null) { - final PsiMethod callee = psiClass.findMethodBySignature(methodToFind, true); - if (callee != null && !methodsToFind.contains(callee)) { - // skip sibling methods - return true; - } - } - } - } - } - else { - if (!(reference instanceof PsiElement)) { - return true; - } - - final PsiElement parent = ((PsiElement)reference).getParent(); - if (parent instanceof PsiNewExpression) { - if (((PsiNewExpression)parent).getClassReference() != reference) { - return true; - } - } - else if (parent instanceof PsiAnonymousClass) { - if (((PsiAnonymousClass)parent).getBaseClassReference() != reference) { - return true; - } - } - else { - return true; - } - } - - final PsiElement element = reference.getElement(); - final PsiMember key = CallHierarchyNodeDescriptor.getEnclosingElement(element); - - synchronized (methodToDescriptorMap) { - CallHierarchyNodeDescriptor d = methodToDescriptorMap.get(key); - if (d == null) { - d = new CallHierarchyNodeDescriptor(myProject, descriptor, element, false, true); - methodToDescriptorMap.put(key, d); - } - else if (!d.hasReference(reference)) { - d.incrementUsageCount(); - } - d.addReference(reference); + for (CallReferenceProcessor processor : CallReferenceProcessor.EP_NAME.getExtensions()) { + if (!processor.process(reference, data)) break; } return true; } diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallReferenceProcessor.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallReferenceProcessor.java new file mode 100644 index 000000000000..e563ee64381f --- /dev/null +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallReferenceProcessor.java @@ -0,0 +1,103 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.ide.hierarchy.call; + +import com.intellij.ide.util.treeView.NodeDescriptor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.*; +import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.TypeConversionUtil; +import org.jetbrains.annotations.NotNull; + +import java.util.Map; +import java.util.Set; + +/** + * Created by Max Medvedev on 10/5/13 + */ +public class JavaCallReferenceProcessor implements CallReferenceProcessor { + @Override + public boolean process(@NotNull PsiReference reference, @NotNull JavaCallHierarchyData data) { + PsiClass originalClass = data.getOriginalClass(); + PsiMethod method = data.getMethod(); + Set<PsiMethod> methodsToFind = data.getMethodsToFind(); + PsiMethod methodToFind = data.getMethodToFind(); + PsiClassType originalType = data.getOriginalType(); + Map<PsiMember, NodeDescriptor> methodToDescriptorMap = data.getResultMap(); + Project myProject = data.getProject(); + + if (reference instanceof PsiReferenceExpression) { + final PsiExpression qualifier = ((PsiReferenceExpression)reference).getQualifierExpression(); + if (qualifier instanceof PsiSuperExpression) { // filter super.foo() call inside foo() and similar cases (bug 8411) + final PsiClass superClass = PsiUtil.resolveClassInType(qualifier.getType()); + if (superClass == null || originalClass.isInheritor(superClass, true)) { + return true; + } + } + if (qualifier != null && !methodToFind.hasModifierProperty(PsiModifier.STATIC)) { + final PsiType qualifierType = qualifier.getType(); + if (qualifierType instanceof PsiClassType && + !TypeConversionUtil.isAssignable(qualifierType, originalType) && + methodToFind != method) { + final PsiClass psiClass = ((PsiClassType)qualifierType).resolve(); + if (psiClass != null) { + final PsiMethod callee = psiClass.findMethodBySignature(methodToFind, true); + if (callee != null && !methodsToFind.contains(callee)) { + // skip sibling methods + return true; + } + } + } + } + } + else { + if (!(reference instanceof PsiElement)) { + return true; + } + + final PsiElement parent = ((PsiElement)reference).getParent(); + if (parent instanceof PsiNewExpression) { + if (((PsiNewExpression)parent).getClassReference() != reference) { + return true; + } + } + else if (parent instanceof PsiAnonymousClass) { + if (((PsiAnonymousClass)parent).getBaseClassReference() != reference) { + return true; + } + } + else { + return true; + } + } + + final PsiElement element = reference.getElement(); + final PsiMember key = CallHierarchyNodeDescriptor.getEnclosingElement(element); + + synchronized (methodToDescriptorMap) { + CallHierarchyNodeDescriptor d = (CallHierarchyNodeDescriptor)methodToDescriptorMap.get(key); + if (d == null) { + d = new CallHierarchyNodeDescriptor(myProject, (CallHierarchyNodeDescriptor)data.getNodeDescriptor(), element, false, true); + methodToDescriptorMap.put(key, d); + } + else if (!d.hasReference(reference)) { + d.incrementUsageCount(); + } + d.addReference(reference); + } + return false; + } +} diff --git a/java/java-impl/src/com/intellij/ide/projectView/actions/MarkGeneratedSourceRootAction.java b/java/java-impl/src/com/intellij/ide/projectView/actions/MarkGeneratedSourceRootAction.java new file mode 100644 index 000000000000..e56a43233581 --- /dev/null +++ b/java/java-impl/src/com/intellij/ide/projectView/actions/MarkGeneratedSourceRootAction.java @@ -0,0 +1,69 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.ide.projectView.actions; + +import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.module.JavaModuleType; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; +import com.intellij.openapi.roots.ContentEntry; +import com.intellij.openapi.roots.SourceFolder; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes; +import org.jetbrains.jps.model.java.JavaSourceRootProperties; +import org.jetbrains.jps.model.java.JavaSourceRootType; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; + +/** + * @author nik + */ +public class MarkGeneratedSourceRootAction extends MarkRootActionBase { + public MarkGeneratedSourceRootAction() { + Presentation presentation = getTemplatePresentation(); + presentation.setIcon(AllIcons.Modules.SourceRoot); + presentation.setText("Generated Sources Root"); + presentation.setDescription("Mark directory as a source root for generated files"); + } + + @Override + protected boolean isEnabled(@NotNull RootsSelection selection, @NotNull Module module) { + if (!(ModuleType.get(module) instanceof JavaModuleType)) return false; + + if (selection.myHaveSelectedFilesUnderSourceRoots) { + return false; + } + + if (!selection.mySelectedDirectories.isEmpty()) { + return true; + } + + for (SourceFolder root : selection.mySelectedRoots) { + JavaSourceRootProperties properties = root.getJpsElement().getProperties(JavaModuleSourceRootTypes.SOURCES); + if (properties != null && !properties.isForGeneratedSources()) { + return true; + } + } + return false; + } + + @Override + protected void modifyRoots(VirtualFile vFile, ContentEntry entry) { + JavaSourceRootProperties properties = JpsJavaExtensionService.getInstance().createSourceRootProperties("", true); + entry.addSourceFolder(vFile, JavaSourceRootType.SOURCE, properties); + } +} diff --git a/java/java-impl/src/com/intellij/ide/projectView/actions/UnmarkGeneratedSourceRootAction.java b/java/java-impl/src/com/intellij/ide/projectView/actions/UnmarkGeneratedSourceRootAction.java new file mode 100644 index 000000000000..0af8706ab38c --- /dev/null +++ b/java/java-impl/src/com/intellij/ide/projectView/actions/UnmarkGeneratedSourceRootAction.java @@ -0,0 +1,55 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.ide.projectView.actions; + +import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.roots.ContentEntry; +import com.intellij.openapi.roots.SourceFolder; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes; +import org.jetbrains.jps.model.java.JavaSourceRootProperties; +import org.jetbrains.jps.model.java.JavaSourceRootType; + +/** + * @author nik + */ +public class UnmarkGeneratedSourceRootAction extends MarkRootActionBase { + public UnmarkGeneratedSourceRootAction() { + Presentation presentation = getTemplatePresentation(); + presentation.setIcon(AllIcons.Modules.SourceRoot); + presentation.setText("Unmark Generated Sources Root"); + presentation.setDescription("Mark directory as an ordinary source root"); + } + + @Override + protected boolean isEnabled(@NotNull RootsSelection selection, @NotNull Module module) { + for (SourceFolder root : selection.mySelectedRoots) { + JavaSourceRootProperties properties = root.getJpsElement().getProperties(JavaModuleSourceRootTypes.SOURCES); + if (properties != null && properties.isForGeneratedSources()) { + return true; + } + } + return false; + } + + @Override + protected void modifyRoots(VirtualFile vFile, ContentEntry entry) { + entry.addSourceFolder(vFile, JavaSourceRootType.SOURCE); + } +} |