diff --git a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt b/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt deleted file mode 100644 index 7800a8f2d94..00000000000 --- a/idea/ide-common/src/org/jetbrains/kotlin/compatibility/ExecutorProcessor.kt +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.compatibility - -import com.intellij.util.Processor - -/** - * Processor till IDEA 181 and Processor since 182. - * BUNCH: 181 - */ -typealias ExecutorProcessor = Processor \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt index 98597846273..1807bd98ac0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt @@ -21,11 +21,7 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import com.intellij.psi.search.SearchScope -import com.intellij.util.EmptyQuery -import com.intellij.util.Query -import com.intellij.util.QueryExecutor -import com.intellij.util.QueryFactory -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.* import org.jetbrains.kotlin.psi.psiUtil.contains import java.util.* @@ -43,7 +39,7 @@ abstract class DeclarationsSearch(true) { - override fun processQuery(queryParameters: R, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: R, consumer: Processor) { doSearch(queryParameters, consumer) } } @@ -54,7 +50,7 @@ abstract class DeclarationsSearch) + protected abstract fun doSearch(request: R, consumer: Processor) protected open fun isApplicable(request: R): Boolean = true fun search(request: R): Query = if (isApplicable(request)) createUniqueResultsQuery(request) else EmptyQuery.getEmptyQuery() @@ -97,7 +93,7 @@ interface HierarchyTraverser { } } -fun ExecutorProcessor.consumeHierarchy(request: SearchRequestWithElement, traverser: HierarchyTraverser) { +fun Processor.consumeHierarchy(request: SearchRequestWithElement, traverser: HierarchyTraverser) { traverser.forEach(request.originalElement) { element -> if (element in request.searchScope) { process(element) @@ -108,13 +104,13 @@ fun ExecutorProcessor.consumeHierarchy(request: SearchReques abstract class HierarchySearch( private val traverser: HierarchyTraverser ) : DeclarationsSearch>() { - protected open fun doSearchAll(request: HierarchySearchRequest, consumer: ExecutorProcessor) { + protected open fun doSearchAll(request: HierarchySearchRequest, consumer: Processor) { consumer.consumeHierarchy(request, traverser) } - protected abstract fun doSearchDirect(request: HierarchySearchRequest, consumer: ExecutorProcessor) + protected abstract fun doSearchDirect(request: HierarchySearchRequest, consumer: Processor) - override fun doSearch(request: HierarchySearchRequest, consumer: ExecutorProcessor) { + override fun doSearch(request: HierarchySearchRequest, consumer: Processor) { if (request.searchDeeply) { doSearchAll(request, consumer) } else { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt index 893091b35ca..075e64f7c27 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt @@ -21,7 +21,6 @@ import com.intellij.util.Query import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.asJava.unwrapped -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.isOverridable @@ -96,7 +95,7 @@ object KotlinPsiMethodOverridersSearch : HierarchySearch(PsiMethodOve override fun isApplicable(request: HierarchySearchRequest): Boolean = runReadAction { request.originalElement.isOverridableElement() } - override fun doSearchDirect(request: HierarchySearchRequest, consumer: ExecutorProcessor) { + override fun doSearchDirect(request: HierarchySearchRequest, consumer: Processor) { searchDirectOverriders(request.originalElement).forEach { method -> consumer.process(method) } } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt index 33c2233c6ce..dd79fbda611 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt @@ -24,6 +24,7 @@ import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope import com.intellij.psi.search.UsageSearchContext import com.intellij.psi.search.searches.ReferencesSearch +import com.intellij.util.Processor import com.intellij.util.containers.nullize import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.elements.KtLightField @@ -33,7 +34,6 @@ import org.jetbrains.kotlin.asJava.elements.KtLightParameter import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightElements -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.* @@ -77,13 +77,13 @@ class KotlinReferencesSearchParameters( ) : ReferencesSearch.SearchParameters(elementToSearch, scope, ignoreAccessScope, optimizer) class KotlinReferencesSearcher : QueryExecutorBase() { - override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor) { val processor = QueryProcessor(queryParameters, consumer) runReadAction { processor.processInReadAction() } processor.executeLongRunningTasks() } - private class QueryProcessor(val queryParameters: ReferencesSearch.SearchParameters, val consumer: ExecutorProcessor) { + private class QueryProcessor(val queryParameters: ReferencesSearch.SearchParameters, val consumer: Processor) { private val kotlinOptions = (queryParameters as? KotlinReferencesSearchParameters)?.kotlinOptions ?: Empty diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinRequestResultProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinRequestResultProcessor.kt index 2a72afc3046..969b31373a7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinRequestResultProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinRequestResultProcessor.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiReference import com.intellij.psi.PsiReferenceService import com.intellij.psi.ReferenceRange import com.intellij.psi.search.RequestResultProcessor -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference import org.jetbrains.kotlin.idea.search.usagesSearch.isCallableOverrideUsage import org.jetbrains.kotlin.idea.search.usagesSearch.isExtensionOfDeclarationClassUsage @@ -38,7 +38,7 @@ class KotlinRequestResultProcessor( ) : RequestResultProcessor(unwrappedElement, originalElement, filter, options) { private val referenceService = PsiReferenceService.getService() - override fun processTextOccurrence(element: PsiElement, offsetInElement: Int, consumer: ExecutorProcessor): Boolean { + override fun processTextOccurrence(element: PsiElement, offsetInElement: Int, consumer: Processor): Boolean { val references = if (element is KtDestructuringDeclaration) element.entries.flatMap { referenceService.getReferences(it, PsiReferenceService.Hints.NO_HINTS) } else diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt index 140027cd34d..b0d6d0955d2 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt @@ -34,7 +34,6 @@ import com.intellij.util.CommonProcessors import com.intellij.util.indexing.FileBasedIndex import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.util.application.runReadAction -import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -103,7 +102,7 @@ fun SearchScope.excludeFileTypes(vararg fileTypes: FileType): SearchScope { fun ReferencesSearch.SearchParameters.effectiveSearchScope(element: PsiElement): SearchScope { if (element == elementToSearch) return effectiveSearchScope if (isIgnoreAccessScope) return scopeDeterminedByUser - val accessScope = psiSearchHelperInstance(element.project).getUseScope(element) + val accessScope = PsiSearchHelper.getInstance(element.project).getUseScope(element) return scopeDeterminedByUser.intersectWith(accessScope) } @@ -126,7 +125,7 @@ fun PsiSearchHelper.isCheapEnoughToSearchConsideringOperators( fun findScriptsWithUsages(declaration: KtNamedDeclaration): List { val project = declaration.project - val scope = psiSearchHelperInstance(project).getUseScope(declaration) as? GlobalSearchScope + val scope = PsiSearchHelper.getInstance(project).getUseScope(declaration) as? GlobalSearchScope ?: return emptyList() val name = declaration.name.takeIf { it?.isNotBlank() == true } ?: return emptyList() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index 618b1a76fd8..5049f6e705b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -35,7 +35,6 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.toLightClass -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils import org.jetbrains.kotlin.idea.KotlinFileType @@ -52,7 +51,6 @@ import org.jetbrains.kotlin.idea.search.restrictToKotlinSources import org.jetbrains.kotlin.idea.util.FuzzyType import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.application.runReadAction -import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.kdoc.psi.impl.KDocName import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.load.java.sam.SingleAbstractMethodUtils @@ -274,7 +272,7 @@ class ExpressionsOfTypeProcessor( RequestResultProcessor(psiMember) { val possibleClassesNames: Set = runReadAction { classes.map { it.qualifiedName }.filterNotNullTo(HashSet()) } - override fun processTextOccurrence(element: PsiElement, offsetInElement: Int, consumer: ExecutorProcessor): Boolean { + override fun processTextOccurrence(element: PsiElement, offsetInElement: Int, consumer: Processor): Boolean { when (element) { is KtQualifiedExpression -> { val selectorExpression = element.selectorExpression ?: return true @@ -370,7 +368,7 @@ class ExpressionsOfTypeProcessor( } } - psiSearchHelperInstance(project).processRequests(searchRequestCollector) { reference -> + PsiSearchHelper.getInstance(project).processRequests(searchRequestCollector) { reference -> if (reference.element.parents.any { it is KtImportDirective }) { // Found declaration in import - process all file with an ordinal reference search val containingFile = reference.element.containingFile diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/BinaryOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/BinaryOperatorReferenceSearcher.kt index 872ae195405..eb69e92af66 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/BinaryOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/BinaryOperatorReferenceSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.lexer.KtSingleValueToken @@ -33,7 +33,7 @@ class BinaryOperatorReferenceSearcher( targetFunction: PsiElement, private val operationTokens: List, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/ContainsOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/ContainsOperatorReferenceSearcher.kt index 9c10575994c..6bd5d62f326 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/ContainsOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/ContainsOperatorReferenceSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.lexer.KtTokens @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance class ContainsOperatorReferenceSearcher( targetFunction: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/DestructuringDeclarationReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/DestructuringDeclarationReferenceSearcher.kt index b80f1bcedd2..d7315c9e62b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/DestructuringDeclarationReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/DestructuringDeclarationReferenceSearcher.kt @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope +import com.intellij.util.Processor import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.references.KtDestructuringDeclarationReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions @@ -33,7 +33,7 @@ class DestructuringDeclarationReferenceSearcher( targetDeclaration: PsiElement, private val componentIndex: Int, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IndexingOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IndexingOperatorReferenceSearcher.kt index 1011f917169..1053d48cbce 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IndexingOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IndexingOperatorReferenceSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtArrayAccessReference import org.jetbrains.kotlin.idea.references.readWriteAccess import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance class IndexingOperatorReferenceSearcher( targetFunction: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions, private val isSet: Boolean diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/InvokeOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/InvokeOperatorReferenceSearcher.kt index 9a8624c2790..f96f56cda4a 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/InvokeOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/InvokeOperatorReferenceSearcher.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtInvokeFunctionReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.psi.KtCallExpression @@ -36,7 +36,7 @@ import org.jetbrains.uast.convertOpt class InvokeOperatorReferenceSearcher( targetFunction: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, options, wordsToSearch = emptyList()) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IteratorOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IteratorOperatorReferenceSearcher.kt index 6d20333fafc..4cc543166c4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IteratorOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/IteratorOperatorReferenceSearcher.kt @@ -20,8 +20,8 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope +import com.intellij.util.Processor import org.jetbrains.kotlin.KtNodeTypes -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.references.KtForLoopInReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.psi.KtElement @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance class IteratorOperatorReferenceSearcher( targetFunction: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, options, wordsToSearch = listOf("in")) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt index 7f3735dc0c5..6dec754e3c5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/OperatorReferenceSearcher.kt @@ -20,10 +20,10 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.openapi.progress.util.ProgressWrapper import com.intellij.psi.* import com.intellij.psi.search.* +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.toLightClass -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.idea.KotlinFileType @@ -56,7 +56,7 @@ import java.util.* abstract class OperatorReferenceSearcher( protected val targetDeclaration: PsiElement, private val searchScope: SearchScope, - private val consumer: ExecutorProcessor, + private val consumer: Processor, private val optimizer: SearchRequestCollector, private val options: KotlinReferencesSearchOptions, private val wordsToSearch: List @@ -92,7 +92,7 @@ abstract class OperatorReferenceSearcher( fun create( declaration: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ): OperatorReferenceSearcher<*>? { @@ -107,7 +107,7 @@ abstract class OperatorReferenceSearcher( private fun createInReadAction( declaration: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ): OperatorReferenceSearcher<*>? { @@ -132,7 +132,7 @@ abstract class OperatorReferenceSearcher( private fun createInReadAction( declaration: PsiElement, name: Name, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions, searchScope: SearchScope diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/PropertyDelegationOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/PropertyDelegationOperatorReferenceSearcher.kt index fb949b89c16..276b129e622 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/PropertyDelegationOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/PropertyDelegationOperatorReferenceSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtPropertyDelegationMethodsReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.psi.KtElement @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance class PropertyDelegationOperatorReferenceSearcher( targetFunction: PsiElement, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher(targetFunction, searchScope, consumer, optimizer, options, wordsToSearch = listOf("by")) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/UnaryOperatorReferenceSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/UnaryOperatorReferenceSearcher.kt index 0ce538b3e03..2d39338c102 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/UnaryOperatorReferenceSearcher.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/operators/UnaryOperatorReferenceSearcher.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.search.SearchRequestCollector import com.intellij.psi.search.SearchScope -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReferencesSearchOptions import org.jetbrains.kotlin.lexer.KtSingleValueToken @@ -33,7 +33,7 @@ class UnaryOperatorReferenceSearcher( targetFunction: PsiElement, private val operationToken: KtSingleValueToken, searchScope: SearchScope, - consumer: ExecutorProcessor, + consumer: Processor, optimizer: SearchRequestCollector, options: KotlinReferencesSearchOptions ) : OperatorReferenceSearcher( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt index 29f52d9f56c..eaf30454949 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt @@ -45,10 +45,3 @@ fun Project.executeCommand(name: String, groupId: Any? = null, command: () - @Suppress("USELESS_CAST") return result as T } - -/** - * ProgressManager.getProgressIndicator() is nullable in 181 and dynamic again in 182 - * BUNCH: 181 - */ -@Suppress("IncompatibleAPI") -val ProgressManager.progressIndicatorNullable: ProgressIndicator? get() = progressIndicator \ No newline at end of file diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt deleted file mode 100644 index 73fb8b360aa..00000000000 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.util.compat - -import com.intellij.openapi.project.Project -import com.intellij.psi.search.PsiSearchHelper - -// BUNCH: 181 -@Suppress("IncompatibleAPI", "MissingRecentApi") -fun psiSearchHelperInstance(project: Project): PsiSearchHelper { - return PsiSearchHelper.getInstance(project) -} \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt index 5f45b7d7a10..dfc80640741 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -49,7 +49,6 @@ import org.jetbrains.kotlin.idea.refactoring.j2k import org.jetbrains.kotlin.idea.refactoring.j2kText import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.versions.getKotlinJvmRuntimeMarkerClass import org.jetbrains.kotlin.j2k.AfterConversionPass @@ -82,7 +81,7 @@ class KotlinCodeFragmentFactory : CodeFragmentFactory() { semaphore.down() val nameRef = AtomicReference() val worker = object : KotlinRuntimeTypeEvaluator( - null, expression, debuggerContext, ProgressManager.getInstance().progressIndicatorNullable!! + null, expression, debuggerContext, ProgressManager.getInstance().progressIndicator!! ) { override fun typeCalculationFinished(type: KotlinType?) { nameRef.set(type) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt index 9f607bfce9c..f615a5dbba6 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/injection/KotlinLanguageInjector.kt @@ -53,7 +53,6 @@ import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriority import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor import org.jetbrains.kotlin.idea.util.ProjectRootsUtil -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -111,7 +110,7 @@ class KotlinLanguageInjector( return computedInjection } - if (ApplicationManager.getApplication().isReadAccessAllowed && ProgressManager.getInstance().progressIndicatorNullable == null) { + if (ApplicationManager.getApplication().isReadAccessAllowed && ProgressManager.getInstance().progressIndicator == null) { // The action cannot be canceled by caller and by internal checkCanceled() calls. // Force creating new indicator that is canceled on write action start, otherwise there might be lags in typing. runInReadActionWithWriteActionPriority(::computeAndCache) ?: kotlinCachedInjection?.baseInjection ?: ABSENT_KOTLIN_INJECTION diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt index 7b76d67cdc1..0600f6daef2 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinDecompilerServiceImpl.kt @@ -57,7 +57,7 @@ class KotlinDecompilerServiceImpl : KotlinDecompilerService { val decompiler = BaseDecompiler(bytecodeProvider, resultSaver, options, IdeaLogger()) for (path in bytecodeMap.keys) { - decompiler.addSpaceEx(path, true) + decompiler.addSource(path) } decompiler.decompileContext() return resultSaver.resultText diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt deleted file mode 100644 index a50e72a59bf..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/baseDecompiler.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.internal - -import org.jetbrains.java.decompiler.main.decompiler.BaseDecompiler -import java.io.File - -/** - * `addSpace` method is deprecated in 182. `addSource` and `addLibrary` were introduced instead. - * BUNCH: 181 - */ -@Suppress("IncompatibleAPI") -fun BaseDecompiler.addSpaceEx(file: File, isOwn: Boolean) { - if (isOwn) { - addSource(file) - } else { - addLibrary(file) - } -} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt index c4af83edb02..3d46dfb9705 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt @@ -273,16 +273,11 @@ class KotlinPluginUpdater(private val propertiesComponent: PropertiesComponent) } if (prepareResult) { - val pluginDescriptor = pluginDownloader.descriptor - // BUNCH: 181 Not null since 182. - @Suppress("SENSELESS_COMPARISON") - if (pluginDescriptor != null) { - installed = true - pluginDownloader.install() + installed = true + pluginDownloader.install() - ApplicationManager.getApplication().invokeLater { - PluginManagerMain.notifyPluginsUpdated(null) - } + ApplicationManager.getApplication().invokeLater { + PluginManagerMain.notifyPluginsUpdated(null) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index 250c0bc2c5a..3adb8eb7d62 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -48,7 +48,6 @@ import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices import org.jetbrains.kotlin.idea.j2k.JavaToKotlinConverterFactory import org.jetbrains.kotlin.idea.refactoring.toPsiFile import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.isRunningInCidrIde import org.jetbrains.kotlin.j2k.ConverterSettings @@ -122,7 +121,7 @@ class JavaToKotlinAction : AnAction() { converterResult = converter.filesToKotlin( javaFiles, JavaToKotlinConverterFactory.createPostProcessor(formatCode = true), - progress = ProgressManager.getInstance().progressIndicatorNullable!! + progress = ProgressManager.getInstance().progressIndicator!! ) } @@ -143,7 +142,7 @@ class JavaToKotlinAction : AnAction() { { runReadAction { externalCodeUpdate = converterResult!!.externalCodeProcessing!!.prepareWriteOperation( - ProgressManager.getInstance().progressIndicatorNullable!! + ProgressManager.getInstance().progressIndicator!! ) } }, diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt index e1294cb3eaa..4e496e83e4b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/generate/KotlinGenerateTestSupportActionBase.kt @@ -48,7 +48,6 @@ import org.jetbrains.kotlin.idea.core.overrideImplement.generateUnsupportedOrSup import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.setupEditorSelection import org.jetbrains.kotlin.idea.refactoring.j2k import org.jetbrains.kotlin.idea.testIntegration.findSuitableFrameworks -import org.jetbrains.kotlin.idea.util.PopupChooserBuilderWrapper import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* @@ -75,7 +74,7 @@ abstract class KotlinGenerateTestSupportActionBase( val list = JBList(*frameworks.toTypedArray()) list.cellRenderer = TestFrameworkListCellRenderer() - PopupChooserBuilderWrapper(list) + PopupChooserBuilder(list) .setFilteringEnabled { (it as TestFramework).name } .setTitle("Choose Framework") .setItemChoosenCallback { consumer(list.selectedValue as TestFramework) } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckComponentsUsageSearchAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckComponentsUsageSearchAction.kt index 388b5315eb5..72e67bc3ebe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckComponentsUsageSearchAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/CheckComponentsUsageSearchAction.kt @@ -30,7 +30,6 @@ import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.psi.PsiManager import com.intellij.psi.search.searches.ReferencesSearch import org.jetbrains.kotlin.idea.search.usagesSearch.ExpressionsOfTypeProcessor -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile @@ -58,7 +57,7 @@ class CheckComponentsUsageSearchAction : AnAction() { .filter { it.isData() } .toList() - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable + val progressIndicator = ProgressManager.getInstance().progressIndicator for ((i, dataClass) in dataClasses.withIndex()) { progressIndicator?.text = "Checking data class ${i + 1} of ${dataClasses.size}..." progressIndicator?.text2 = dataClass.fqName?.asString() ?: "" diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt index 8539ea25e4a..970581f5653 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/FindImplicitNothingAction.kt @@ -39,7 +39,6 @@ import org.jetbrains.kotlin.builtins.getReturnTypeFromFunctionType import org.jetbrains.kotlin.builtins.isFunctionType import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils @@ -63,7 +62,7 @@ class FindImplicitNothingAction : AnAction() { } private fun find(files: Collection, project: Project) { - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable + val progressIndicator = ProgressManager.getInstance().progressIndicator val found = ArrayList() for ((i, file) in files.withIndex()) { progressIndicator?.text = "Scanning files: $i of ${files.size} file. ${found.size} occurrences found" diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt index 1bc33659f8c..9b85cfa5e42 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/internal/SearchNotPropertyCandidatesAction.kt @@ -30,7 +30,6 @@ import com.intellij.psi.PsiModifier import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.load.java.isFromJava import org.jetbrains.kotlin.name.FqName @@ -56,7 +55,7 @@ class SearchNotPropertyCandidatesAction : AnAction() { ProgressManager.getInstance().runProcessWithProgressSynchronously( { runReadAction { - ProgressManager.getInstance().progressIndicatorNullable!!.isIndeterminate = true + ProgressManager.getInstance().progressIndicator!!.isIndeterminate = true processAllDescriptors(packageDesc, project) } }, diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinOptimizeImportsRefactoringHelper.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinOptimizeImportsRefactoringHelper.kt index a6e39c8296a..ba244da86ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinOptimizeImportsRefactoringHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinOptimizeImportsRefactoringHelper.kt @@ -29,7 +29,6 @@ import com.intellij.util.IncorrectOperationException import com.intellij.util.SequentialModalProgressTask import com.intellij.util.SequentialTask import org.jetbrains.kotlin.idea.inspections.KotlinUnusedImportInspection -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtImportDirective @@ -94,7 +93,7 @@ class KotlinOptimizeImportsRefactoringHelper : RefactoringHelper> { val unusedImports = LinkedHashSet>() val findRedundantImports = { DumbService.getInstance(project).runReadActionInSmartMode { - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable + val progressIndicator = ProgressManager.getInstance().progressIndicator val fileCount = operationData.size for ((i, file) in operationData.withIndex()) { if (!file.isValid) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt index 2394516b992..aed98b70c76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/CanBeParameterInspection.kt @@ -15,6 +15,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiReference import com.intellij.psi.search.GlobalSearchScope +import com.intellij.psi.search.PsiSearchHelper import com.intellij.psi.search.PsiSearchHelper.SearchCostResult.FEW_OCCURRENCES import com.intellij.psi.search.PsiSearchHelper.SearchCostResult.ZERO_OCCURRENCES import com.intellij.psi.search.searches.ReferencesSearch @@ -24,7 +25,6 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.isCheapEnoughToSearchConsideringOperators import org.jetbrains.kotlin.idea.search.usagesSearch.getAccessorNames import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope -import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.lexer.KtTokens.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject @@ -83,7 +83,7 @@ class CanBeParameterInspection : AbstractKotlinInspection() { val useScope = parameter.useScope val restrictedScope = if (useScope is GlobalSearchScope) { - val psiSearchHelper = psiSearchHelperInstance(parameter.project) + val psiSearchHelper = PsiSearchHelper.getInstance(parameter.project) for (accessorName in parameter.getAccessorNames()) { when (psiSearchHelper.isCheapEnoughToSearchConsideringOperators(accessorName, useScope, null, null)) { ZERO_OCCURRENCES -> { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt index 0d0345a8a1f..3bd359dc8b2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinUnusedImportInspection.kt @@ -48,7 +48,6 @@ import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer import org.jetbrains.kotlin.idea.imports.OptimizedImportsBuilder import org.jetbrains.kotlin.idea.imports.importableFqName import org.jetbrains.kotlin.idea.util.ProjectRootsUtil -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtCodeFragment import org.jetbrains.kotlin.psi.KtFile @@ -149,7 +148,7 @@ class KotlinUnusedImportInspection : AbstractKotlinInspection() { val optimizedImports = KotlinImportOptimizer.prepareOptimizedImports(file, data) ?: return // return if already optimized // unwrap progress indicator - val progress = generateSequence(ProgressManager.getInstance().progressIndicatorNullable) { + val progress = generateSequence(ProgressManager.getInstance().progressIndicator) { (it as? ProgressWrapper)?.originalProgressIndicator }.last() as DaemonProgressIndicator val highlightingSession = HighlightingSessionImpl.getHighlightingSession(file, progress) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanBePrivateInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanBePrivateInspection.kt index fd62d24afe4..f1f6afb8609 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanBePrivateInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/MemberVisibilityCanBePrivateInspection.kt @@ -43,7 +43,6 @@ import org.jetbrains.kotlin.idea.search.isCheapEnoughToSearchConsideringOperator import org.jetbrains.kotlin.idea.search.usagesSearch.dataClassComponentFunction import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope -import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* @@ -103,7 +102,7 @@ class MemberVisibilityCanBePrivateInspection : AbstractKotlinInspection() { // properties can be referred by component1/component2, which is too expensive to search, don't analyze them if (declaration is KtParameter && declaration.dataClassComponentFunction() != null) return false - val psiSearchHelper = psiSearchHelperInstance(declaration.project) + val psiSearchHelper = PsiSearchHelper.getInstance(declaration.project) val useScope = declaration.useScope val name = declaration.name ?: return false val restrictedScope = if (useScope is GlobalSearchScope) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 2958189202e..3a304f24196 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -24,6 +24,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiReference import com.intellij.psi.search.GlobalSearchScope +import com.intellij.psi.search.PsiSearchHelper import com.intellij.psi.search.PsiSearchHelper.SearchCostResult import com.intellij.psi.search.PsiSearchHelper.SearchCostResult.* import com.intellij.psi.search.SearchScope @@ -63,7 +64,6 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.getAccessorNames import org.jetbrains.kotlin.idea.search.usagesSearch.getClassNameForCompanionObject import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope import org.jetbrains.kotlin.idea.util.ProjectRootsUtil -import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.idea.util.hasActualsFor import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi import org.jetbrains.kotlin.lexer.KtTokens @@ -123,7 +123,7 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { private fun isCheapEnoughToSearchUsages(declaration: KtNamedDeclaration): SearchCostResult { val project = declaration.project - val psiSearchHelper = psiSearchHelperInstance(project) + val psiSearchHelper = PsiSearchHelper.getInstance(project) val usedScripts = findScriptsWithUsages(declaration) if (usedScripts.isNotEmpty()) { @@ -259,7 +259,7 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { private fun hasNonTrivialUsages(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor? = null): Boolean { val project = declaration.project - val psiSearchHelper = psiSearchHelperInstance(project) + val psiSearchHelper = PsiSearchHelper.getInstance(project) val useScope = psiSearchHelper.getUseScope(declaration) val restrictedScope = if (useScope is GlobalSearchScope) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeParameterToReceiverIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeParameterToReceiverIntention.kt index 67b6091ffe9..19485ac38c2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeParameterToReceiverIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeParameterToReceiverIntention.kt @@ -41,7 +41,6 @@ import org.jetbrains.kotlin.idea.references.KtSimpleReference import org.jetbrains.kotlin.idea.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.search.usagesSearch.searchReferencesOrMethodReferences import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType @@ -187,7 +186,7 @@ class ConvertFunctionTypeParameterToReceiverIntention : SelfTargetingRangeIntent runReadAction { val progressStep = 1.0/callables.size for ((i, callable) in callables.withIndex()) { - ProgressManager.getInstance().progressIndicatorNullable!!.fraction = (i + 1) * progressStep + ProgressManager.getInstance().progressIndicator!!.fraction = (i + 1) * progressStep if (callable !is PsiNamedElement) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt index 5044cc70520..f9b059be672 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt @@ -38,7 +38,6 @@ import org.jetbrains.kotlin.idea.references.KtSimpleReference import org.jetbrains.kotlin.idea.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.search.usagesSearch.searchReferencesOrMethodReferences import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* @@ -126,7 +125,7 @@ class ConvertFunctionTypeReceiverToParameterIntention : SelfTargetingRangeIntent runReadAction { val progressStep = 1.0/callables.size for ((i, callable) in callables.withIndex()) { - ProgressManager.getInstance().progressIndicatorNullable!!.fraction = (i + 1) * progressStep + ProgressManager.getInstance().progressIndicator!!.fraction = (i + 1) * progressStep if (callable !is KtFunction) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt index 645b2d7885d..c583d5a8011 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt @@ -34,7 +34,6 @@ import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.util.application.executeWriteCommand -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.hasJvmFieldAnnotation import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -97,7 +96,7 @@ class ConvertPropertyToFunctionIntention : SelfTargetingIntention(Kt runReadAction { val progressStep = 1.0 / callables.size for ((i, callable) in callables.withIndex()) { - ProgressManager.getInstance().progressIndicatorNullable!!.fraction = (i + 1) * progressStep + ProgressManager.getInstance().progressIndicator!!.fraction = (i + 1) * progressStep if (callable !is PsiNamedElement) continue diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt index 8c86217908d..199bb073586 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ImplementAbstractMemberIntention.kt @@ -37,15 +37,14 @@ import org.jetbrains.kotlin.asJava.toLightMethods import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaClassDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny +import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaClassDescriptor import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMembersHandler import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMemberChooserObject import org.jetbrains.kotlin.idea.refactoring.isAbstract import org.jetbrains.kotlin.idea.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors -import org.jetbrains.kotlin.idea.util.PopupChooserBuilderWrapper import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor @@ -214,7 +213,7 @@ abstract class ImplementAbstractMemberIntentionBase : selectionMode = ListSelectionModel.MULTIPLE_INTERVAL_SELECTION cellRenderer = renderer } - val builder = PopupChooserBuilderWrapper(list) + val builder = PopupChooserBuilder(list) renderer.installSpeedSearch(builder) builder .setTitle(CodeInsightBundle.message("intention.implement.abstract.method.class.chooser.title")) diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt index 6b6564790c5..5e34eed356a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaJavaToKotlinServices.kt @@ -16,14 +16,13 @@ package org.jetbrains.kotlin.idea.j2k +import com.intellij.codeInspection.dataFlow.DfaUtil import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiVariable -import org.jetbrains.kotlin.idea.util.compat.dfaCheckNullability -import org.jetbrains.kotlin.idea.util.compat.dfaInferMethodNullability import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.j2k.ast.Nullability -import org.jetbrains.kotlin.idea.util.compat.Nullability as IntellijNullability +import com.intellij.codeInsight.Nullability as IntellijNullability object IdeaJavaToKotlinServices : JavaToKotlinConverterServices { override val referenceSearcher: ReferenceSearcher @@ -48,10 +47,10 @@ object IdeaSuperMethodSearcher : SuperMethodsSearcher { private object IdeaJavaDataFlowAnalyzerFacade : JavaDataFlowAnalyzerFacade { override fun variableNullability(variable: PsiVariable, context: PsiElement): Nullability = - dfaCheckNullability(variable, context).toJ2KNullability() + DfaUtil.checkNullability(variable, context).toJ2KNullability() override fun methodNullability(method: PsiMethod): Nullability = - dfaInferMethodNullability(method).toJ2KNullability() + DfaUtil.inferMethodNullability(method).toJ2KNullability() private fun IntellijNullability.toJ2KNullability() = when (this) { IntellijNullability.UNKNOWN -> Nullability.Default diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt index 4dfce5d720a..8e39006566e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde import org.jetbrains.kotlin.idea.runSynchronouslyWithProgress import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -73,7 +72,7 @@ class ChangeSuspendInHierarchyFix( private fun findAllFunctionToProcess(project: Project): Set { val result = LinkedHashSet() - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable!! + val progressIndicator = ProgressManager.getInstance().progressIndicator!! val function = element ?: return emptySet() val functionDescriptor = function.unsafeResolveToDescriptor() as FunctionDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index d5e41f32447..6a66e956c99 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -28,10 +28,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.roots.JavaProjectRootsUtil import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.Messages -import com.intellij.openapi.ui.popup.JBPopup -import com.intellij.openapi.ui.popup.JBPopupAdapter -import com.intellij.openapi.ui.popup.JBPopupFactory -import com.intellij.openapi.ui.popup.LightweightWindowEvent +import com.intellij.openapi.ui.popup.* import com.intellij.openapi.util.Pass import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.text.StringUtil @@ -272,7 +269,7 @@ fun getPsiElementPopup( } } - return with(PopupChooserBuilderWrapper(list)) { + return with(PopupChooserBuilder(list)) { title?.let { setTitle(it) } renderer.installSpeedSearch(this, true) setItemChoosenCallback { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveClassesOrPackages/KotlinAwareDelegatingMoveDestination.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveClassesOrPackages/KotlinAwareDelegatingMoveDestination.kt index 30bac80eabe..e1d388c5a6a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveClassesOrPackages/KotlinAwareDelegatingMoveDestination.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveClassesOrPackages/KotlinAwareDelegatingMoveDestination.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.KotlinDirecto import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.analyzeConflictsInFile import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.stubindex.KotlinExactPackagesIndex -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile @@ -74,7 +73,7 @@ class KotlinAwareDelegatingMoveDestination( } filesToProcess.flatMap {it.declarations}.forEach { it.accept(extraElementCollector) } - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable!! + val progressIndicator = ProgressManager.getInstance().progressIndicator!! progressIndicator.pushState() val extraUsages = ArrayList() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveDirectoryWithClassesHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveDirectoryWithClassesHelper.kt index 2d1e5827e58..147cba16dfd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveDirectoryWithClassesHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/KotlinMoveDirectoryWithClassesHelper.kt @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.refactoring.invokeOnceOnCommandFinish import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.KotlinDirectoryMoveTarget import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.MoveKotlinDeclarationsProcessor import org.jetbrains.kotlin.idea.refactoring.move.moveDeclarations.analyzeConflictsInFile -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile @@ -86,7 +85,7 @@ class KotlinMoveDirectoryWithClassesHelper : MoveDirectoryWithClassesHelper() { for ((index, usageInfo) in infos.withIndex()) { if (usageInfo !is FileUsagesWrapper) continue - ProgressManager.getInstance().progressIndicatorNullable?.text2 = "Processing ${usageInfo.psiFile.name}" + ProgressManager.getInstance().progressIndicator?.text2 = "Processing ${usageInfo.psiFile.name}" runReadAction { analyzeConflictsInFile(usageInfo.psiFile, usageInfo.usages, moveTarget, files, conflicts) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index dad2fb7c605..841000e5f89 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -43,7 +43,6 @@ import org.jetbrains.kotlin.idea.refactoring.fqName.isImported import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference.ShorteningMode import org.jetbrains.kotlin.idea.references.mainReference -import org.jetbrains.kotlin.idea.util.application.progressIndicatorNullable import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -474,7 +473,7 @@ fun postProcessMoveUsages( val nonCodeUsages = ArrayList() val progressStep = 1.0/sortedUsages.size - val progressIndicator = ProgressManager.getInstance().progressIndicatorNullable + val progressIndicator = ProgressManager.getInstance().progressIndicator progressIndicator?.text = "Updating usages..." usageLoop@ for ((i, usage) in sortedUsages.withIndex()) { progressIndicator?.fraction = (i + 1) * progressStep diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/DefaultAnnotationMethodKotlinImplicitReferenceSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/DefaultAnnotationMethodKotlinImplicitReferenceSearcher.kt index 24c4bcf9e72..54a07f007ac 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/DefaultAnnotationMethodKotlinImplicitReferenceSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/DefaultAnnotationMethodKotlinImplicitReferenceSearcher.kt @@ -24,7 +24,7 @@ import com.intellij.psi.PsiReference import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.util.PsiUtil -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.search.restrictToKotlinSources import org.jetbrains.kotlin.idea.util.application.runReadAction @@ -39,7 +39,7 @@ class DefaultAnnotationMethodKotlinImplicitReferenceSearcher : private val PsiMethod.isDefaultAnnotationMethod: Boolean get() = PsiUtil.isAnnotationMethod(this) && name == PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME && parameterList.parametersCount == 0 - private fun createReferenceProcessor(consumer: ExecutorProcessor) = object : ReadActionProcessor() { + private fun createReferenceProcessor(consumer: Processor) = object : ReadActionProcessor() { override fun processInReadAction(reference: PsiReference): Boolean { if (reference !is KtSimpleNameReference) return true val annotationEntry = reference.expression.getParentOfTypeAndBranch { typeReference } ?: return true @@ -49,7 +49,7 @@ class DefaultAnnotationMethodKotlinImplicitReferenceSearcher : } } - override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: Processor) { runReadAction { val method = queryParameters.method if (!method.isDefaultAnnotationMethod) return@runReadAction null diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt index ead554c56d7..42540c6e156 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt @@ -25,6 +25,7 @@ import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.SearchScope import com.intellij.psi.search.searches.AnnotatedElementsSearch import com.intellij.psi.util.PsiUtilCore +import com.intellij.util.Processor import com.intellij.util.QueryExecutor import com.intellij.util.indexing.FileBasedIndex import org.jetbrains.kotlin.asJava.ImpreciseResolveResult.NO_MATCH @@ -32,7 +33,6 @@ import org.jetbrains.kotlin.asJava.ImpreciseResolveResult.UNSURE import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toPsiParameters -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.search.PsiBasedClassResolver import org.jetbrains.kotlin.idea.stubindex.KotlinAnnotationsIndex @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode class KotlinAnnotatedElementsSearcher : QueryExecutor { - override fun execute(p: AnnotatedElementsSearch.Parameters, consumer: ExecutorProcessor): Boolean { + override fun execute(p: AnnotatedElementsSearch.Parameters, consumer: Processor): Boolean { return processAnnotatedMembers(p.annotationClass, p.scope) { declaration -> when (declaration) { is KtClass -> { diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinClassesWithAnnotatedMembersSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinClassesWithAnnotatedMembersSearcher.kt index 411a400c6dd..a537d471418 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinClassesWithAnnotatedMembersSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinClassesWithAnnotatedMembersSearcher.kt @@ -20,8 +20,8 @@ import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ClassesWithAnnotatedMembersSearch import com.intellij.psi.search.searches.ScopedQueryExecutor +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.toLightClass -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.psi.KtClassOrObject @@ -32,7 +32,7 @@ class KotlinClassesWithAnnotatedMembersSearcher : ScopedQueryExecutor): Boolean { + override fun execute(queryParameters: ClassesWithAnnotatedMembersSearch.Parameters, consumer: Processor): Boolean { val processed = hashSetOf() return KotlinAnnotatedElementsSearcher.processAnnotatedMembers(queryParameters.annotationClass, queryParameters.scope, diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConstructorDelegationCallReferenceSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConstructorDelegationCallReferenceSearcher.kt index f4cf4217e2a..f1fbf3c3010 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConstructorDelegationCallReferenceSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConstructorDelegationCallReferenceSearcher.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.search.ideaExtensions import com.intellij.openapi.application.QueryExecutorBase import com.intellij.psi.PsiReference import com.intellij.psi.search.searches.MethodReferencesSearch.SearchParameters -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.caches.resolve.util.hasJavaResolutionFacade import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.search.usagesSearch.processDelegationCallConstructorUsages class KotlinConstructorDelegationCallReferenceSearcher : QueryExecutorBase(true) { - override fun processQuery(queryParameters: SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: SearchParameters, consumer: Processor) { val method = queryParameters.method if (!method.isConstructor) return if (!method.hasJavaResolutionFacade()) return diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConventionMethodReferencesSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConventionMethodReferencesSearcher.kt index 4beb1c59eb7..7760ed06c00 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConventionMethodReferencesSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinConventionMethodReferencesSearcher.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea.search.ideaExtensions import com.intellij.openapi.application.QueryExecutorBase import com.intellij.psi.PsiReference import com.intellij.psi.search.searches.MethodReferencesSearch -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.idea.caches.resolve.util.hasJavaResolutionFacade import org.jetbrains.kotlin.idea.search.usagesSearch.operators.OperatorReferenceSearcher class KotlinConventionMethodReferencesSearcher : QueryExecutorBase(true) { - override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: Processor) { val method = queryParameters.method if (!method.hasJavaResolutionFacade()) return diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt index cf9533f1242..909ee95b1ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt @@ -30,7 +30,6 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.unwrapped -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.caches.lightClasses.KtFakeLightClass import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachImplementation import org.jetbrains.kotlin.idea.search.declarationsSearch.forEachOverridingMethod @@ -43,7 +42,7 @@ import org.jetbrains.kotlin.psi.psiUtil.contains import java.util.* class KotlinDefinitionsSearcher : QueryExecutor { - override fun execute(queryParameters: DefinitionsScopedSearch.SearchParameters, consumer: ExecutorProcessor): Boolean { + override fun execute(queryParameters: DefinitionsScopedSearch.SearchParameters, consumer: Processor): Boolean { val consumer = skipDelegatedMethodsConsumer(consumer) val element = queryParameters.element val scope = queryParameters.scope @@ -92,7 +91,7 @@ class KotlinDefinitionsSearcher : QueryExecutor): Processor { + private fun skipDelegatedMethodsConsumer(baseConsumer: Processor): Processor { return Processor { element -> if (isDelegated(element)) { return@Processor true diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt index ce8612671dd..af0afe6d7f4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -21,8 +21,8 @@ import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.DirectClassInheritorsSearch +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.toLightClassWithBuiltinMapping -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.caches.lightClasses.KtFakeLightClass import org.jetbrains.kotlin.idea.search.fileScope import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasByExpansionShortNameIn import org.jetbrains.kotlin.idea.util.application.runReadAction open class KotlinDirectInheritorsSearcher : QueryExecutorBase(true) { - override fun processQuery(queryParameters: DirectClassInheritorsSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: DirectClassInheritorsSearch.SearchParameters, consumer: Processor) { val baseClass = queryParameters.classToProcess val name = baseClass.name ?: return diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt index 77abd649d9a..ddf344032f2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodReferenceSearcher.kt @@ -24,8 +24,8 @@ import com.intellij.psi.search.UsageSearchContext import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.psi.util.MethodSignatureUtil import com.intellij.psi.util.TypeConversionUtil +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.toLightMethods -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference import org.jetbrains.kotlin.idea.references.readWriteAccess @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.psi.KtParameter import org.jetbrains.kotlin.psi.KtProperty class KotlinOverridingMethodReferenceSearcher : MethodUsagesSearcher() { - override fun processQuery(p: MethodReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(p: MethodReferencesSearch.SearchParameters, consumer: Processor) { val method = p.method val isConstructor = p.project.runReadActionInSmartMode { method.isConstructor } if (isConstructor) { @@ -84,7 +84,7 @@ class KotlinOverridingMethodReferenceSearcher : MethodUsagesSearcher() { ref: PsiReference, refElement: PsiElement?, method: PsiMethod, - consumer: ExecutorProcessor + consumer: Processor ): Boolean { val isGetter = JvmAbi.isGetterName(method.name) diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt index b1f7ec53166..f0f13fe34ce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt @@ -24,7 +24,6 @@ import com.intellij.util.Processor import com.intellij.util.QueryExecutor import org.jetbrains.kotlin.asJava.classes.KtLightClass import org.jetbrains.kotlin.asJava.elements.KtLightMethod -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor @@ -35,7 +34,7 @@ import org.jetbrains.kotlin.psi.KtCallableDeclaration import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils class KotlinOverridingMethodsWithGenericsSearcher : QueryExecutor { - override fun execute(p: OverridingMethodsSearch.SearchParameters, consumer: ExecutorProcessor): Boolean { + override fun execute(p: OverridingMethodsSearch.SearchParameters, consumer: Processor): Boolean { val method = p.method if (method !is KtLightMethod) return true diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinPropertyAccessorsReferenceSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinPropertyAccessorsReferenceSearcher.kt index 939bc8c6b17..5fd1b6acd76 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinPropertyAccessorsReferenceSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinPropertyAccessorsReferenceSearcher.kt @@ -22,15 +22,15 @@ import com.intellij.psi.PsiReference import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.UsageSearchContext import com.intellij.psi.search.searches.MethodReferencesSearch +import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.namedUnwrappedElement -import org.jetbrains.kotlin.compatibility.ExecutorProcessor import org.jetbrains.kotlin.idea.search.restrictToKotlinSources import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor class KotlinPropertyAccessorsReferenceSearcher : QueryExecutorBase(true) { - override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: MethodReferencesSearch.SearchParameters, consumer: Processor) { val method = queryParameters.method val onlyKotlinFiles = queryParameters.effectiveSearchScope.restrictToKotlinSources() if (onlyKotlinFiles == GlobalSearchScope.EMPTY_SCOPE) return diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt index 8209df60ac1..e84ae1a1106 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTodoSearcher.kt @@ -23,7 +23,7 @@ import com.intellij.psi.impl.cache.TodoCacheManager import com.intellij.psi.search.IndexPattern import com.intellij.psi.search.IndexPatternOccurrence import com.intellij.psi.search.searches.IndexPatternSearch -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtTreeVisitorVoid @@ -35,7 +35,7 @@ data class KotlinTodoOccurrence(private val _file: PsiFile, private val _textRan } class KotlinTodoSearcher : QueryExecutorBase(true) { - override fun processQuery(queryParameters: IndexPatternSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: IndexPatternSearch.SearchParameters, consumer: Processor) { var pattern = queryParameters.pattern if (pattern != null && !pattern.patternString.contains("TODO", true)) return if (pattern == null) { diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt index 260f5425c44..c56cf35d62d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.idea.slicer +import com.intellij.codeInsight.Nullability import com.intellij.ide.util.treeView.AbstractTreeStructure import com.intellij.openapi.actionSystem.DefaultActionGroup import com.intellij.psi.PsiElement @@ -27,8 +28,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny import org.jetbrains.kotlin.idea.references.KtReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.slicer.compat.PsiElement_N183_NN191 -import org.jetbrains.kotlin.idea.util.compat.Nullability -import org.jetbrains.kotlin.idea.util.compat.SliceNullnessAnalyzerBaseEx import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.isPlainWithEscapes import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf @@ -50,8 +49,8 @@ class KotlinSliceProvider : SliceLanguageSupportProvider, SliceUsageTransformer val leafAnalyzer by lazy { SliceLeafAnalyzer(LEAF_ELEMENT_EQUALITY, this) } val nullnessAnalyzer: SliceNullnessAnalyzerBase by lazy { - object : SliceNullnessAnalyzerBaseEx(LEAF_ELEMENT_EQUALITY, this) { - override fun checkNullabilityEx(element: PsiElement?): Nullability { + object : SliceNullnessAnalyzerBase(LEAF_ELEMENT_EQUALITY, this) { + override fun checkNullability(element: PsiElement?): Nullability { val types = when (element) { is KtCallableDeclaration -> listOfNotNull((element.resolveToDescriptorIfAny() as? CallableDescriptor)?.returnType) is KtDeclaration -> emptyList() diff --git a/idea/src/org/jetbrains/kotlin/idea/util/PopupChooserBuilderWrapper.kt b/idea/src/org/jetbrains/kotlin/idea/util/PopupChooserBuilderWrapper.kt deleted file mode 100644 index 2e07056337f..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/util/PopupChooserBuilderWrapper.kt +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.util - -import com.intellij.openapi.ui.popup.PopupChooserBuilder -import javax.swing.JList - -// BUNCH: 181 -@Suppress("IncompatibleAPI") -class PopupChooserBuilderWrapper(list: JList): PopupChooserBuilder(list) \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/util/compat/Nullability.kt b/idea/src/org/jetbrains/kotlin/idea/util/compat/Nullability.kt deleted file mode 100644 index 9db3a80d53b..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/util/compat/Nullability.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("MissingRecentApi", "IncompatibleAPI") - -package org.jetbrains.kotlin.idea.util.compat - -import com.intellij.codeInsight.Nullability as IntellijNullability -import com.intellij.codeInspection.dataFlow.DfaUtil -import com.intellij.psi.PsiElement -import com.intellij.psi.PsiMethod -import com.intellij.psi.PsiVariable -import com.intellij.slicer.SliceLanguageSupportProvider -import com.intellij.slicer.SliceLeafEquality -import com.intellij.slicer.SliceNullnessAnalyzerBase - -// BUNCH: 181 -typealias Nullability = IntellijNullability - -// BUNCH: 181 -fun dfaCheckNullability(variable: PsiVariable?, context: PsiElement?): Nullability = - DfaUtil.checkNullability(variable, context) - -// BUNCH: 181 -fun dfaInferMethodNullability(method: PsiMethod): Nullability = - DfaUtil.inferMethodNullability(method) - -// BUNCH: 181 -abstract class SliceNullnessAnalyzerBaseEx( - leafEquality: SliceLeafEquality, - provider: SliceLanguageSupportProvider -) : SliceNullnessAnalyzerBase(leafEquality, provider) { - override fun checkNullability(element: PsiElement?): Nullability { - return checkNullabilityEx(element) - } - - abstract fun checkNullabilityEx(element: PsiElement?): Nullability -} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java index 3035b5b927a..99fd7ba25f3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java @@ -10,7 +10,7 @@ import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; -import org.jetbrains.kotlin.test.HierarchyViewTestFixture; +import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture; import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner; import org.junit.runner.RunWith; diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt index 24dc18d65a1..5a99a1cefe0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt @@ -221,9 +221,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { private fun createTestModuleByName(name: String): Module { val newModuleDir = runWriteAction { VfsUtil.createDirectoryIfMissing(project.baseDir, name) } - - // BUNCH: 181 - @Suppress("IncompatibleAPI") val newModule = createModuleAt(name, project, JavaModuleType.getModuleType(), newModuleDir.path) + val newModule = createModuleAt(name, project, JavaModuleType.getModuleType(), newModuleDir.path) // Return type was changed, but it's not used. BUNCH: 183 @Suppress("MissingRecentApi") diff --git a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt deleted file mode 100644 index 28d16fc3c2f..00000000000 --- a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixture.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.test - -import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture - -// BUNCH: 181 -@Suppress("IncompatibleAPI") -class HierarchyViewTestFixture : HierarchyViewTestFixture() \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java b/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java deleted file mode 100644 index 10d1bca9137..00000000000 --- a/idea/tests/org/jetbrains/kotlin/test/HierarchyViewTestFixtureCompat.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license - * that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.test; - -import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; -import com.intellij.ide.hierarchy.HierarchyTreeStructure; -import com.intellij.openapi.util.JDOMUtil; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.junit.Assert; - -import java.util.*; - -/** - * Copied from com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestFixture for compatibility reasons. - * - * Use org.jetbrains.kotlin.test.HierarchyViewTestFixture typealias instead. - * - * BUNCH: 181 - */ -@SuppressWarnings("ALL") -public class HierarchyViewTestFixtureCompat { - private static final String NODE_ELEMENT_NAME = "node"; - private static final String ANY_NODES_ELEMENT_NAME = "any"; - private static final String TEXT_ATTR_NAME = "text"; - private static final String BASE_ATTR_NAME = "base"; - - public void doHierarchyTest(@NotNull HierarchyTreeStructure treeStructure, - @NotNull String expectedStructure) { - try { - checkHierarchyTreeStructure(treeStructure, JDOMUtil.load(expectedStructure)); - } - catch (Throwable e) { - Assert.assertEquals("XML structure comparison for your convenience, actual failure details BELOW", - expectedStructure, dump(treeStructure, null, 0)); - //noinspection CallToPrintStackTrace - e.printStackTrace(); - } - } - - @NotNull - public static String dump(@NotNull HierarchyTreeStructure treeStructure, - @Nullable HierarchyNodeDescriptor descriptor, - int level) { - StringBuilder s = new StringBuilder(); - dump(treeStructure, descriptor, level, s); - return s.toString(); - } - - private static void dump(@NotNull HierarchyTreeStructure treeStructure, - @Nullable HierarchyNodeDescriptor descriptor, - int level, - @NotNull StringBuilder b) { - if (level > 10) { - for (int i = 0; i < level; i++) b.append(" "); - b.append("\n"); - return; - } - if (descriptor == null) descriptor = (HierarchyNodeDescriptor)treeStructure.getRootElement(); - for (int i = 0; i < level; i++) b.append(" "); - descriptor.update(); - b.append(" 0) { - b.append(">\n"); - for (Object o : children) { - HierarchyNodeDescriptor d = (HierarchyNodeDescriptor)o; - dump(treeStructure, d, level + 1, b); - } - for (int i = 0; i < level; i++) b.append(" "); - b.append("\n"); - } - else { - b.append("/>\n"); - } - } - - private static void checkHierarchyTreeStructure(@NotNull HierarchyTreeStructure treeStructure, - @Nullable Element rootElement) { - HierarchyNodeDescriptor rootNodeDescriptor = (HierarchyNodeDescriptor)treeStructure.getRootElement(); - rootNodeDescriptor.update(); - if (rootElement == null || !NODE_ELEMENT_NAME.equals(rootElement.getName())) { - throw new IllegalArgumentException("Incorrect root element in verification resource"); - } - checkNodeDescriptorRecursively(treeStructure, rootNodeDescriptor, rootElement); - } - - private static void checkNodeDescriptorRecursively(@NotNull HierarchyTreeStructure treeStructure, - @NotNull HierarchyNodeDescriptor descriptor, - @NotNull Element expectedElement) { - checkBaseNode(treeStructure, descriptor, expectedElement); - checkContent(descriptor, expectedElement); - checkChildren(treeStructure, descriptor, expectedElement); - } - - private static void checkBaseNode(@NotNull HierarchyTreeStructure treeStructure, - @NotNull HierarchyNodeDescriptor descriptor, - @NotNull Element expectedElement) { - String baseAttrValue = expectedElement.getAttributeValue(BASE_ATTR_NAME); - HierarchyNodeDescriptor baseDescriptor = treeStructure.getBaseDescriptor(); - boolean mustBeBase = "true".equalsIgnoreCase(baseAttrValue); - Assert.assertTrue("Incorrect base node", mustBeBase ? baseDescriptor == descriptor : baseDescriptor != descriptor); - } - - private static void checkContent(@NotNull HierarchyNodeDescriptor descriptor, - @NotNull Element expectedElement) { - Assert.assertEquals(expectedElement.getAttributeValue(TEXT_ATTR_NAME), descriptor.getHighlightedText().getText()); - } - - private static void checkChildren(@NotNull HierarchyTreeStructure treeStructure, - @NotNull HierarchyNodeDescriptor descriptor, - @NotNull Element element) { - if (element.getChild(ANY_NODES_ELEMENT_NAME) != null) { - return; - } - - Object[] children = treeStructure.getChildElements(descriptor); - //noinspection unchecked - List expectedChildren = new ArrayList<>(element.getChildren(NODE_ELEMENT_NAME)); - - StringBuilder messageBuilder = new StringBuilder("Actual children of [" + descriptor.getHighlightedText().getText() + "]:\n"); - for (Object child : children) { - HierarchyNodeDescriptor nodeDescriptor = (HierarchyNodeDescriptor)child; - nodeDescriptor.update(); - messageBuilder.append(" [").append(nodeDescriptor.getHighlightedText().getText()).append("]\n"); - } - Assert.assertEquals(messageBuilder.toString(), expectedChildren.size(), children.length); - - Arrays.sort(children, Comparator.comparing(child -> ((HierarchyNodeDescriptor)child).getHighlightedText().getText())); - - Collections.sort(expectedChildren, Comparator.comparing(child -> child.getAttributeValue(TEXT_ATTR_NAME))); - - //noinspection unchecked - Iterator iterator = expectedChildren.iterator(); - for (Object child : children) { - checkNodeDescriptorRecursively(treeStructure, ((HierarchyNodeDescriptor)child), iterator.next()); - } - } -} diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt index da84ec1681d..e76847e408b 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt @@ -335,8 +335,6 @@ open class DelegatingProgressIndicator : WrappedProgressIndicator, StandardProgr } constructor() { - // BUNCH: 181 - @Suppress("IncompatibleAPI") val indicator: ProgressIndicator? = ProgressManager.getInstance().progressIndicator delegate = indicator ?: EmptyProgressIndicator() } diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt index d8f348eb2cc..4adb66fd699 100644 --- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt +++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/AndroidExtensionsReferenceSearchExecutor.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiReference import com.intellij.psi.search.LocalSearchScope import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.xml.XmlAttributeValue -import org.jetbrains.kotlin.compatibility.ExecutorProcessor +import com.intellij.util.Processor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.references.KtSimpleNameReference @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.source.getPsi class AndroidExtensionsReferenceSearchExecutor : QueryExecutorBase(true) { - override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: ExecutorProcessor) { + override fun processQuery(queryParameters: ReferencesSearch.SearchParameters, consumer: Processor) { val elementToSearch = queryParameters.elementToSearch as? XmlAttributeValue ?: return val scopeElements = (queryParameters.effectiveSearchScope as? LocalSearchScope)?.scope ?: return val referenceName = elementToSearch.value?.substringAfterLast("/") ?: return