From e32298185d2dac7269a8d23bf6da88a84858a69e Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Fri, 14 Nov 2025 16:11:37 +0100 Subject: [PATCH] IDEA-110255 [java]: handle default constructors and implicit super constructor calls better in Call Hierarchy GitOrigin-RevId: bb2cf1e13cfc40f39fd5a26ced304cd1256efb8a --- .../call/CallHierarchyNodeDescriptor.java | 15 +++--- .../call/CalleeMethodsTreeStructure.java | 48 +++++++++++++++---- .../call/JavaCallReferenceProcessor.java | 20 ++------ .../call/DefaultConstructors/Tastes.java | 9 ++++ .../call/DefaultConstructors/verification.xml | 9 ++++ .../DefaultConstructorsReverse/Tastes.java | 17 +++++++ .../verification.xml | 9 ++++ .../hierarchy/call/MethodRef/verification.xml | 15 ------ .../ide/hierarchy/JavaCallHierarchyTest.java | 14 +++++- .../ide/hierarchy/HierarchyTreeStructure.java | 9 ++-- .../KotlinAnonymousObject_verification.xml | 4 +- .../kotlinClass/KotlinClass_verification.xml | 4 +- .../KotlinClassObject_verification.xml | 4 +- .../KotlinEnumClass_verification.xml | 4 +- .../KotlinFunction_verification.xml | 4 +- .../KotlinLocalClass_verification.xml | 4 +- .../KotlinLocalFunction_verification.xml | 8 +--- .../KotlinNestedClass_verification.xml | 4 +- .../KotlinObject_verification.xml | 4 +- .../KotlinPackageFunction_verification.xml | 4 +- .../KotlinPackageProperty_verification.xml | 4 +- .../KotlinProperty_verification.xml | 4 +- 22 files changed, 125 insertions(+), 92 deletions(-) create mode 100644 java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/Tastes.java create mode 100644 java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/verification.xml create mode 100644 java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/Tastes.java create mode 100644 java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/verification.xml 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 ef79ab2c4a11..f2c66d3bef77 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,4 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.hierarchy.call; import com.intellij.codeInsight.highlighting.HighlightManager; @@ -156,9 +156,9 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i return; } - PsiReference firstReference = myReferences.get(0); + PsiReference firstReference = myReferences.getFirst(); PsiElement element = firstReference.getElement(); - PsiElement callElement = element.getParent(); + PsiElement callElement = (element instanceof PsiNameIdentifierOwner) ? element : element.getParent(); if (callElement instanceof Navigatable navigatable && navigatable.canNavigate()) { navigatable.navigate(requestFocus); } @@ -173,9 +173,10 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i if (editor != null) { HighlightManager highlightManager = HighlightManager.getInstance(myProject); List highlighters = new ArrayList<>(); - for (PsiReference psiReference : myReferences) { - PsiElement eachElement = psiReference.getElement(); - PsiElement eachMethodCall = eachElement.getParent(); + for (PsiReference ref : myReferences) { + PsiElement eachElement = ref.getElement(); + PsiElement eachMethodCall = + eachElement instanceof PsiNameIdentifierOwner owner ? owner.getNameIdentifier() : eachElement.getParent(); if (eachMethodCall != null) { TextRange textRange = eachMethodCall.getTextRange(); highlightManager.addRangeHighlight(editor, textRange.getStartOffset(), textRange.getEndOffset(), @@ -191,7 +192,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i return getPsiElement() instanceof Navigatable navigatable && navigatable.canNavigate(); } if (myReferences.isEmpty()) return false; - PsiReference firstReference = myReferences.get(0); + PsiReference firstReference = myReferences.getFirst(); PsiElement callElement = firstReference.getElement().getParent(); if (callElement == null || !callElement.isValid()) return false; if (!(callElement instanceof Navigatable navigatable) || !navigatable.canNavigate()) { diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CalleeMethodsTreeStructure.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CalleeMethodsTreeStructure.java index c8f59686981b..cda10e19f550 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CalleeMethodsTreeStructure.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CalleeMethodsTreeStructure.java @@ -5,11 +5,15 @@ import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; import com.intellij.ide.hierarchy.HierarchyTreeStructure; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.impl.light.LightDefaultConstructor; +import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.util.ArrayUtil; import com.intellij.util.ArrayUtilRt; +import com.intellij.util.JavaPsiConstructorUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +33,15 @@ public final class CalleeMethodsTreeStructure extends HierarchyTreeStructure { @Override protected Object @NotNull [] buildChildren(@NotNull HierarchyNodeDescriptor descriptor) { + PsiElement targetElement = ((CallHierarchyNodeDescriptor)getBaseDescriptor()).getTargetElement(); + PsiElement base = (targetElement instanceof PsiMethod baseMethod) ? baseMethod.getContainingClass() : targetElement; PsiMember enclosingElement = ((CallHierarchyNodeDescriptor)descriptor).getEnclosingElement(); + if (enclosingElement instanceof LightDefaultConstructor constructor) { + PsiMethod superConstructor = findNoArgSuperConstructor(constructor); + return superConstructor != null && isInScope(base, superConstructor, myScopeType) + ? new Object[]{new CallHierarchyNodeDescriptor(myProject, descriptor, superConstructor, false, false)} + : ArrayUtilRt.EMPTY_OBJECT_ARRAY; + } if (!(enclosingElement instanceof PsiMethod method) || enclosingElement instanceof SyntheticElement) { return ArrayUtilRt.EMPTY_OBJECT_ARRAY; } @@ -39,18 +51,19 @@ public final class CalleeMethodsTreeStructure extends HierarchyTreeStructure { if (body != null) { collectCallees(body, methods); } - - PsiElement targetElement = ((CallHierarchyNodeDescriptor)getBaseDescriptor()).getTargetElement(); - PsiClass baseClass = (targetElement instanceof PsiMethod baseMethod) ? baseMethod.getContainingClass() : null; + if (method.isConstructor() && JavaPsiConstructorUtil.findThisOrSuperCallInConstructor(method) == null) { + PsiMethod superConstructor = findNoArgSuperConstructor(method); + if (superConstructor != null) methods.add(superConstructor); + } Map methodToDescriptorMap = new HashMap<>(); List result = new ArrayList<>(); - // also add overriding methods as children when possible - Iterable allMethods = (baseClass == null) ? methods : ContainerUtil.concat(methods, OverridingMethodsSearch.search(method).asIterable()); + // also add overriding methods as children + SearchScope scope = getSearchScope(myScopeType, base); + Iterable allMethods = ContainerUtil.concat(methods, OverridingMethodsSearch.search(method, scope, true).findAll()); for (PsiMethod callee : allMethods) { - if (baseClass != null && !isInScope(baseClass, callee, myScopeType) - || JavaCallReferenceProcessor.isRecursiveNode(callee, descriptor)) { + if (!isInScope(base, callee, myScopeType) || JavaCallReferenceProcessor.isRecursiveNode(callee, descriptor)) { continue; } @@ -68,10 +81,27 @@ public final class CalleeMethodsTreeStructure extends HierarchyTreeStructure { return ArrayUtil.toObjectArray(result); } + private static @Nullable PsiMethod findNoArgSuperConstructor(PsiMethod method) { + PsiClass aClass = method.getContainingClass(); + if (aClass == null) return null; + PsiClass superClass = aClass.getSuperClass(); + if (superClass == null) return null; + PsiMethod[] constructors = superClass.getConstructors(); + if (constructors.length == 0) { + return LightDefaultConstructor.create(superClass); + } + else { + for (PsiMethod constructor : constructors) { + if (constructor.getParameterList().isEmpty()) { + return constructor; + } + } + } + return null; + } private static void collectCallees(@NotNull PsiElement element, @NotNull List methods) { - PsiElement[] children = element.getChildren(); - for (PsiElement child : children) { + for (PsiElement child : element.getChildren()) { collectCallees(child, methods); if (child instanceof PsiMethodCallExpression callExpression) { PsiReferenceExpression methodExpression = callExpression.getMethodExpression(); 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 index 5308e18712f5..332ec7923ad9 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallReferenceProcessor.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/JavaCallReferenceProcessor.java @@ -1,24 +1,11 @@ -/* - * 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. - */ +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.hierarchy.call; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.psi.impl.light.LightDefaultConstructor; import com.intellij.psi.impl.light.LightMemberReference; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; @@ -85,6 +72,9 @@ public final class JavaCallReferenceProcessor implements CallReferenceProcessor } PsiElement element = reference.getElement(); + if (element instanceof PsiClass aClass) { + element = LightDefaultConstructor.create(aClass); + } PsiMember key = CallHierarchyNodeDescriptor.getEnclosingElement(element); CallHierarchyNodeDescriptor parentDescriptor = (CallHierarchyNodeDescriptor) data.getNodeDescriptor(); if (isRecursiveNode(method, parentDescriptor)) return false; diff --git a/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/Tastes.java b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/Tastes.java new file mode 100644 index 000000000000..44ff935b2793 --- /dev/null +++ b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/Tastes.java @@ -0,0 +1,9 @@ +class Sweet {} +class Sour extends Sweet {} +class Salty extends Sour {} +class Bitter extends Salty { + + public static void main(String[] args) { + new Bitter(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/verification.xml b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/verification.xml new file mode 100644 index 000000000000..e0b20fcd57c6 --- /dev/null +++ b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructors/verification.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/Tastes.java b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/Tastes.java new file mode 100644 index 000000000000..3cb31a80b64f --- /dev/null +++ b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/Tastes.java @@ -0,0 +1,17 @@ +class Sweet {} +class Sour extends Sweet { + Sour() { + } +} +class Salty extends Sour { + Salty() { + super(); + } +} +class Bitter extends Salty { + + public static void main(String[] args) { + new Bitter(); + new Bitter(); + } +} \ No newline at end of file diff --git a/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/verification.xml b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/verification.xml new file mode 100644 index 000000000000..b4b4f541b5ef --- /dev/null +++ b/java/java-tests/testData/ide/hierarchy/call/DefaultConstructorsReverse/verification.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/java/java-tests/testData/ide/hierarchy/call/MethodRef/verification.xml b/java/java-tests/testData/ide/hierarchy/call/MethodRef/verification.xml index d1cd033f5a89..f5c806fc1088 100644 --- a/java/java-tests/testData/ide/hierarchy/call/MethodRef/verification.xml +++ b/java/java-tests/testData/ide/hierarchy/call/MethodRef/verification.xml @@ -1,18 +1,3 @@ - - - - - - - - - - - - - - - diff --git a/java/java-tests/testSrc/com/intellij/java/ide/hierarchy/JavaCallHierarchyTest.java b/java/java-tests/testSrc/com/intellij/java/ide/hierarchy/JavaCallHierarchyTest.java index e9864c76da2d..b62f71a41b50 100644 --- a/java/java-tests/testSrc/com/intellij/java/ide/hierarchy/JavaCallHierarchyTest.java +++ b/java/java-tests/testSrc/com/intellij/java/ide/hierarchy/JavaCallHierarchyTest.java @@ -13,6 +13,7 @@ import com.intellij.openapi.actionSystem.ex.ActionUtil; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; +import com.intellij.psi.impl.light.LightDefaultConstructor; import com.intellij.psi.search.ProjectScope; import com.intellij.testFramework.IdeaTestUtil; import com.intellij.testFramework.TestActionEvent; @@ -97,6 +98,17 @@ public class JavaCallHierarchyTest extends HierarchyViewTestBase { public void testDefaultConstructor() { doCallerHierarchyTest("A", "A", "A.java"); } + + public void testDefaultConstructors() { + doHierarchyTest(() -> { + PsiClass aClass = JavaPsiFacade.getInstance(getProject()).findClass("Sweet", ProjectScope.getProjectScope(getProject())); + return new CallerMethodsTreeStructure(getProject(), LightDefaultConstructor.create(aClass), HierarchyBrowserBaseEx.SCOPE_PROJECT); + }, JavaHierarchyUtil.getComparator(myProject), "Tastes.java"); + } + + public void testDefaultConstructorsReverse() { + doCalleeHierarchyTest("Bitter", "main", "Tastes.java"); + } public void testRecordCanonicalConstructor() { doHierarchyTest(() -> { @@ -115,7 +127,7 @@ public class JavaCallHierarchyTest extends HierarchyViewTestBase { public void testRecordCanonicalConstructorReverse2() { doHierarchyTest(() -> { PsiClass aClass = JavaPsiFacade.getInstance(getProject()).findClass("Value", ProjectScope.getProjectScope(getProject())); - return new CalleeMethodsTreeStructure(getProject(), aClass, HierarchyBrowserBaseEx.SCOPE_PROJECT); + return new CalleeMethodsTreeStructure(getProject(), aClass, HierarchyBrowserBaseEx.SCOPE_ALL); }, JavaHierarchyUtil.getComparator(myProject), "Value.java"); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java index f0ddb42df19a..fdc22ad93521 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyTreeStructure.java @@ -1,5 +1,4 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. - +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.ide.hierarchy; import com.intellij.ide.scratch.ScratchUtil; @@ -12,10 +11,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.TestSourcesFilter; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.ElementDescriptionUtil; -import com.intellij.psi.PsiDocumentManager; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; +import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScopesCore; import com.intellij.psi.search.LocalSearchScope; @@ -167,6 +163,7 @@ public abstract class HierarchyTreeStructure extends AbstractTreeStructure { return module != null && module.getModuleScope().contains(virtualFile); } if (HierarchyBrowserBaseEx.SCOPE_PROJECT.equals(scopeType)) { + if (srcElement.getContainingFile() instanceof PsiCompiledElement) return false; VirtualFile virtualFile = srcElement.getContainingFile().getVirtualFile(); return virtualFile == null || !TestSourcesFilter.isTestSources(virtualFile, myProject); } diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinAnonymousObject/KotlinAnonymousObject_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinAnonymousObject/KotlinAnonymousObject_verification.xml index dc67e81bfdc7..f87c8d528498 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinAnonymousObject/KotlinAnonymousObject_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinAnonymousObject/KotlinAnonymousObject_verification.xml @@ -4,7 +4,5 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClass/KotlinClass_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClass/KotlinClass_verification.xml index 7c1e2e7af1ea..b525b2242b9a 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClass/KotlinClass_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClass/KotlinClass_verification.xml @@ -6,9 +6,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClassObject/KotlinClassObject_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClassObject/KotlinClassObject_verification.xml index f3d935eeb61e..b4500e7a2e5e 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClassObject/KotlinClassObject_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinClassObject/KotlinClassObject_verification.xml @@ -1,9 +1,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinEnumClass/KotlinEnumClass_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinEnumClass/KotlinEnumClass_verification.xml index d71187d5cd94..6eb302254335 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinEnumClass/KotlinEnumClass_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinEnumClass/KotlinEnumClass_verification.xml @@ -1,8 +1,6 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinFunction/KotlinFunction_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinFunction/KotlinFunction_verification.xml index f2ca0f4f5430..2ea159691a27 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinFunction/KotlinFunction_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinFunction/KotlinFunction_verification.xml @@ -1,8 +1,6 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalClass/KotlinLocalClass_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalClass/KotlinLocalClass_verification.xml index be5c5a6740b5..a79a4c291704 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalClass/KotlinLocalClass_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalClass/KotlinLocalClass_verification.xml @@ -1,8 +1,6 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalFunction/KotlinLocalFunction_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalFunction/KotlinLocalFunction_verification.xml index 39fecde44c24..bde2902c17af 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalFunction/KotlinLocalFunction_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinLocalFunction/KotlinLocalFunction_verification.xml @@ -1,8 +1,6 @@ - - - + @@ -11,9 +9,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinNestedClass/KotlinNestedClass_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinNestedClass/KotlinNestedClass_verification.xml index 1ab9d67a9323..c4720066c2c2 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinNestedClass/KotlinNestedClass_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinNestedClass/KotlinNestedClass_verification.xml @@ -1,9 +1,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinObject/KotlinObject_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinObject/KotlinObject_verification.xml index 7c77baba0274..6580b1dfc19c 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinObject/KotlinObject_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinObject/KotlinObject_verification.xml @@ -1,7 +1,5 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageFunction/KotlinPackageFunction_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageFunction/KotlinPackageFunction_verification.xml index 3631ceaf1628..6fa3742583b6 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageFunction/KotlinPackageFunction_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageFunction/KotlinPackageFunction_verification.xml @@ -1,9 +1,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageProperty/KotlinPackageProperty_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageProperty/KotlinPackageProperty_verification.xml index 71af16d78fb7..f0278ec035ff 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageProperty/KotlinPackageProperty_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinPackageProperty/KotlinPackageProperty_verification.xml @@ -5,9 +5,7 @@ - - - + diff --git a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinProperty/KotlinProperty_verification.xml b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinProperty/KotlinProperty_verification.xml index c630d78fb8a4..8884407ccfa4 100644 --- a/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinProperty/KotlinProperty_verification.xml +++ b/plugins/kotlin/idea/tests/testData/hierarchy/calls/callees/kotlinProperty/KotlinProperty_verification.xml @@ -8,7 +8,5 @@ - - - +