From 993ce19e72316b5afa09d8ce1c8f2853fa07589b Mon Sep 17 00:00:00 2001 From: Alexandr Suhinin Date: Mon, 10 Jun 2024 14:43:13 +0300 Subject: [PATCH] IJPL-797 `intellij.platform.duplicates.analysis` review internal API GitOrigin-RevId: c43f630d7ec2b4ba45aebb72269710c6a8950a80 --- .../{api-dump-unreviewed.txt => api-dump.txt} | 95 +------------------ .../dupLocator/AbstractMatchingVisitor.java | 4 +- .../dupLocator/DefaultDuplocatorState.java | 4 +- .../intellij/dupLocator/DupLocatorBundle.java | 6 +- .../dupLocator/DuplicatesProfile.java | 6 +- .../MultilanguageDuplocatorSettings.java | 2 + .../intellij/dupLocator/TreeComparator.java | 2 +- .../src/com/intellij/dupLocator/_DupInfo.java | 18 ---- .../EquivalenceDescriptorProvider.java | 2 +- .../equivalence/MultiChildDescriptor.java | 2 + .../equivalence/SingleChildDescriptor.java | 2 + .../treeHash/AbstractTreeHasher.java | 4 +- .../treeHash/DuplicatesMatchingVisitor.java | 4 +- .../treeHash/GroupNodeDescription.java | 4 +- .../treeHash/NodeSpecificHasherBase.java | 2 + .../dupLocator/treeHash/TreePsiFragment.java | 6 +- 16 files changed, 33 insertions(+), 130 deletions(-) rename platform/duplicates-analysis/{api-dump-unreviewed.txt => api-dump.txt} (71%) delete mode 100644 platform/duplicates-analysis/src/com/intellij/dupLocator/_DupInfo.java diff --git a/platform/duplicates-analysis/api-dump-unreviewed.txt b/platform/duplicates-analysis/api-dump.txt similarity index 71% rename from platform/duplicates-analysis/api-dump-unreviewed.txt rename to platform/duplicates-analysis/api-dump.txt index e18423449d51..f50c051550a1 100644 --- a/platform/duplicates-analysis/api-dump-unreviewed.txt +++ b/platform/duplicates-analysis/api-dump.txt @@ -16,18 +16,6 @@ a:com.intellij.dupLocator.AbstractMatchingVisitor - matchSons(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z - f:matchSonsInAnyOrder(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z - matchSonsOptionally(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z -f:com.intellij.dupLocator.DefaultDuplocatorState -- com.intellij.dupLocator.ExternalizableDuplocatorState -- DISCARD_COST:I -- DISTINGUISH_FUNCTIONS:Z -- DISTINGUISH_LITERALS:Z -- DISTINGUISH_VARIABLES:Z -- LOWER_BOUND:I -- ():V -- distinguishLiterals():Z -- distinguishRole(com.intellij.dupLocator.PsiElementRole):Z -- getDiscardCost():I -- getLowerBound():I com.intellij.dupLocator.DupInfo - a:getComment(I):java.lang.String - a:getFileCount(I):I @@ -38,11 +26,7 @@ com.intellij.dupLocator.DupInfo - a:getPatterns():I - a:getTitle(I):java.lang.String - a:getUsageOccurences(I):com.intellij.usageView.UsageInfo[] -f:com.intellij.dupLocator.DupLocatorBundle -- s:message(java.lang.String,java.lang.Object[]):java.lang.String -- s:messagePointer(java.lang.String,java.lang.Object[]):java.util.function.Supplier a:com.intellij.dupLocator.DuplicatesProfile -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - ():V - acceptsContentForIndexing(com.intellij.util.indexing.FileContent):Z - a:createVisitor(com.intellij.dupLocator.treeHash.FragmentsCollector):com.intellij.dupLocator.DuplocateVisitor @@ -54,6 +38,7 @@ a:com.intellij.dupLocator.DuplicatesProfile - getComment(com.intellij.dupLocator.DupInfo,I):java.lang.String - a:getDuplocatorState(com.intellij.lang.Language):com.intellij.dupLocator.DuplocatorState - getLanguage(com.intellij.psi.PsiElement):com.intellij.lang.Language +- s:getProfile(java.lang.Class):com.intellij.dupLocator.DuplicatesProfile - getRole(com.intellij.psi.PsiElement):com.intellij.dupLocator.PsiElementRole - isMyDuplicate(com.intellij.dupLocator.DupInfo,I):Z - a:isMyLanguage(com.intellij.lang.Language):Z @@ -91,14 +76,6 @@ com.intellij.dupLocator.LightDuplicateProfile - a:process(com.intellij.lang.LighterAST,com.intellij.dupLocator.LightDuplicateProfile$Callback):V com.intellij.dupLocator.LightDuplicateProfile$Callback - a:process(I,I,com.intellij.lang.LighterAST,com.intellij.lang.LighterASTNode[]):V -f:com.intellij.dupLocator.MultilanguageDuplocatorSettings -- com.intellij.openapi.components.PersistentStateComponent -- ():V -- s:getInstance():com.intellij.dupLocator.MultilanguageDuplocatorSettings -- getState():org.jdom.Element -- getState(com.intellij.lang.Language):com.intellij.dupLocator.DefaultDuplocatorState -- loadState(org.jdom.Element):V -- registerState(com.intellij.lang.Language,com.intellij.dupLocator.DefaultDuplocatorState):V a:com.intellij.dupLocator.NodeSpecificHasher - com.intellij.dupLocator.DuplocateVisitor - ():V @@ -115,16 +92,8 @@ e:com.intellij.dupLocator.PsiElementRole - sf:VARIABLE_NAME:com.intellij.dupLocator.PsiElementRole - s:valueOf(java.lang.String):com.intellij.dupLocator.PsiElementRole - s:values():com.intellij.dupLocator.PsiElementRole[] -f:com.intellij.dupLocator.TreeComparator -- s:areEqual(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement,com.intellij.dupLocator.NodeSpecificHasher,I):Z com.intellij.dupLocator.TreeHasher - a:hash(com.intellij.psi.PsiElement,com.intellij.dupLocator.NodeSpecificHasher):V -com.intellij.dupLocator._DupInfo -- a:getDensity(java.lang.Integer):I -- a:getHeight(java.lang.Integer):I -- a:getOccurencies(java.lang.Integer):java.util.HashSet -- a:getPatterns():java.util.TreeSet -- a:toString(java.lang.Integer):java.lang.String com.intellij.dupLocator.equivalence.EquivalenceDescriptor - a:getCodeBlocks():java.util.List - a:getConstants():java.util.List @@ -151,40 +120,12 @@ c:com.intellij.dupLocator.equivalence.EquivalenceDescriptorBuilder - optionallyInPattern(com.intellij.psi.PsiElement):com.intellij.dupLocator.equivalence.EquivalenceDescriptorBuilder - optionallyInPattern(com.intellij.psi.PsiElement[]):com.intellij.dupLocator.equivalence.EquivalenceDescriptorBuilder a:com.intellij.dupLocator.equivalence.EquivalenceDescriptorProvider -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - s:ourUseDefaultEquivalence:Z - ():V - a:buildDescriptor(com.intellij.psi.PsiElement):com.intellij.dupLocator.equivalence.EquivalenceDescriptor - getIgnoredTokens():com.intellij.psi.tree.TokenSet - s:getInstance(com.intellij.psi.PsiElement):com.intellij.dupLocator.equivalence.EquivalenceDescriptorProvider - a:isMyContext(com.intellij.psi.PsiElement):Z -c:com.intellij.dupLocator.equivalence.MultiChildDescriptor -- (com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType,com.intellij.psi.PsiElement[]):V -- getElements():com.intellij.psi.PsiElement[] -- getType():com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -e:com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- java.lang.Enum -- sf:DEFAULT:com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- sf:IN_ANY_ORDER:com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- sf:OPTIONALLY:com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- sf:OPTIONALLY_IN_PATTERN:com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- s:valueOf(java.lang.String):com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType -- s:values():com.intellij.dupLocator.equivalence.MultiChildDescriptor$MyType[] -c:com.intellij.dupLocator.equivalence.SingleChildDescriptor -- (com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType,com.intellij.psi.PsiElement):V -- getElement():com.intellij.psi.PsiElement -- getType():com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -e:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- java.lang.Enum -- sf:CHILDREN:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:CHILDREN_IN_ANY_ORDER:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:CHILDREN_OPTIONALLY:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:CHILDREN_OPTIONALLY_IN_PATTERN:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:DEFAULT:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:OPTIONALLY:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- sf:OPTIONALLY_IN_PATTERN:com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- s:valueOf(java.lang.String):com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType -- s:values():com.intellij.dupLocator.equivalence.SingleChildDescriptor$MyType[] f:com.intellij.dupLocator.iterators.ArrayBackedNodeIterator - com.intellij.dupLocator.iterators.NodeIterator - (com.intellij.psi.PsiElement[]):V @@ -244,8 +185,8 @@ a:com.intellij.dupLocator.treeHash.AbstractTreeHasher - pf:myCallBack:com.intellij.dupLocator.treeHash.FragmentsCollector - pf:myForIndexing:Z - (com.intellij.dupLocator.treeHash.FragmentsCollector,Z):V -- p:buildFragment(com.intellij.dupLocator.NodeSpecificHasher,com.intellij.psi.PsiElement,I):com.intellij.dupLocator.treeHash.TreePsiFragment -- p:buildFragment(com.intellij.dupLocator.NodeSpecificHasher,java.util.List,I,I):com.intellij.dupLocator.treeHash.TreePsiFragment +- p:buildFragment(com.intellij.dupLocator.NodeSpecificHasher,com.intellij.psi.PsiElement,I):com.intellij.dupLocator.util.PsiFragment +- p:buildFragment(com.intellij.dupLocator.NodeSpecificHasher,java.util.List,I,I):com.intellij.dupLocator.util.PsiFragment - p:computeElementHash(com.intellij.psi.PsiElement,com.intellij.dupLocator.util.PsiFragment,com.intellij.dupLocator.NodeSpecificHasher):com.intellij.dupLocator.treeHash.TreeHashResult - p:getCost(com.intellij.psi.PsiElement):I - pa:getDiscardCost(com.intellij.psi.PsiElement):I @@ -257,11 +198,6 @@ a:com.intellij.dupLocator.treeHash.AbstractTreeHasher - shouldAnonymize(com.intellij.psi.PsiElement,com.intellij.dupLocator.NodeSpecificHasher):Z - s:vector(I[]):I - s:vector(I[],I):I -f:com.intellij.dupLocator.treeHash.DuplicatesMatchingVisitor -- com.intellij.dupLocator.AbstractMatchingVisitor -- (com.intellij.dupLocator.treeHash.NodeSpecificHasherBase,com.intellij.dupLocator.util.NodeFilter,I):V -- match(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z -- matchSequentially(com.intellij.dupLocator.iterators.NodeIterator,com.intellij.dupLocator.iterators.NodeIterator):Z a:com.intellij.dupLocator.treeHash.DuplicatesProfileBase - com.intellij.dupLocator.DuplicatesProfile - ():V @@ -282,26 +218,6 @@ c:com.intellij.dupLocator.treeHash.DuplocatorHashCallback - s:writeDuplicates(java.nio.file.Path,com.intellij.openapi.project.Project,com.intellij.dupLocator.DupInfo):V com.intellij.dupLocator.treeHash.FragmentsCollector - a:add(I,I,com.intellij.dupLocator.util.PsiFragment):V -c:com.intellij.dupLocator.treeHash.GroupNodeDescription -- (I,java.lang.String,java.lang.String):V -- getComment():java.lang.String -- getFilesCount():I -- getTitle():java.lang.String -c:com.intellij.dupLocator.treeHash.NodeSpecificHasherBase -- com.intellij.dupLocator.NodeSpecificHasher -- pf:myForIndexing:Z -- (com.intellij.dupLocator.DuplocatorSettings,com.intellij.dupLocator.treeHash.FragmentsCollector,com.intellij.dupLocator.treeHash.DuplicatesProfileBase):V -- (com.intellij.dupLocator.DuplocatorSettings,com.intellij.dupLocator.treeHash.FragmentsCollector,com.intellij.dupLocator.treeHash.DuplicatesProfileBase,Z):V -- areNodesEqual(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z -- areTreesEqual(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement,I):Z -- checkDeep(com.intellij.psi.PsiElement,com.intellij.psi.PsiElement):Z -- getDuplicatesProfile():com.intellij.dupLocator.treeHash.DuplicatesProfileBase -- getNodeChildren(com.intellij.psi.PsiElement):java.util.List -- getNodeCost(com.intellij.psi.PsiElement):I -- getNodeFilter():com.intellij.dupLocator.util.NodeFilter -- getNodeHash(com.intellij.psi.PsiElement):I -- hashingFinished():V -- visitNode(com.intellij.psi.PsiElement):V c:com.intellij.dupLocator.treeHash.TreeHashResult - (I,I,com.intellij.dupLocator.util.PsiFragment):V - getCost():I @@ -310,11 +226,6 @@ c:com.intellij.dupLocator.treeHash.TreeHashResult f:com.intellij.dupLocator.treeHash.TreeHashingUtils - ():V - s:hashCodeBlockForIndexing(com.intellij.dupLocator.treeHash.AbstractTreeHasher,com.intellij.dupLocator.treeHash.FragmentsCollector,java.util.List,com.intellij.dupLocator.util.PsiFragment,com.intellij.dupLocator.NodeSpecificHasher):com.intellij.dupLocator.treeHash.TreeHashResult -c:com.intellij.dupLocator.treeHash.TreePsiFragment -- com.intellij.dupLocator.util.PsiFragment -- (com.intellij.dupLocator.NodeSpecificHasher,com.intellij.psi.PsiElement,I):V -- (com.intellij.dupLocator.NodeSpecificHasher,java.util.List,I,I):V -- isEqual(com.intellij.psi.PsiElement[],I):Z com.intellij.dupLocator.treeView.NodeMatcher - a:match(com.intellij.psi.PsiElement):Z f:com.intellij.dupLocator.util.DuplocatorUtil diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/AbstractMatchingVisitor.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/AbstractMatchingVisitor.java index 2db70d7bbf8d..f441a41a4556 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/AbstractMatchingVisitor.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/AbstractMatchingVisitor.java @@ -15,12 +15,12 @@ */ package com.intellij.dupLocator; -import com.intellij.dupLocator.util.NodeFilter; -import com.intellij.psi.PsiElement; import com.intellij.dupLocator.iterators.ArrayBackedNodeIterator; import com.intellij.dupLocator.iterators.FilteringNodeIterator; import com.intellij.dupLocator.iterators.NodeIterator; import com.intellij.dupLocator.iterators.SiblingNodeIterator; +import com.intellij.dupLocator.util.NodeFilter; +import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java index be6c0fd9c56f..eb4a800758db 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/DefaultDuplocatorState.java @@ -1,10 +1,10 @@ package com.intellij.dupLocator; -import com.intellij.openapi.diagnostic.Logger; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +@ApiStatus.Internal public final class DefaultDuplocatorState implements ExternalizableDuplocatorState { - private static final Logger LOG = Logger.getInstance(DefaultDuplocatorState.class); public boolean DISTINGUISH_VARIABLES = false; public boolean DISTINGUISH_FUNCTIONS = true; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java index 64711251a17d..79931f150067 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java @@ -1,13 +1,11 @@ package com.intellij.dupLocator; import com.intellij.DynamicBundle; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.PropertyKey; +import org.jetbrains.annotations.*; import java.util.function.Supplier; +@ApiStatus.Internal public final class DupLocatorBundle { private static final @NonNls String BUNDLE = "messages.DupLocatorBundle"; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/DuplicatesProfile.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/DuplicatesProfile.java index 702ee6b93391..9bffc39413fe 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/DuplicatesProfile.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/DuplicatesProfile.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; public abstract class DuplicatesProfile { - public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.duplicates.profile"); + private static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.duplicates.profile"); @NotNull public abstract DuplocateVisitor createVisitor(@NotNull FragmentsCollector collector); @@ -109,6 +109,10 @@ public abstract class DuplicatesProfile { return null; } + public static DuplicatesProfile getProfile(Class profileClass) { + return EP_NAME.findExtensionOrFail(profileClass); + } + @NotNull public Language getLanguage(@NotNull PsiElement element) { return element.getLanguage(); diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/MultilanguageDuplocatorSettings.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/MultilanguageDuplocatorSettings.java index 2723ebb26406..1f5536658e1f 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/MultilanguageDuplocatorSettings.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/MultilanguageDuplocatorSettings.java @@ -10,11 +10,13 @@ import com.intellij.openapi.components.Storage; import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.Map; import java.util.TreeMap; +@ApiStatus.Internal @State( name = "MultiLanguageDuplocatorSettings", storages = @Storage("duplocatorSettings.xml"), diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/TreeComparator.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/TreeComparator.java index db2c8de4243d..8fff978261c0 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/TreeComparator.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/TreeComparator.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; -public final class TreeComparator { +final class TreeComparator { private TreeComparator() { } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/_DupInfo.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/_DupInfo.java deleted file mode 100644 index 32d4b229d56b..000000000000 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/_DupInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.intellij.dupLocator; - -import com.intellij.psi.PsiElement; - -import java.util.HashSet; -import java.util.TreeSet; - -public interface _DupInfo { - TreeSet getPatterns(); - - int getHeight(Integer pattern); - - int getDensity(Integer pattern); - - HashSet getOccurencies(Integer pattern); - - String toString(Integer pattern); -} diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/EquivalenceDescriptorProvider.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/EquivalenceDescriptorProvider.java index 44539941eeca..e8c677bf936d 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/EquivalenceDescriptorProvider.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/EquivalenceDescriptorProvider.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; public abstract class EquivalenceDescriptorProvider { - public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.equivalenceDescriptorProvider"); + private static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.equivalenceDescriptorProvider"); // for using in tests only !!! @SuppressWarnings("StaticNonFinalField") diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/MultiChildDescriptor.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/MultiChildDescriptor.java index 3c31a0f881ba..b93b077a91b3 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/MultiChildDescriptor.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/MultiChildDescriptor.java @@ -1,8 +1,10 @@ package com.intellij.dupLocator.equivalence; import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; +@ApiStatus.Internal public class MultiChildDescriptor { private final MyType myType; private final PsiElement[] myElements; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/SingleChildDescriptor.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/SingleChildDescriptor.java index 1eea097c0945..cf8b0d6a6616 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/SingleChildDescriptor.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/equivalence/SingleChildDescriptor.java @@ -1,9 +1,11 @@ package com.intellij.dupLocator.equivalence; import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +@ApiStatus.Internal public class SingleChildDescriptor { private final MyType myType; private final PsiElement myElement; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/AbstractTreeHasher.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/AbstractTreeHasher.java index 594ade292cfb..19aaddc74228 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/AbstractTreeHasher.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/AbstractTreeHasher.java @@ -77,7 +77,7 @@ public abstract class AbstractTreeHasher implements TreeHasher { return new TreeHashResult(h, c, fragment); } - protected TreePsiFragment buildFragment(NodeSpecificHasher hasher, PsiElement root,int cost) { + protected PsiFragment buildFragment(NodeSpecificHasher hasher, PsiElement root,int cost) { if (myForIndexing) { return new TreePsiFragment(hasher, root, cost) { @Override @@ -94,7 +94,7 @@ public abstract class AbstractTreeHasher implements TreeHasher { return new TreePsiFragment(hasher, root, cost); } - protected TreePsiFragment buildFragment(NodeSpecificHasher hasher, List elements, int from, int to) { + protected PsiFragment buildFragment(NodeSpecificHasher hasher, List elements, int from, int to) { if (myForIndexing) { return new TreePsiFragment(hasher, elements, from, to) { @Override diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplicatesMatchingVisitor.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplicatesMatchingVisitor.java index bcdb14f65bad..4df2c988d254 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplicatesMatchingVisitor.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/DuplicatesMatchingVisitor.java @@ -21,14 +21,14 @@ import org.jetbrains.annotations.NotNull; import java.util.*; -public final class DuplicatesMatchingVisitor extends AbstractMatchingVisitor { +final class DuplicatesMatchingVisitor extends AbstractMatchingVisitor { private final NodeSpecificHasherBase myNodeSpecificHasher; private final NodeFilter myNodeFilter; private final int myDiscardCost; private final TreeHasherBase myTreeHasher; private final Map myPsiElement2HashAndCost = new HashMap<>(); - public DuplicatesMatchingVisitor(NodeSpecificHasherBase nodeSpecificHasher, + DuplicatesMatchingVisitor(NodeSpecificHasherBase nodeSpecificHasher, @NotNull NodeFilter nodeFilter, int discardCost) { myNodeSpecificHasher = nodeSpecificHasher; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/GroupNodeDescription.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/GroupNodeDescription.java index 2cd913eba506..c2e4a4c178f4 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/GroupNodeDescription.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/GroupNodeDescription.java @@ -2,13 +2,13 @@ package com.intellij.dupLocator.treeHash; import org.jetbrains.annotations.Nls; -public class GroupNodeDescription { +class GroupNodeDescription { private final int myFilesCount; private final @Nls String myTitle; private final @Nls String myComment; - public GroupNodeDescription(final int filesCount, final @Nls String title, final @Nls String comment) { + GroupNodeDescription(final int filesCount, final @Nls String title, final @Nls String comment) { myFilesCount = filesCount; myTitle = title; myComment = comment; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/NodeSpecificHasherBase.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/NodeSpecificHasherBase.java index 9bb0c47f0ff7..67757d9c7884 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/NodeSpecificHasherBase.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/NodeSpecificHasherBase.java @@ -15,11 +15,13 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.impl.source.tree.LeafElement; import com.intellij.psi.tree.IElementType; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; +@ApiStatus.Internal public class NodeSpecificHasherBase extends NodeSpecificHasher { private final TreeHasherBase myTreeHasher; private final DuplocatorSettings mySettings; diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/TreePsiFragment.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/TreePsiFragment.java index 57fe5c5781bb..d281662df02b 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/TreePsiFragment.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/treeHash/TreePsiFragment.java @@ -6,15 +6,15 @@ import com.intellij.psi.PsiElement; import java.util.List; -public class TreePsiFragment extends PsiFragment { +class TreePsiFragment extends PsiFragment { private final NodeSpecificHasher myHasher; - public TreePsiFragment(final NodeSpecificHasher hasher, final PsiElement root, final int cost) { + TreePsiFragment(final NodeSpecificHasher hasher, final PsiElement root, final int cost) { super(root, cost); myHasher = hasher; } - public TreePsiFragment(final NodeSpecificHasher hasher, final List element, final int from, final int to) { + TreePsiFragment(final NodeSpecificHasher hasher, final List element, final int from, final int to) { super(element, from, to); myHasher = hasher; }