From f8297281d0a6dca6b6bf2e7bb8a7e2e826a7134b Mon Sep 17 00:00:00 2001 From: Liudmila Kornilova Date: Tue, 11 Jun 2024 22:29:25 +0200 Subject: [PATCH] IJPL-149755 Remove internal classes from api of intellij.platform.indexing Signed-off-by: Liudmila Kornilova GitOrigin-RevId: f43463f62710e9ce8df6a3e6a8d061ac5e8ba719 --- platform/editor-ui-ex/api-dump-unreviewed.txt | 8 - .../psi/impl/search/IndexPatternSearcher.java | 2 + .../search/LightIndexPatternSearcher.java | 2 + platform/indexing-api/api-dump-unreviewed.txt | 155 +----------------- .../cacheBuilder/CacheBuilderRegistry.java | 2 + .../PsiSymbolDeclarationSearchParameters.java | 4 +- .../PsiSymbolReferenceSearchParameters.java | 4 +- .../search/PsiSymbolReferenceSearcher.java | 4 +- .../indexing/BinaryFileSourceProvider.java | 3 + .../psi/impl/cache/TodoCacheManager.java | 2 + .../intellij/psi/search/FileTypeIndex.java | 3 +- .../psi/search/PsiReferenceProcessor.java | 4 +- .../search/PsiReferenceProcessorAdapter.java | 4 +- .../intellij/psi/search/PsiSearchHelper.java | 1 + .../intellij/psi/search/TodoAttributes.java | 6 +- .../search/searches/IndexPatternSearch.java | 2 + .../search/searches/ReferenceDescriptor.java | 2 + .../BuildableRootsChangeRescanningInfo.java | 14 +- ...tomInputsIndexFileBasedIndexExtension.java | 6 +- .../util/indexing/FileBasedIndex.java | 29 ++-- .../util/indexing/FilePropertyPusherEx.java | 4 +- .../indexing/FileTypeSpecificSubIndexer.java | 6 +- .../com/intellij/util/indexing/IdFilter.java | 5 +- .../indexing/SingleEntryCompositeIndexer.java | 6 +- .../indexing/hints/FileTypeIndexingHint.kt | 3 +- .../indexing/roots/IndexableFileScanner.java | 4 + .../IndexableFilesDeduplicateFilter.java | 4 +- .../roots/IndexableIteratorPresentation.java | 2 + .../roots/LibraryIndexableFilesIterator.java | 2 + .../roots/ModuleIndexableFilesIterator.java | 2 + .../roots/ProjectIndexableFilesIterator.java | 2 + ...yntheticLibraryIndexableFilesIterator.java | 7 +- .../roots/kind/indexableSetOriginsApi.kt | 7 + .../indexing-impl/api-dump-unreviewed.txt | 1 - .../model/search/impl/SearchServiceImpl.kt | 1 + platform/lang-impl/api-dump-unreviewed.txt | 52 +----- platform/lang-impl/exposed-private-api.txt | 5 + ...uildableRootsChangeRescanningInfoImpl.java | 5 + .../DirtyFilesIndexableFilesIterator.kt | 5 +- .../util/indexing/FileBasedIndexImpl.java | 2 + ...ionalLibraryIndexableAddedFilesIterator.kt | 2 + .../LibraryIndexableFilesIteratorImpl.kt | 2 + .../roots/origin/indexableSetOrigins.kt | 12 ++ .../roots/origin/workspaceEntitiesOrigins.kt | 5 + 44 files changed, 148 insertions(+), 255 deletions(-) diff --git a/platform/editor-ui-ex/api-dump-unreviewed.txt b/platform/editor-ui-ex/api-dump-unreviewed.txt index 15edf87da90c..68926bb56d58 100644 --- a/platform/editor-ui-ex/api-dump-unreviewed.txt +++ b/platform/editor-ui-ex/api-dump-unreviewed.txt @@ -704,10 +704,6 @@ com.intellij.openapi.editor.impl.event.MarkupModelListener - attributesChanged(com.intellij.openapi.editor.ex.RangeHighlighterEx,Z,Z):V - attributesChanged(com.intellij.openapi.editor.ex.RangeHighlighterEx,Z,Z,Z):V - beforeRemoved(com.intellij.openapi.editor.ex.RangeHighlighterEx):V -c:com.intellij.psi.impl.search.IndexPatternSearcher -- com.intellij.openapi.application.QueryExecutorBase -- ps:executeImpl(com.intellij.psi.search.searches.IndexPatternSearch$SearchParameters,com.intellij.util.Processor):V -- processQuery(com.intellij.psi.search.searches.IndexPatternSearch$SearchParameters,com.intellij.util.Processor):V c:com.intellij.psi.impl.search.LexerEditorHighlighterLexer - com.intellij.lexer.LexerBase - (com.intellij.openapi.editor.highlighter.EditorHighlighter,Z):V @@ -725,10 +721,6 @@ c:com.intellij.psi.impl.search.LightIndexPatternSearch - com.intellij.util.QueryFactory - sf:SEARCH:com.intellij.psi.impl.search.LightIndexPatternSearch - ():V -c:com.intellij.psi.impl.search.LightIndexPatternSearcher -- com.intellij.psi.impl.search.IndexPatternSearcher -- ():V -- processQuery(com.intellij.psi.search.searches.IndexPatternSearch$SearchParameters,com.intellij.util.Processor):V c:com.intellij.psi.impl.search.PsiTodoSearchHelperImpl - com.intellij.psi.search.PsiTodoSearchHelper - (com.intellij.openapi.project.Project):V diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java index 5daf20b5f44d..7e185d894575 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java @@ -30,6 +30,7 @@ import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.CharSequenceSubSequence; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import java.util.*; @@ -37,6 +38,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +@Internal public class IndexPatternSearcher extends QueryExecutorBase { private static final String WHITESPACE = " \t"; diff --git a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/LightIndexPatternSearcher.java b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/LightIndexPatternSearcher.java index 9c1da8f8f97d..bdef25537915 100644 --- a/platform/editor-ui-ex/src/com/intellij/psi/impl/search/LightIndexPatternSearcher.java +++ b/platform/editor-ui-ex/src/com/intellij/psi/impl/search/LightIndexPatternSearcher.java @@ -4,8 +4,10 @@ package com.intellij.psi.impl.search; import com.intellij.psi.search.IndexPatternOccurrence; import com.intellij.psi.search.searches.IndexPatternSearch; import com.intellij.util.Processor; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public class LightIndexPatternSearcher extends IndexPatternSearcher { @Override diff --git a/platform/indexing-api/api-dump-unreviewed.txt b/platform/indexing-api/api-dump-unreviewed.txt index 3e02e37cf6d5..30607f2c739a 100644 --- a/platform/indexing-api/api-dump-unreviewed.txt +++ b/platform/indexing-api/api-dump-unreviewed.txt @@ -102,10 +102,6 @@ e:com.intellij.find.FindModel$SearchContext - sf:STOPPED:com.intellij.find.TextSearchService$TextSearchResult - s:valueOf(java.lang.String):com.intellij.find.TextSearchService$TextSearchResult - s:values():com.intellij.find.TextSearchService$TextSearchResult[] -a:com.intellij.lang.cacheBuilder.CacheBuilderRegistry -- ():V -- a:getCacheBuilder(com.intellij.openapi.fileTypes.FileType):com.intellij.lang.cacheBuilder.WordsScanner -- s:getInstance():com.intellij.lang.cacheBuilder.CacheBuilderRegistry c:com.intellij.lang.cacheBuilder.DefaultWordsScanner - com.intellij.lang.cacheBuilder.VersionedWordsScanner - (com.intellij.lexer.Lexer,com.intellij.psi.tree.TokenSet,com.intellij.psi.tree.TokenSet,com.intellij.psi.tree.TokenSet):V @@ -182,18 +178,8 @@ c:com.intellij.lang.findUsages.LanguageFindUsages - s:withPointer(com.intellij.model.Pointer,com.intellij.model.search.LeafOccurrenceMapper$Parameterized):com.intellij.model.search.LeafOccurrenceMapper *:com.intellij.model.search.LeafOccurrenceMapper$Parameterized - a:mapOccurrence(java.lang.Object,com.intellij.model.search.LeafOccurrence):java.util.Collection -*:com.intellij.model.search.PsiSymbolDeclarationSearchParameters -- com.intellij.model.search.SearchParameters -- a:getSearchScope():com.intellij.psi.search.SearchScope -- a:getSymbol():com.intellij.model.Symbol *:com.intellij.model.search.PsiSymbolDeclarationSearcher - com.intellij.model.search.Searcher -*:com.intellij.model.search.PsiSymbolReferenceSearchParameters -- com.intellij.model.search.SearchParameters -- a:getSearchScope():com.intellij.psi.search.SearchScope -- a:getSymbol():com.intellij.model.Symbol -*:com.intellij.model.search.PsiSymbolReferenceSearcher -- com.intellij.model.search.Searcher *e:com.intellij.model.search.SearchContext - java.lang.Enum - sf:IN_CODE:com.intellij.model.search.SearchContext @@ -238,9 +224,6 @@ c:com.intellij.lang.findUsages.LanguageFindUsages - a:getElement():com.intellij.psi.PsiElement - a:getOffsetInElement():I - s:of(com.intellij.psi.PsiElement,I):com.intellij.model.search.TextOccurrence -com.intellij.platform.indexing.BinaryFileSourceProvider -- sf:EP:com.intellij.openapi.extensions.ExtensionPointName -- a:findSourceFile(com.intellij.psi.PsiBinaryFile):com.intellij.psi.PsiFile com.intellij.psi.impl.cache.CacheManager - a:getFilesWithWord(java.lang.String,S,com.intellij.psi.search.GlobalSearchScope,Z):com.intellij.psi.PsiFile[] - s:getInstance(com.intellij.openapi.project.Project):com.intellij.psi.impl.cache.CacheManager @@ -249,11 +232,6 @@ com.intellij.psi.impl.cache.CacheManager - a:processVirtualFilesWithAllWords(java.util.Collection,S,com.intellij.psi.search.GlobalSearchScope,Z,com.intellij.util.Processor):Z f:com.intellij.psi.impl.cache.CacheManager$SERVICE - s:getInstance(com.intellij.openapi.project.Project):com.intellij.psi.impl.cache.CacheManager -com.intellij.psi.impl.cache.TodoCacheManager -- s:getInstance(com.intellij.openapi.project.Project):com.intellij.psi.impl.cache.TodoCacheManager -- a:getTodoCount(com.intellij.openapi.vfs.VirtualFile,com.intellij.psi.search.IndexPattern):I -- a:getTodoCount(com.intellij.openapi.vfs.VirtualFile,com.intellij.psi.search.IndexPatternProvider):I -- a:processFilesWithTodoItems(com.intellij.util.Processor):Z f:com.intellij.psi.search.FileTypeIndex - *sf:INDEX_CHANGE_TOPIC:com.intellij.util.messages.Topic - ():V @@ -313,26 +291,12 @@ c:com.intellij.psi.search.ProjectAndLibrariesScope - isSearchInLibraries():Z - isSearchInModuleContent(com.intellij.openapi.module.Module):Z - setDisplayName(java.lang.String):V -com.intellij.psi.search.PsiReferenceProcessor -- a:execute(com.intellij.psi.PsiReference):Z -c:com.intellij.psi.search.PsiReferenceProcessor$CollectElements -- com.intellij.psi.search.PsiReferenceProcessor -- ():V -- (java.util.Collection):V -- execute(com.intellij.psi.PsiReference):Z -- toArray():com.intellij.psi.PsiReference[] -- toArray(com.intellij.psi.PsiReference[]):com.intellij.psi.PsiReference[] -c:com.intellij.psi.search.PsiReferenceProcessorAdapter -- com.intellij.openapi.application.ReadActionProcessor -- (com.intellij.psi.search.PsiReferenceProcessor):V -- processInReadAction(com.intellij.psi.PsiReference):Z com.intellij.psi.search.PsiSearchHelper - a:findCommentsContainingIdentifier(java.lang.String,com.intellij.psi.search.SearchScope):com.intellij.psi.PsiElement[] - a:findFilesWithPlainTextWords(java.lang.String):com.intellij.psi.PsiFile[] - getCodeUsageScope(com.intellij.psi.PsiElement):com.intellij.psi.search.SearchScope - s:getInstance(com.intellij.openapi.project.Project):com.intellij.psi.search.PsiSearchHelper - a:getUseScope(com.intellij.psi.PsiElement):com.intellij.psi.search.SearchScope -- hasIdentifierInFile(com.intellij.psi.PsiFile,java.lang.String):Z - isCheapEnoughToSearch(java.lang.String,com.intellij.psi.search.GlobalSearchScope,com.intellij.psi.PsiFile):com.intellij.psi.search.PsiSearchHelper$SearchCostResult - a:isCheapEnoughToSearch(java.lang.String,com.intellij.psi.search.GlobalSearchScope,com.intellij.psi.PsiFile,com.intellij.openapi.progress.ProgressIndicator):com.intellij.psi.search.PsiSearchHelper$SearchCostResult - a:processAllFilesWithWord(java.lang.String,com.intellij.psi.search.GlobalSearchScope,com.intellij.util.Processor,Z):Z @@ -429,9 +393,6 @@ com.intellij.psi.search.TextOccurenceProcessor - a:execute(com.intellij.psi.PsiElement,I):Z f:com.intellij.psi.search.TodoAttributes - java.lang.Cloneable -- (com.intellij.openapi.editor.markup.TextAttributes):V -- (javax.swing.Icon,com.intellij.openapi.editor.markup.TextAttributes):V -- (org.jdom.Element,com.intellij.openapi.editor.markup.TextAttributes):V - clone():com.intellij.psi.search.TodoAttributes - equals(java.lang.Object):Z - getCustomizedTextAttributes():com.intellij.openapi.editor.markup.TextAttributes @@ -492,34 +453,6 @@ c:com.intellij.psi.search.searches.DefinitionsScopedSearch$SearchParameters - getScope():com.intellij.psi.search.SearchScope - isCheckDeep():Z - isQueryValid():Z -a:com.intellij.psi.search.searches.IndexPatternSearch -- com.intellij.psi.search.searches.ExtensibleQueryFactory -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName -- p:():V -- s:getOccurrencesCount(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern):I -- s:getOccurrencesCount(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider):I -- pa:getOccurrencesCountImpl(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern):I -- pa:getOccurrencesCountImpl(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider):I -- s:search(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern):com.intellij.util.Query -- s:search(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern,I,I):com.intellij.util.Query -- s:search(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider):com.intellij.util.Query -- s:search(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider,I,I):com.intellij.util.Query -- s:search(com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider,Z):com.intellij.util.Query -f:com.intellij.psi.search.searches.IndexPatternSearch$SearchParameters -- (com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern):V -- (com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPattern,com.intellij.openapi.util.TextRange):V -- (com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider):V -- (com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider,com.intellij.openapi.util.TextRange):V -- (com.intellij.psi.PsiFile,com.intellij.psi.search.IndexPatternProvider,Z):V -- getFile():com.intellij.psi.PsiFile -- getPattern():com.intellij.psi.search.IndexPattern -- getPatternProvider():com.intellij.psi.search.IndexPatternProvider -- getRange():com.intellij.openapi.util.TextRange -- isMultiLine():Z -f:com.intellij.psi.search.searches.ReferenceDescriptor -- sf:MAPPER:com.intellij.util.Function -- equals(java.lang.Object):Z -- hashCode():I com.intellij.psi.search.searches.ReferenceSearcher - com.intellij.model.search.Searcher f:com.intellij.psi.search.searches.ReferencesSearch @@ -608,7 +541,7 @@ com.intellij.util.gist.VirtualFileGist com.intellij.util.gist.VirtualFileGist$GistCalculator - a:calcData(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):java.lang.Object *a:com.intellij.util.indexing.BuildableRootsChangeRescanningInfo -- ():V +- com.intellij.openapi.project.RootsChangeRescanningInfo - a:addInheritedSdk():com.intellij.util.indexing.BuildableRootsChangeRescanningInfo - a:addLibrary(com.intellij.openapi.roots.libraries.Library):com.intellij.util.indexing.BuildableRootsChangeRescanningInfo - a:addModule(com.intellij.openapi.module.Module):com.intellij.util.indexing.BuildableRootsChangeRescanningInfo @@ -623,8 +556,6 @@ com.intellij.util.gist.VirtualFileGist$GistCalculator - map(com.intellij.util.indexing.FileContent):java.util.Map - a:map(com.intellij.util.indexing.FileContent,java.lang.Object):java.util.Map - requiresContentForSubIndexerEvaluation(com.intellij.util.indexing.IndexedFile):Z -com.intellij.util.indexing.CustomInputsIndexFileBasedIndexExtension -- a:createExternalizer():com.intellij.util.io.DataExternalizer c:com.intellij.util.indexing.DefaultFileTypeSpecificInputFilter - com.intellij.util.indexing.FileBasedIndex$FileTypeSpecificInputFilter - (com.intellij.openapi.fileTypes.FileType[]):V @@ -653,7 +584,6 @@ a:com.intellij.util.indexing.FileBasedIndex - a:getFileBeingCurrentlyIndexed():com.intellij.openapi.vfs.VirtualFile - a:getFileData(com.intellij.util.indexing.ID,com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):java.util.Map - s:getFileId(com.intellij.openapi.vfs.VirtualFile):I -- a:getFileWritingCurrentlyIndexes():com.intellij.util.indexing.FileBasedIndex$IndexWritingFile - a:getFilesWithKey(com.intellij.util.indexing.ID,java.util.Set,com.intellij.util.Processor,com.intellij.psi.search.GlobalSearchScope):Z - a:getIndexModificationStamp(com.intellij.util.indexing.ID,com.intellij.openapi.project.Project):J - s:getInstance():com.intellij.util.indexing.FileBasedIndex @@ -675,7 +605,7 @@ a:com.intellij.util.indexing.FileBasedIndex - a:requestRebuild(com.intellij.util.indexing.ID,java.lang.Throwable):V - a:requestReindex(com.intellij.openapi.vfs.VirtualFile):V - a:scheduleRebuild(com.intellij.util.indexing.ID,java.lang.Throwable):V -*c:com.intellij.util.indexing.FileBasedIndex$AllKeysQuery +*f:com.intellij.util.indexing.FileBasedIndex$AllKeysQuery - (com.intellij.util.indexing.ID,java.util.Collection,com.intellij.openapi.util.Condition):V - getDataKeys():java.util.Collection - getIndexId():com.intellij.util.indexing.ID @@ -683,9 +613,6 @@ a:com.intellij.util.indexing.FileBasedIndex com.intellij.util.indexing.FileBasedIndex$FileTypeSpecificInputFilter - com.intellij.util.indexing.FileBasedIndex$InputFilter - a:registerFileTypesUsedForIndexing(com.intellij.util.Consumer):V -c:com.intellij.util.indexing.FileBasedIndex$IndexWritingFile -- f:fileId:I -- (I):V com.intellij.util.indexing.FileBasedIndex$InputFilter - a:acceptInput(com.intellij.openapi.vfs.VirtualFile):Z *:com.intellij.util.indexing.FileBasedIndex$ProjectSpecificInputFilter @@ -708,26 +635,10 @@ a:com.intellij.util.indexing.FileBasedIndexExtension - hasSnapshotMapping():Z - indexDirectories():Z - traceKeyHashToVirtualFileMapping():Z -*:com.intellij.util.indexing.FilePropertyPusherEx -- com.intellij.openapi.roots.impl.FilePropertyPusher -- a:acceptsOrigin(com.intellij.openapi.project.Project,com.intellij.util.indexing.roots.kind.IndexableSetOrigin):Z -- a:getImmediateValueEx(com.intellij.util.indexing.roots.kind.IndexableSetOrigin):java.lang.Object -*f:com.intellij.util.indexing.FileTypeSpecificSubIndexer -- (java.lang.Object,com.intellij.openapi.fileTypes.FileType):V -- getFileType():com.intellij.openapi.fileTypes.FileType -- getSubIndexerType():java.lang.Object a:com.intellij.util.indexing.IdFilter - ():V - a:containsFileId(I):Z - s:getProjectIdFilter(com.intellij.openapi.project.Project,Z):com.intellij.util.indexing.IdFilter -e:com.intellij.util.indexing.IdFilter$FilterScopeType -- java.lang.Enum -- sf:OTHER:com.intellij.util.indexing.IdFilter$FilterScopeType -- sf:PROJECT:com.intellij.util.indexing.IdFilter$FilterScopeType -- sf:PROJECT_AND_LIBRARIES:com.intellij.util.indexing.IdFilter$FilterScopeType -- a:getId():java.lang.String -- s:valueOf(java.lang.String):com.intellij.util.indexing.IdFilter$FilterScopeType -- s:values():com.intellij.util.indexing.IdFilter$FilterScopeType[] a:com.intellij.util.indexing.IndexableSetContributor - sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName - ():V @@ -745,13 +656,6 @@ a:com.intellij.util.indexing.ScalarIndexExtension - sf:VOID_DATA_EXTERNALIZER:com.intellij.util.io.DataExternalizer - ():V - f:getValueExternalizer():com.intellij.util.io.DataExternalizer -a:com.intellij.util.indexing.SingleEntryCompositeIndexer -- com.intellij.util.indexing.SingleEntryIndexer -- com.intellij.util.indexing.CompositeDataIndexer -- p:(Z):V -- p:computeValue(com.intellij.util.indexing.FileContent):java.lang.Object -- pa:computeValue(com.intellij.util.indexing.FileContent,java.lang.Object):java.lang.Object -- f:map(com.intellij.util.indexing.FileContent,java.lang.Object):java.util.Map a:com.intellij.util.indexing.SingleEntryFileBasedIndexExtension - com.intellij.util.indexing.FileBasedIndexExtension - ():V @@ -768,23 +672,9 @@ a:com.intellij.util.indexing.SingleEntryIndexer *:com.intellij.util.indexing.hints.FileTypeIndexingHint - a:acceptsFileTypeFastPath(com.intellij.openapi.fileTypes.FileType):com.intellij.util.ThreeState - a:slowPathIfFileTypeHintUnsure(com.intellij.util.indexing.IndexedFile):Z -*:com.intellij.util.indexing.roots.IndexableFileScanner -- sf:EP_NAME:com.intellij.openapi.extensions.ExtensionPointName -- a:startSession(com.intellij.openapi.project.Project):com.intellij.util.indexing.roots.IndexableFileScanner$ScanSession -*:com.intellij.util.indexing.roots.IndexableFileScanner$IndexableFileVisitor -- a:visitFile(com.intellij.openapi.vfs.VirtualFile):V -- *:visitingFinished():V -*:com.intellij.util.indexing.roots.IndexableFileScanner$ScanSession -- a:createVisitor(com.intellij.util.indexing.roots.kind.IndexableSetOrigin):com.intellij.util.indexing.roots.IndexableFileScanner$IndexableFileVisitor *:com.intellij.util.indexing.roots.IndexableFilesContributor - a:getIndexableFiles(com.intellij.openapi.project.Project):java.util.List - a:getOwnFilePredicate(com.intellij.openapi.project.Project):java.util.function.Predicate -*f:com.intellij.util.indexing.roots.IndexableFilesDeduplicateFilter -- com.intellij.openapi.vfs.VirtualFileFilter -- accept(com.intellij.openapi.vfs.VirtualFile):Z -- s:create():com.intellij.util.indexing.roots.IndexableFilesDeduplicateFilter -- s:createDelegatingTo(com.intellij.util.indexing.roots.IndexableFilesDeduplicateFilter):com.intellij.util.indexing.roots.IndexableFilesDeduplicateFilter -- getNumberOfSkippedFiles():I *:com.intellij.util.indexing.roots.IndexableFilesIterator - a:getDebugName():java.lang.String - a:getIndexingProgressText():java.lang.String @@ -792,53 +682,12 @@ a:com.intellij.util.indexing.SingleEntryIndexer - a:getRootUrls(com.intellij.openapi.project.Project):java.util.Set - a:getRootsScanningProgressText():java.lang.String - a:iterateFiles(com.intellij.openapi.project.Project,com.intellij.openapi.roots.ContentIterator,com.intellij.openapi.vfs.VirtualFileFilter):Z -*:com.intellij.util.indexing.roots.IndexableIteratorPresentation -- s:create(java.lang.String,java.lang.String,java.lang.String):com.intellij.util.indexing.roots.IndexableIteratorPresentation -- a:getDebugName():java.lang.String -- a:getIndexingProgressText():java.lang.String -- a:getRootsScanningProgressText():java.lang.String -*:com.intellij.util.indexing.roots.LibraryIndexableFilesIterator -- com.intellij.util.indexing.roots.IndexableFilesIterator -- a:getOrigin():com.intellij.util.indexing.roots.kind.LibraryOrigin -*:com.intellij.util.indexing.roots.ModuleIndexableFilesIterator -- com.intellij.util.indexing.roots.IndexableFilesIterator -- a:getOrigin():com.intellij.util.indexing.roots.kind.ModuleRootOrigin -*:com.intellij.util.indexing.roots.ProjectIndexableFilesIterator -- com.intellij.util.indexing.roots.IndexableFilesIterator -- a:getOrigin():com.intellij.util.indexing.roots.kind.ProjectFileOrDirOrigin -*:com.intellij.util.indexing.roots.SyntheticLibraryIndexableFilesIterator -- com.intellij.util.indexing.roots.IndexableFilesIterator -- a:getOrigin():com.intellij.util.indexing.roots.kind.SyntheticLibraryOrigin *:com.intellij.util.indexing.roots.kind.ContentOrigin - com.intellij.util.indexing.roots.kind.IndexableSetOrigin -*:com.intellij.util.indexing.roots.kind.IndexableSetContributorOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getIndexableSetContributor():com.intellij.util.indexing.IndexableSetContributor -- a:getRootsToIndex():java.util.Set *:com.intellij.util.indexing.roots.kind.IndexableSetOrigin -*:com.intellij.util.indexing.roots.kind.LibraryOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getClassRoots():java.util.List -- a:getSourceRoots():java.util.List -*:com.intellij.util.indexing.roots.kind.ModuleContentOrigin -- com.intellij.util.indexing.roots.kind.ContentOrigin -- a:getModule():com.intellij.openapi.module.Module -*:com.intellij.util.indexing.roots.kind.ModuleRootOrigin -- com.intellij.util.indexing.roots.kind.ModuleContentOrigin -- a:getModule():com.intellij.openapi.module.Module -- a:getNonRecursiveRoots():java.util.List -- a:getRoots():java.util.List *:com.intellij.util.indexing.roots.kind.ProjectFileOrDirOrigin - com.intellij.util.indexing.roots.kind.IndexableSetOrigin - a:getFileOrDir():com.intellij.openapi.vfs.VirtualFile -*:com.intellij.util.indexing.roots.kind.SdkOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getRootsToIndex():java.util.Collection -- a:getSdk():com.intellij.openapi.projectRoots.Sdk -*:com.intellij.util.indexing.roots.kind.SyntheticLibraryOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getRootsToIndex():java.util.Collection -- a:getSyntheticLibrary():com.intellij.openapi.roots.SyntheticLibrary c:com.intellij.util.xml.XmlFileHeader - sf:EMPTY:com.intellij.util.xml.XmlFileHeader - (java.lang.String,java.lang.String,java.lang.String,java.lang.String):V diff --git a/platform/indexing-api/src/com/intellij/lang/cacheBuilder/CacheBuilderRegistry.java b/platform/indexing-api/src/com/intellij/lang/cacheBuilder/CacheBuilderRegistry.java index d4d7635fecb2..2a6a186d6d95 100644 --- a/platform/indexing-api/src/com/intellij/lang/cacheBuilder/CacheBuilderRegistry.java +++ b/platform/indexing-api/src/com/intellij/lang/cacheBuilder/CacheBuilderRegistry.java @@ -4,6 +4,7 @@ package com.intellij.lang.cacheBuilder; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileTypes.FileType; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,6 +13,7 @@ import org.jetbrains.annotations.Nullable; * are not based on a language. For language file types, the words scanner should be returned * from {@link com.intellij.lang.findUsages.FindUsagesProvider#getWordsScanner()}. */ +@Internal public abstract class CacheBuilderRegistry { public static CacheBuilderRegistry getInstance() { return ApplicationManager.getApplication().getService(CacheBuilderRegistry.class); diff --git a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolDeclarationSearchParameters.java b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolDeclarationSearchParameters.java index 401f295c7dca..725826e65085 100644 --- a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolDeclarationSearchParameters.java +++ b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolDeclarationSearchParameters.java @@ -4,9 +4,11 @@ package com.intellij.model.search; import com.intellij.model.Symbol; import com.intellij.model.psi.PsiSymbolDeclaration; import com.intellij.psi.search.SearchScope; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; -public interface PsiSymbolDeclarationSearchParameters extends SearchParameters { +@Internal +public interface PsiSymbolDeclarationSearchParameters extends SearchParameters { // todo: drop /** * @return target symbol to search for declarations diff --git a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearchParameters.java b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearchParameters.java index 4178288cceca..006b10ac955b 100644 --- a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearchParameters.java +++ b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearchParameters.java @@ -4,9 +4,11 @@ package com.intellij.model.search; import com.intellij.model.Symbol; import com.intellij.model.psi.PsiSymbolReference; import com.intellij.psi.search.SearchScope; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; -public interface PsiSymbolReferenceSearchParameters extends SearchParameters { +@Internal +public interface PsiSymbolReferenceSearchParameters extends SearchParameters { // todo: drop /** * @return target symbol to search for references diff --git a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearcher.java b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearcher.java index 7ebb11dcb027..5bf84566ee48 100644 --- a/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearcher.java +++ b/platform/indexing-api/src/com/intellij/model/search/PsiSymbolReferenceSearcher.java @@ -3,11 +3,13 @@ package com.intellij.model.search; import com.intellij.model.Symbol; import com.intellij.model.psi.PsiSymbolReference; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.ApiStatus.OverrideOnly; /** * Convenience interface for searchers providing additional queries to find {@link PsiSymbolReference}s by {@link Symbol}. */ @OverrideOnly -public interface PsiSymbolReferenceSearcher extends Searcher { +@Internal +public interface PsiSymbolReferenceSearcher extends Searcher { // todo: drop } diff --git a/platform/indexing-api/src/com/intellij/platform/indexing/BinaryFileSourceProvider.java b/platform/indexing-api/src/com/intellij/platform/indexing/BinaryFileSourceProvider.java index cfbff6bba697..48a6d8e5a8d6 100644 --- a/platform/indexing-api/src/com/intellij/platform/indexing/BinaryFileSourceProvider.java +++ b/platform/indexing-api/src/com/intellij/platform/indexing/BinaryFileSourceProvider.java @@ -5,6 +5,7 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.psi.PsiBinaryFile; import com.intellij.psi.PsiFile; import com.intellij.util.concurrency.annotations.RequiresReadLock; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -12,7 +13,9 @@ import org.jetbrains.annotations.Nullable; * In the situation when the identifiers are provided by the binary file (implemented {@link com.intellij.psi.impl.cache.impl.id.IdIndexer} * for binary file) which corresponds to some source file, this extension is used to find the original source file during the Find Usages. */ +@Internal public interface BinaryFileSourceProvider { + @Internal ExtensionPointName EP = new ExtensionPointName<>("com.intellij.binaryFileSourceProvider"); /** diff --git a/platform/indexing-api/src/com/intellij/psi/impl/cache/TodoCacheManager.java b/platform/indexing-api/src/com/intellij/psi/impl/cache/TodoCacheManager.java index b408f25289e8..86a9426e5903 100644 --- a/platform/indexing-api/src/com/intellij/psi/impl/cache/TodoCacheManager.java +++ b/platform/indexing-api/src/com/intellij/psi/impl/cache/TodoCacheManager.java @@ -7,8 +7,10 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.IndexPatternProvider; import com.intellij.util.Processor; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public interface TodoCacheManager { static TodoCacheManager getInstance(Project project) { diff --git a/platform/indexing-api/src/com/intellij/psi/search/FileTypeIndex.java b/platform/indexing-api/src/com/intellij/psi/search/FileTypeIndex.java index 28d0da5f8e74..c5a760abd229 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/FileTypeIndex.java +++ b/platform/indexing-api/src/com/intellij/psi/search/FileTypeIndex.java @@ -11,6 +11,7 @@ import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.ID; import com.intellij.util.messages.Topic; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +31,7 @@ public final class FileTypeIndex { * {@link #processFiles(FileType, Processor, GlobalSearchScope)} instead */ @Deprecated - @ApiStatus.Internal + @Internal public static final ID NAME = ID.create("filetypes"); @Nullable diff --git a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java index d415efbeb933..7d4590548b49 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java @@ -16,13 +16,15 @@ package com.intellij.psi.search; import com.intellij.psi.PsiReference; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -public interface PsiReferenceProcessor { +@Internal +public interface PsiReferenceProcessor { // todo: drop boolean execute(PsiReference element); class CollectElements implements PsiReferenceProcessor { diff --git a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java index 372e9ebe7ba2..6d12ff334371 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessorAdapter.java @@ -21,9 +21,11 @@ package com.intellij.psi.search; import com.intellij.openapi.application.ReadActionProcessor; import com.intellij.psi.PsiReference; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; -public class PsiReferenceProcessorAdapter extends ReadActionProcessor { +@Internal +public class PsiReferenceProcessorAdapter extends ReadActionProcessor { // todo: drop @NotNull private final PsiReferenceProcessor myProcessor; diff --git a/platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java index 853f1e24589b..e28bef0c06e9 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiSearchHelper.java @@ -194,6 +194,7 @@ public interface PsiSearchHelper { boolean caseSensitive, boolean processInjectedPsi); + @ApiStatus.Internal default boolean hasIdentifierInFile(@NotNull PsiFile file, @NotNull String name) { throw new UnsupportedOperationException(); } diff --git a/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java b/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java index a3d11e64ed26..2eaea809d2e3 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java +++ b/platform/indexing-api/src/com/intellij/psi/search/TodoAttributes.java @@ -7,6 +7,7 @@ import com.intellij.ui.IconManager; import com.intellij.ui.PlatformIcons; import com.intellij.util.ObjectUtils; import org.jdom.Element; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -24,7 +25,8 @@ public final class TodoAttributes implements Cloneable { private static final @NonNls String ELEMENT_OPTION = "option"; private static final @NonNls String USE_CUSTOM_COLORS_ATT = "useCustomColors"; - public TodoAttributes(@NotNull Element element, @NotNull TextAttributes defaultTodoAttributes) { + @Internal + TodoAttributes(@NotNull Element element, @NotNull TextAttributes defaultTodoAttributes) { String icon = element.getAttributeValue(ATTRIBUTE_ICON, ICON_DEFAULT); IconManager iconManager = IconManager.getInstance(); @@ -45,11 +47,13 @@ public final class TodoAttributes implements Cloneable { myTextAttributes = myShouldUseCustomColors && element.getChild(ELEMENT_OPTION) != null ? new TextAttributes(element) : defaultTodoAttributes; } + @Internal public TodoAttributes(@NotNull Icon icon, @NotNull TextAttributes textAttributes) { myIcon = icon; myTextAttributes = textAttributes; } + @Internal public TodoAttributes(@NotNull TextAttributes textAttributes){ myTextAttributes = textAttributes; } diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/IndexPatternSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/IndexPatternSearch.java index bde4d17ad88a..4722b0b116e8 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/IndexPatternSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/IndexPatternSearch.java @@ -11,6 +11,7 @@ import com.intellij.psi.search.IndexPatternProvider; import com.intellij.util.Processor; import com.intellij.util.Query; import com.intellij.util.QueryExecutor; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; /** @@ -19,6 +20,7 @@ import org.jetbrains.annotations.NotNull; * @see IndexPatternProvider * @see com.intellij.psi.search.PsiTodoSearchHelper#processFilesWithTodoItems(Processor) */ +@Internal public abstract class IndexPatternSearch extends ExtensibleQueryFactory { public static final ExtensionPointName> EP_NAME = ExtensionPointName.create("com.intellij.indexPatternSearch"); private static IndexPatternSearch ourInstance; diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java index c96f66c7d71c..3869f7c62f25 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferenceDescriptor.java @@ -7,8 +7,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; import com.intellij.util.Function; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public final class ReferenceDescriptor { @NotNull public static final Function MAPPER = psiReference -> { diff --git a/platform/indexing-api/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfo.java b/platform/indexing-api/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfo.java index ad505b5807d0..37e63eb28a77 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfo.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfo.java @@ -5,12 +5,18 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.project.RootsChangeRescanningInfo; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.libraries.Library; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Experimental; +import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.ApiStatus.NonExtendable; import org.jetbrains.annotations.NotNull; -@ApiStatus.NonExtendable -@ApiStatus.Experimental -public abstract class BuildableRootsChangeRescanningInfo { +@NonExtendable +@Experimental +public abstract class BuildableRootsChangeRescanningInfo implements RootsChangeRescanningInfo { + + @Internal + public BuildableRootsChangeRescanningInfo() { + } @NotNull public static BuildableRootsChangeRescanningInfo newInstance() { diff --git a/platform/indexing-api/src/com/intellij/util/indexing/CustomInputsIndexFileBasedIndexExtension.java b/platform/indexing-api/src/com/intellij/util/indexing/CustomInputsIndexFileBasedIndexExtension.java index 2815a7fd606b..ef3499c1b530 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/CustomInputsIndexFileBasedIndexExtension.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/CustomInputsIndexFileBasedIndexExtension.java @@ -2,12 +2,14 @@ package com.intellij.util.indexing; import com.intellij.util.io.DataExternalizer; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.ApiStatus.OverrideOnly; import org.jetbrains.annotations.NotNull; import java.util.Collection; -@ApiStatus.OverrideOnly +@OverrideOnly +@Internal public interface CustomInputsIndexFileBasedIndexExtension { @NotNull DataExternalizer> createExternalizer(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java index 63bf044bad60..f844323e30d5 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndex.java @@ -21,6 +21,7 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.Processor; import com.intellij.util.SystemProperties; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,9 +44,11 @@ public abstract class FileBasedIndex { * @return the file which the current thread is writing evaluated values of indexes right now, * or {@code null} if current thread isn't writing index values. */ + @Internal @Nullable public abstract IndexWritingFile getFileWritingCurrentlyIndexes(); + @Internal public static class IndexWritingFile { public final int fileId; @@ -54,12 +57,12 @@ public abstract class FileBasedIndex { } } - @ApiStatus.Internal + @Internal public void registerProjectFileSets(@NotNull Project project) { throw new UnsupportedOperationException(); } - @ApiStatus.Internal + @Internal public void onProjectClosing(@NotNull Project project) { throw new UnsupportedOperationException(); } @@ -67,13 +70,13 @@ public abstract class FileBasedIndex { /** * Should be called only in dumb mode and only in a read action */ - @ApiStatus.Internal + @Internal @Nullable public DumbModeAccessType getCurrentDumbModeAccessType() { throw new UnsupportedOperationException(); } - @ApiStatus.Internal + @Internal public @NotNull Processor inheritCurrentDumbAccessType(@NotNull Processor processor) { return processor; } @@ -178,7 +181,7 @@ public abstract class FileBasedIndex { * DO NOT CALL DIRECTLY IN CLIENT CODE * The method is internal to indexing engine end is called internally. The method is public due to implementation details */ - @ApiStatus.Internal + @Internal public abstract void ensureUpToDate(@NotNull ID indexId, @Nullable Project project, @Nullable GlobalSearchScope filter); /** @@ -282,7 +285,7 @@ public abstract class FileBasedIndex { } @ApiStatus.Experimental - public static class AllKeysQuery { + public static final class AllKeysQuery { @NotNull private final ID indexId; @NotNull @@ -365,34 +368,34 @@ public abstract class FileBasedIndex { void registerFileTypesUsedForIndexing(@NotNull Consumer fileTypeSink); } - @ApiStatus.Internal + @Internal public static final boolean ourSnapshotMappingsEnabled = SystemProperties.getBooleanProperty("idea.index.snapshot.mappings.enabled", false); /** * @deprecated Is always true */ @Deprecated(forRemoval = true) - @ApiStatus.Internal + @Internal public static boolean isIndexAccessDuringDumbModeEnabled() { return true; } - @ApiStatus.Internal + @Internal public static final boolean USE_IN_MEMORY_INDEX = Boolean.getBoolean("idea.use.in.memory.file.based.index"); - @ApiStatus.Internal + @Internal public static final boolean IGNORE_PLAIN_TEXT_FILES = Boolean.getBoolean("idea.ignore.plain.text.indexing"); - @ApiStatus.Internal + @Internal public static boolean isCompositeIndexer(@NotNull DataIndexer indexer) { return indexer instanceof CompositeDataIndexer && !USE_IN_MEMORY_INDEX; } - @ApiStatus.Internal + @Internal public void loadIndexes() { } - @ApiStatus.Internal + @Internal public static class RebuildRequestedByUserAction extends Throwable { private final @Nullable PluginId myRequestorPluginId; diff --git a/platform/indexing-api/src/com/intellij/util/indexing/FilePropertyPusherEx.java b/platform/indexing-api/src/com/intellij/util/indexing/FilePropertyPusherEx.java index 2642b7c25311..2ffe1be91880 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/FilePropertyPusherEx.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/FilePropertyPusherEx.java @@ -4,11 +4,11 @@ package com.intellij.util.indexing; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.impl.FilePropertyPusher; import com.intellij.util.indexing.roots.kind.IndexableSetOrigin; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -@ApiStatus.Experimental +@Internal public interface FilePropertyPusherEx extends FilePropertyPusher { boolean acceptsOrigin(@NotNull Project project, @NotNull IndexableSetOrigin origin); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/FileTypeSpecificSubIndexer.java b/platform/indexing-api/src/com/intellij/util/indexing/FileTypeSpecificSubIndexer.java index 5a9e4445680f..bebc928551b8 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/FileTypeSpecificSubIndexer.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/FileTypeSpecificSubIndexer.java @@ -2,10 +2,12 @@ package com.intellij.util.indexing; import com.intellij.openapi.fileTypes.FileType; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Experimental; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; -@ApiStatus.Experimental +@Experimental +@Internal public final class FileTypeSpecificSubIndexer { @NotNull private final SubIndexerType mySubIndexerType; diff --git a/platform/indexing-api/src/com/intellij/util/indexing/IdFilter.java b/platform/indexing-api/src/com/intellij/util/indexing/IdFilter.java index 2fb2f055f6dc..fa85397d67cc 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/IdFilter.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/IdFilter.java @@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFileWithId; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -38,6 +38,7 @@ public abstract class IdFilter { private static final Key> INSIDE_PROJECT = Key.create("INSIDE_PROJECT"); private static final Key> OUTSIDE_PROJECT = Key.create("OUTSIDE_PROJECT"); + @Internal public enum FilterScopeType { OTHER { @Override @@ -110,7 +111,7 @@ public abstract class IdFilter { public abstract boolean containsFileId(int id); - @ApiStatus.Internal + @Internal @NotNull public FilterScopeType getFilteringScopeType() { return FilterScopeType.OTHER; diff --git a/platform/indexing-api/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java b/platform/indexing-api/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java index c7a95b88c57a..1c3c52c69303 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/SingleEntryCompositeIndexer.java @@ -1,14 +1,16 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.indexing; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.ApiStatus.OverrideOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Map; import java.util.Objects; -@ApiStatus.OverrideOnly +@Internal +@OverrideOnly public abstract class SingleEntryCompositeIndexer extends SingleEntryIndexer implements CompositeDataIndexer { protected SingleEntryCompositeIndexer(boolean acceptNullValues) { super(acceptNullValues); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/hints/FileTypeIndexingHint.kt b/platform/indexing-api/src/com/intellij/util/indexing/hints/FileTypeIndexingHint.kt index b2d649974b41..06b1c998d8fc 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/hints/FileTypeIndexingHint.kt +++ b/platform/indexing-api/src/com/intellij/util/indexing/hints/FileTypeIndexingHint.kt @@ -3,11 +3,11 @@ package com.intellij.util.indexing.hints import com.intellij.openapi.fileTypes.FileType import com.intellij.util.ThreeState -import com.intellij.util.indexing.FileBasedIndex import com.intellij.util.indexing.FileBasedIndex.InputFilter import com.intellij.util.indexing.FileBasedIndex.ProjectSpecificInputFilter import com.intellij.util.indexing.IndexedFile import org.jetbrains.annotations.ApiStatus.Experimental +import org.jetbrains.annotations.ApiStatus.OverrideOnly /** * **TL;DR;** @@ -83,6 +83,7 @@ import org.jetbrains.annotations.ApiStatus.Experimental * @see com.intellij.psi.LanguageSubstitutor */ @Experimental +@OverrideOnly interface FileTypeIndexingHint { fun acceptsFileTypeFastPath(fileType: FileType): ThreeState diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFileScanner.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFileScanner.java index 4e28830aaf60..160682da66ca 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFileScanner.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFileScanner.java @@ -6,6 +6,8 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.indexing.roots.kind.IndexableSetOrigin; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; +import org.jetbrains.annotations.ApiStatus.OverrideOnly; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -15,6 +17,8 @@ import org.jetbrains.annotations.Nullable; * For example, during the project startup, all content files/directories are scanned. * Scanned files/directories are under content roots and not excluded or ignored. */ +@Internal +@OverrideOnly public interface IndexableFileScanner { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.projectFileScanner"); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFilesDeduplicateFilter.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFilesDeduplicateFilter.java index 8015a8f399d5..caa5437fa420 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFilesDeduplicateFilter.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableFilesDeduplicateFilter.java @@ -5,7 +5,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileFilter; import com.intellij.openapi.vfs.VirtualFileWithId; import com.intellij.util.containers.ConcurrentBitSet; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; *
* This filter is intended to be used in a concurrent environment, where two {@link IndexableFilesIterator iterators} iterate files in different threads. */ -@ApiStatus.Experimental +@Internal public final class IndexableFilesDeduplicateFilter implements VirtualFileFilter { private final @Nullable IndexableFilesDeduplicateFilter myDelegate; diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableIteratorPresentation.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableIteratorPresentation.java index 720855ac5f70..13047702d468 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableIteratorPresentation.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/IndexableIteratorPresentation.java @@ -2,9 +2,11 @@ package com.intellij.util.indexing.roots; import com.intellij.openapi.util.NlsContexts; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; +@Internal public interface IndexableIteratorPresentation { /** * Presentable name that can be shown in logs and used for debugging purposes. diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIterator.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIterator.java index 634584b5f372..f107732b1642 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIterator.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIterator.java @@ -2,8 +2,10 @@ package com.intellij.util.indexing.roots; import com.intellij.util.indexing.roots.kind.LibraryOrigin; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public interface LibraryIndexableFilesIterator extends IndexableFilesIterator { @Override @NotNull LibraryOrigin getOrigin(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/ModuleIndexableFilesIterator.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/ModuleIndexableFilesIterator.java index 49f7c5dd967a..432ab646b381 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/ModuleIndexableFilesIterator.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/ModuleIndexableFilesIterator.java @@ -2,8 +2,10 @@ package com.intellij.util.indexing.roots; import com.intellij.util.indexing.roots.kind.ModuleRootOrigin; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public interface ModuleIndexableFilesIterator extends IndexableFilesIterator { @Override @NotNull ModuleRootOrigin getOrigin(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/ProjectIndexableFilesIterator.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/ProjectIndexableFilesIterator.java index b29706705cb8..43113a67789f 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/ProjectIndexableFilesIterator.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/ProjectIndexableFilesIterator.java @@ -2,8 +2,10 @@ package com.intellij.util.indexing.roots; import com.intellij.util.indexing.roots.kind.ProjectFileOrDirOrigin; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; +@Internal public interface ProjectIndexableFilesIterator extends IndexableFilesIterator { @Override @NotNull ProjectFileOrDirOrigin getOrigin(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/SyntheticLibraryIndexableFilesIterator.java b/platform/indexing-api/src/com/intellij/util/indexing/roots/SyntheticLibraryIndexableFilesIterator.java index d75fc0c6d14f..5bd9f53ef0e9 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/SyntheticLibraryIndexableFilesIterator.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/SyntheticLibraryIndexableFilesIterator.java @@ -1,12 +1,13 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.util.indexing.roots; -import com.intellij.openapi.roots.SyntheticLibrary; import com.intellij.util.indexing.roots.kind.SyntheticLibraryOrigin; -import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.ApiStatus.Experimental; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; -@ApiStatus.Experimental +@Internal +@Experimental public interface SyntheticLibraryIndexableFilesIterator extends IndexableFilesIterator { @Override @NotNull SyntheticLibraryOrigin getOrigin(); diff --git a/platform/indexing-api/src/com/intellij/util/indexing/roots/kind/indexableSetOriginsApi.kt b/platform/indexing-api/src/com/intellij/util/indexing/roots/kind/indexableSetOriginsApi.kt index fd5133bfe48f..a979de7db33b 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/roots/kind/indexableSetOriginsApi.kt +++ b/platform/indexing-api/src/com/intellij/util/indexing/roots/kind/indexableSetOriginsApi.kt @@ -6,6 +6,7 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.SyntheticLibrary import com.intellij.openapi.vfs.VirtualFile import com.intellij.util.indexing.IndexableSetContributor +import org.jetbrains.annotations.ApiStatus.Internal /** * Represents an origin of [com.intellij.util.indexing.roots.IndexableFilesIterator]. @@ -20,31 +21,37 @@ interface ContentOrigin : IndexableSetOrigin /** * Marker interface for all origins of roots from project content tied to certain module */ +@Internal interface ModuleContentOrigin : ContentOrigin { val module: Module } +@Internal interface ModuleRootOrigin : ModuleContentOrigin { override val module: Module val roots: List? val nonRecursiveRoots: List? } +@Internal interface LibraryOrigin : IndexableSetOrigin { val classRoots: List val sourceRoots: List } +@Internal interface SyntheticLibraryOrigin : IndexableSetOrigin { val syntheticLibrary: SyntheticLibrary val rootsToIndex: Collection } +@Internal interface SdkOrigin : IndexableSetOrigin { val sdk: Sdk val rootsToIndex: Collection } +@Internal interface IndexableSetContributorOrigin : IndexableSetOrigin { val indexableSetContributor: IndexableSetContributor val rootsToIndex: Set diff --git a/platform/indexing-impl/api-dump-unreviewed.txt b/platform/indexing-impl/api-dump-unreviewed.txt index 52d3993672e4..b0d28db3fa8d 100644 --- a/platform/indexing-impl/api-dump-unreviewed.txt +++ b/platform/indexing-impl/api-dump-unreviewed.txt @@ -1,6 +1,5 @@ f:com.intellij.find.ngrams.TrigramIndex - com.intellij.util.indexing.ScalarIndexExtension -- com.intellij.util.indexing.CustomInputsIndexFileBasedIndexExtension - sf:INDEX_ID:com.intellij.util.indexing.ID - ():V - createExternalizer():com.intellij.util.io.DataExternalizer diff --git a/platform/indexing-impl/src/com/intellij/model/search/impl/SearchServiceImpl.kt b/platform/indexing-impl/src/com/intellij/model/search/impl/SearchServiceImpl.kt index 1708dc85345c..ecffd2f26fe3 100644 --- a/platform/indexing-impl/src/com/intellij/model/search/impl/SearchServiceImpl.kt +++ b/platform/indexing-impl/src/com/intellij/model/search/impl/SearchServiceImpl.kt @@ -58,3 +58,4 @@ class SearchServiceImpl : SearchService { } } } + diff --git a/platform/lang-impl/api-dump-unreviewed.txt b/platform/lang-impl/api-dump-unreviewed.txt index 27a1722effb1..39e2340f45d1 100644 --- a/platform/lang-impl/api-dump-unreviewed.txt +++ b/platform/lang-impl/api-dump-unreviewed.txt @@ -24113,14 +24113,12 @@ f:com.intellij.psi.impl.PsiDocumentManagerImpl - isDocumentBlockedByPsi(com.intellij.openapi.editor.Document):Z - reparseFiles(java.util.Collection,Z):V f:com.intellij.psi.impl.cache.impl.IndexTodoCacheManagerImpl -- com.intellij.psi.impl.cache.TodoCacheManager - (com.intellij.openapi.project.Project):V - getTodoCount(com.intellij.openapi.vfs.VirtualFile,com.intellij.psi.search.IndexPattern):I - getTodoCount(com.intellij.openapi.vfs.VirtualFile,com.intellij.psi.search.IndexPatternProvider):I - s:getTodoMap(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile):java.util.Map - processFilesWithTodoItems(com.intellij.util.Processor):Z f:com.intellij.psi.impl.cache.impl.id.IdIndexImpl -- com.intellij.util.indexing.CustomInputsIndexFileBasedIndexExtension - com.intellij.util.indexing.FileBasedIndexExtension - ():V - createExternalizer():com.intellij.util.io.DataExternalizer @@ -28505,7 +28503,6 @@ a:com.intellij.util.indexing.BuildableRootsChangeRescanningInfoEx - a:addWorkspaceEntity(com.intellij.platform.workspace.storage.WorkspaceEntity):com.intellij.util.indexing.BuildableRootsChangeRescanningInfoEx f:com.intellij.util.indexing.BuildableRootsChangeRescanningInfoImpl - com.intellij.util.indexing.BuildableRootsChangeRescanningInfoEx -- ():V - addInheritedSdk():com.intellij.util.indexing.BuildableRootsChangeRescanningInfo - addLibrary(com.intellij.openapi.roots.libraries.Library):com.intellij.util.indexing.BuildableRootsChangeRescanningInfo - addModule(com.intellij.openapi.module.Module):com.intellij.util.indexing.BuildableRootsChangeRescanningInfo @@ -28521,9 +28518,6 @@ f:com.intellij.util.indexing.BuildableRootsChangeRescanningInfoImpl *:com.intellij.util.indexing.CustomizingIndexingPresentationContributor - com.intellij.workspaceModel.core.fileIndex.WorkspaceFileIndexContributor - a:customizeIteratorPresentation(com.intellij.platform.workspace.storage.WorkspaceEntity):com.intellij.util.indexing.roots.IndexableIteratorPresentation -f:com.intellij.util.indexing.DirtyFilesOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- sf:INSTANCE:com.intellij.util.indexing.DirtyFilesOrigin a:com.intellij.util.indexing.DocumentContent - a:getModificationStamp():J - a:getText():java.lang.CharSequence @@ -28534,7 +28528,6 @@ f:com.intellij.util.indexing.DumbModeWhileScanningSubscriber f:com.intellij.util.indexing.FileBasedIndexImpl - com.intellij.util.indexing.FileBasedIndex - f:myWriteLock:java.util.concurrent.locks.Lock -- (kotlinx.coroutines.CoroutineScope):V - belongsToIndexableFiles(com.intellij.openapi.vfs.VirtualFile):Z - belongsToProjectIndexableFiles(com.intellij.openapi.vfs.VirtualFile,com.intellij.openapi.project.Project):Z - cleanupForNextTest():V @@ -28550,7 +28543,6 @@ f:com.intellij.util.indexing.FileBasedIndexImpl - getContainingProjects(com.intellij.openapi.vfs.VirtualFile):java.util.Set - getContentDependentIndexes():java.util.Collection - getFileBeingCurrentlyIndexed():com.intellij.openapi.vfs.VirtualFile -- getFileWritingCurrentlyIndexes():com.intellij.util.indexing.FileBasedIndex$IndexWritingFile - getIndex(com.intellij.util.indexing.ID):com.intellij.util.indexing.UpdatableIndex - getIndexableFilesFilterHolder():com.intellij.util.indexing.projectFilter.ProjectIndexableFilesFilterHolder - getLogger():com.intellij.openapi.diagnostic.Logger @@ -29204,23 +29196,6 @@ f:com.intellij.util.indexing.projectFilter.ProjectIndexableFilesFilterHolderKt *f:com.intellij.util.indexing.roots.IndexingRootsCollectionUtil - sf:selectRootVirtualFileUrls(java.util.Collection):java.util.List - sf:selectRootVirtualFiles(java.util.Collection):java.util.List -*f:com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl -- com.intellij.util.indexing.roots.LibraryIndexableFilesIterator -- *sf:Companion:com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl$Companion -- sf:createIterator(com.intellij.openapi.roots.libraries.Library,java.util.Collection,java.util.Collection):com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl -- sf:createIteratorList(com.intellij.openapi.roots.libraries.Library):java.util.List -- getDebugName():java.lang.String -- getIndexingProgressText():java.lang.String -- getOrigin():com.intellij.util.indexing.roots.kind.LibraryOrigin -- getRootUrls(com.intellij.openapi.project.Project):java.util.Set -- getRootsScanningProgressText():java.lang.String -- iterateFiles(com.intellij.openapi.project.Project,com.intellij.openapi.roots.ContentIterator,com.intellij.openapi.vfs.VirtualFileFilter):Z -*f:com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl$Companion -- f:collectFiles(com.intellij.openapi.roots.libraries.Library,com.intellij.openapi.roots.OrderRootType,java.util.Collection):java.util.List -- bs:collectFiles$default(com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl$Companion,com.intellij.openapi.roots.libraries.Library,com.intellij.openapi.roots.OrderRootType,java.util.Collection,I,java.lang.Object):java.util.List -- f:createIterator(com.intellij.openapi.roots.libraries.Library,java.util.Collection,java.util.Collection):com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl -- bs:createIterator$default(com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl$Companion,com.intellij.openapi.roots.libraries.Library,java.util.Collection,java.util.Collection,I,java.lang.Object):com.intellij.util.indexing.roots.LibraryIndexableFilesIteratorImpl -- f:createIteratorList(com.intellij.openapi.roots.libraries.Library):java.util.List *f:com.intellij.util.indexing.roots.ModuleAwareContentEntityIteratorImpl - com.intellij.util.indexing.roots.RootHolderIteratorBase - (com.intellij.openapi.module.Module,com.intellij.platform.workspace.storage.EntityPointer,com.intellij.util.indexing.roots.origin.IndexingRootHolder,com.intellij.util.indexing.roots.IndexableIteratorPresentation):V @@ -29250,17 +29225,8 @@ f:com.intellij.util.indexing.projectFilter.ProjectIndexableFilesFilterHolderKt - shouldIndexSeparateRoots():Z *f:com.intellij.util.indexing.roots.ModuleIndexableFilesPolicy$Companion - f:getInstance():com.intellij.util.indexing.roots.ModuleIndexableFilesPolicy -*f:com.intellij.util.indexing.roots.PartialAdditionalLibraryIndexableSetOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- (java.util.Collection):V -- f:component1():java.util.Collection -- f:copy(java.util.Collection):com.intellij.util.indexing.roots.PartialAdditionalLibraryIndexableSetOrigin -- bs:copy$default(com.intellij.util.indexing.roots.PartialAdditionalLibraryIndexableSetOrigin,java.util.Collection,I,java.lang.Object):com.intellij.util.indexing.roots.PartialAdditionalLibraryIndexableSetOrigin -- equals(java.lang.Object):Z -- f:getRootsToIndex():java.util.Collection -- hashCode():I *f:com.intellij.util.indexing.roots.ProjectIndexableFilesIteratorImpl -- com.intellij.util.indexing.roots.ProjectIndexableFilesIterator +- com.intellij.util.indexing.roots.IndexableFilesIterator - (com.intellij.openapi.vfs.VirtualFile):V - getDebugName():java.lang.String - getIndexingProgressText():java.lang.String @@ -29333,18 +29299,6 @@ f:com.intellij.util.indexing.roots.builders.SyntheticLibraryIndexableIteratorHan - ():V - accepts(com.intellij.util.indexing.roots.IndexableEntityProvider$IndexableIteratorBuilder):Z - instantiate(java.util.Collection,com.intellij.openapi.project.Project,com.intellij.platform.workspace.storage.EntityStorage):java.util.List -com.intellij.util.indexing.roots.origin.CustomKindEntityOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getReference():com.intellij.platform.workspace.storage.EntityPointer -- a:getRootHolder():com.intellij.util.indexing.roots.origin.IndexingRootHolder -com.intellij.util.indexing.roots.origin.ExternalEntityOrigin -- com.intellij.util.indexing.roots.kind.IndexableSetOrigin -- a:getReference():com.intellij.platform.workspace.storage.EntityPointer -- a:getRootHolder():com.intellij.util.indexing.roots.origin.IndexingSourceRootHolder -com.intellij.util.indexing.roots.origin.GenericContentEntityOrigin -- com.intellij.util.indexing.roots.kind.ContentOrigin -- a:getReference():com.intellij.platform.workspace.storage.EntityPointer -- a:getRootHolder():com.intellij.util.indexing.roots.origin.IndexingRootHolder com.intellij.util.indexing.roots.origin.IndexingRootHolder - sf:Companion:com.intellij.util.indexing.roots.origin.IndexingRootHolder$Companion - a:getDebugDescription():java.lang.String @@ -29393,10 +29347,6 @@ com.intellij.util.indexing.roots.origin.IndexingUrlSourceRootHolder f:com.intellij.util.indexing.roots.origin.IndexingUrlSourceRootHolder$Companion - f:fromUrls(java.util.List,java.util.List):com.intellij.util.indexing.roots.origin.IndexingUrlSourceRootHolder - f:fromUrls(java.util.List,java.util.List,java.util.List,java.util.List):com.intellij.util.indexing.roots.origin.IndexingUrlSourceRootHolder -com.intellij.util.indexing.roots.origin.ModuleAwareContentEntityOrigin -- com.intellij.util.indexing.roots.kind.ModuleContentOrigin -- a:getReference():com.intellij.platform.workspace.storage.EntityPointer -- a:getRootHolder():com.intellij.util.indexing.roots.origin.IndexingRootHolder f:com.intellij.util.indexing.snapshot.EmptyValueContainer - com.intellij.util.indexing.ValueContainer - sf:INSTANCE:com.intellij.util.indexing.snapshot.EmptyValueContainer diff --git a/platform/lang-impl/exposed-private-api.txt b/platform/lang-impl/exposed-private-api.txt index c1a037a64bc7..03d951f45645 100644 --- a/platform/lang-impl/exposed-private-api.txt +++ b/platform/lang-impl/exposed-private-api.txt @@ -85,6 +85,11 @@ com/intellij/util/indexing/diagnostic/dto/JsonIndexingActivityDiagnostic com/intellij/util/indexing/events/FileIndexingRequest com/intellij/util/indexing/projectFilter/ProjectIndexableFilesFilterHolder com/intellij/util/indexing/roots/IndexableEntityProvider$IndexableIteratorBuilder +com/intellij/util/indexing/roots/IndexableIteratorPresentation +com/intellij/util/indexing/roots/origin/CustomKindEntityOrigin +com/intellij/util/indexing/roots/origin/ExternalEntityOrigin +com/intellij/util/indexing/roots/origin/GenericContentEntityOrigin +com/intellij/util/indexing/roots/origin/ModuleAwareContentEntityOrigin com/intellij/util/indexing/storage/VfsAwareIndexStorageLayout com/intellij/util/io/SimpleStringPersistentEnumerator com/intellij/util/io/StorageLockContext diff --git a/platform/lang-impl/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfoImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfoImpl.java index 0bb9a06e15a2..2acd49aff49c 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfoImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/BuildableRootsChangeRescanningInfoImpl.java @@ -13,6 +13,7 @@ import com.intellij.util.SmartList; import com.intellij.util.containers.SmartHashSet; import com.intellij.workspaceModel.ide.impl.legacyBridge.library.LibraryBridge; import kotlin.Pair; +import org.jetbrains.annotations.ApiStatus.Internal; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -25,6 +26,10 @@ public final class BuildableRootsChangeRescanningInfoImpl extends BuildableRoots private final List libraries = new SmartList<>(); private final List entities = new SmartList<>(); + @Internal + public BuildableRootsChangeRescanningInfoImpl() { + } + @Override @NotNull public BuildableRootsChangeRescanningInfo addModule(@NotNull com.intellij.openapi.module.Module module) { diff --git a/platform/lang-impl/src/com/intellij/util/indexing/DirtyFilesIndexableFilesIterator.kt b/platform/lang-impl/src/com/intellij/util/indexing/DirtyFilesIndexableFilesIterator.kt index a35514fd7729..7527a092873b 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/DirtyFilesIndexableFilesIterator.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/DirtyFilesIndexableFilesIterator.kt @@ -10,9 +10,9 @@ import com.intellij.util.indexing.roots.IndexableFilesIterationMethods import com.intellij.util.indexing.roots.IndexableFilesIterator import com.intellij.util.indexing.roots.kind.IndexableSetOrigin import kotlinx.coroutines.Deferred -import org.jetbrains.annotations.ApiStatus +import org.jetbrains.annotations.ApiStatus.Internal -@ApiStatus.Internal +@Internal class DirtyFilesIndexableFilesIterator(private val dirtyFileIndexesCleanupFuture: Deferred>, private val fromOrphanQueue: Boolean) : IndexableFilesIterator { override fun getDebugName(): String = "dirty files iterator (from orphan queue=$fromOrphanQueue)" @@ -34,4 +34,5 @@ class DirtyFilesIndexableFilesIterator(private val dirtyFileIndexesCleanupFuture } } +@Internal object DirtyFilesOrigin : IndexableSetOrigin \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index 65511d6131ea..0aaa302288d6 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -175,6 +175,7 @@ public final class FileBasedIndexImpl extends FileBasedIndexEx { myRegisteredIndexes = null; } + @ApiStatus.Internal public FileBasedIndexImpl(@NotNull CoroutineScope coroutineScope) { this.coroutineScope = coroutineScope; ReadWriteLock lock = new ReentrantReadWriteLock(); @@ -1720,6 +1721,7 @@ public final class FileBasedIndexImpl extends FileBasedIndexEx { } @Override + @ApiStatus.Internal public @Nullable IndexWritingFile getFileWritingCurrentlyIndexes() { return ourWritingIndexFile.get(); } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/roots/AdditionalLibraryIndexableAddedFilesIterator.kt b/platform/lang-impl/src/com/intellij/util/indexing/roots/AdditionalLibraryIndexableAddedFilesIterator.kt index 33fd4ddce442..8094368b7729 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/roots/AdditionalLibraryIndexableAddedFilesIterator.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/roots/AdditionalLibraryIndexableAddedFilesIterator.kt @@ -8,6 +8,7 @@ import com.intellij.openapi.vfs.VirtualFileFilter import com.intellij.util.indexing.IndexingBundle import com.intellij.util.indexing.roots.IndexableFilesIterationMethods.iterateRoots import com.intellij.util.indexing.roots.kind.IndexableSetOrigin +import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.Nls internal class AdditionalLibraryIndexableAddedFilesIterator(val presentableLibraryName: @Nls String?, @@ -39,4 +40,5 @@ internal class AdditionalLibraryIndexableAddedFilesIterator(val presentableLibra override fun getRootUrls(project: Project): Set = rootsToIndex.map { it.url }.toSet() } +@Internal data class PartialAdditionalLibraryIndexableSetOrigin(val rootsToIndex: Collection) : IndexableSetOrigin \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIteratorImpl.kt b/platform/lang-impl/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIteratorImpl.kt index a3fe18c4c384..6cf48c94c1c7 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIteratorImpl.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/roots/LibraryIndexableFilesIteratorImpl.kt @@ -16,8 +16,10 @@ import com.intellij.util.concurrency.annotations.RequiresReadLock import com.intellij.util.indexing.IndexingBundle import com.intellij.util.indexing.roots.kind.LibraryOrigin import com.intellij.util.indexing.roots.origin.LibraryOriginImpl +import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.Nls +@Internal class LibraryIndexableFilesIteratorImpl private constructor(private val libraryName: @NlsSafe String?, private val presentableLibraryName: @Nls String, diff --git a/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/indexableSetOrigins.kt b/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/indexableSetOrigins.kt index fb4e2bb98b5a..2a8c43b425ee 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/indexableSetOrigins.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/indexableSetOrigins.kt @@ -9,40 +9,52 @@ import com.intellij.platform.workspace.storage.EntityPointer import com.intellij.util.containers.ContainerUtil import com.intellij.util.indexing.IndexableSetContributor import com.intellij.util.indexing.roots.kind.* +import org.jetbrains.annotations.ApiStatus.Internal import org.jetbrains.annotations.NonNls import kotlin.math.min +@Internal internal data class ModuleRootOriginImpl(override val module: Module, override val roots: List?, override val nonRecursiveRoots: List?) : ModuleRootOrigin +@Internal internal data class LibraryOriginImpl(override val classRoots: List, override val sourceRoots: List) : LibraryOrigin +@Internal internal data class SyntheticLibraryOriginImpl(override val syntheticLibrary: SyntheticLibrary, override val rootsToIndex: Collection) : SyntheticLibraryOrigin +@Internal internal data class SdkOriginImpl(override val sdk: Sdk, override val rootsToIndex: Collection) : SdkOrigin +@Internal internal data class IndexableSetContributorOriginImpl(override val indexableSetContributor: IndexableSetContributor, override val rootsToIndex: Set) : IndexableSetContributorOrigin +@Internal internal data class ProjectFileOrDirOriginImpl(override val fileOrDir: VirtualFile) : ProjectFileOrDirOrigin +@Internal internal data class ModuleAwareContentEntityOriginImpl(override val module: Module, override val reference: EntityPointer<*>, override val rootHolder: IndexingRootHolder) : ModuleAwareContentEntityOrigin +@Internal internal data class GenericContentEntityOriginImpl(override val reference: EntityPointer<*>, override val rootHolder: IndexingRootHolder) : GenericContentEntityOrigin +@Internal internal data class ExternalEntityOriginImpl(override val reference: EntityPointer<*>, override val rootHolder: IndexingSourceRootHolder) : ExternalEntityOrigin +@Internal internal data class CustomKindEntityOriginImpl(override val reference: EntityPointer<*>, override val rootHolder: IndexingRootHolder) : CustomKindEntityOrigin +@Internal internal open class IndexingRootHolderImpl(override val roots: List, override val nonRecursiveRoots: List) : IndexingRootHolder { diff --git a/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/workspaceEntitiesOrigins.kt b/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/workspaceEntitiesOrigins.kt index 65f71801a316..f8fee1cf9e04 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/workspaceEntitiesOrigins.kt +++ b/platform/lang-impl/src/com/intellij/util/indexing/roots/origin/workspaceEntitiesOrigins.kt @@ -6,22 +6,27 @@ import com.intellij.platform.workspace.storage.EntityPointer import com.intellij.util.indexing.roots.kind.ContentOrigin import com.intellij.util.indexing.roots.kind.IndexableSetOrigin import com.intellij.util.indexing.roots.kind.ModuleContentOrigin +import org.jetbrains.annotations.ApiStatus.Internal +@Internal interface ModuleAwareContentEntityOrigin : ModuleContentOrigin { val reference: EntityPointer<*> val rootHolder: IndexingRootHolder } +@Internal interface GenericContentEntityOrigin : ContentOrigin { val reference: EntityPointer<*> val rootHolder: IndexingRootHolder } +@Internal interface ExternalEntityOrigin : IndexableSetOrigin { val reference: EntityPointer<*> val rootHolder: IndexingSourceRootHolder } +@Internal interface CustomKindEntityOrigin : IndexableSetOrigin { val reference: EntityPointer<*> val rootHolder: IndexingRootHolder