[NI] Fix infinite completion of arguments in AllCandidates mode

See AutoImports#testFactoryFunctionFromLambda for example
This commit is contained in:
Mikhail Zarechenskiy
2018-02-13 01:43:36 +03:00
parent e017e9cb5f
commit c4cfd07fe9
2 changed files with 14 additions and 29 deletions
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2000-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.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.resolve.calls.components package org.jetbrains.kotlin.resolve.calls.components
@@ -89,7 +78,7 @@ class KotlinCallCompleter(
diagnosticsHolder, diagnosticsHolder,
candidate.getSystem(), candidate.getSystem(),
resolutionCallbacks, resolutionCallbacks,
skipPostponedArguments = true collectAllCandidatesMode = true
) )
} }
return CallResolutionResult(CallResolutionResult.Type.ALL_CANDIDATES, null, emptyList(), ConstraintStorage.Empty, candidates) return CallResolutionResult(CallResolutionResult.Type.ALL_CANDIDATES, null, emptyList(), ConstraintStorage.Empty, candidates)
@@ -101,7 +90,7 @@ class KotlinCallCompleter(
diagnosticsHolder: KotlinDiagnosticsHolder, diagnosticsHolder: KotlinDiagnosticsHolder,
constraintSystem: NewConstraintSystem, constraintSystem: NewConstraintSystem,
resolutionCallbacks: KotlinResolutionCallbacks, resolutionCallbacks: KotlinResolutionCallbacks,
skipPostponedArguments: Boolean = false collectAllCandidatesMode: Boolean = false
) { ) {
val returnType = resolvedCallAtom.freshReturnType ?: constraintSystem.builtIns.unitType val returnType = resolvedCallAtom.freshReturnType ?: constraintSystem.builtIns.unitType
kotlinConstraintSystemCompleter.runCompletion( kotlinConstraintSystemCompleter.runCompletion(
@@ -110,7 +99,9 @@ class KotlinCallCompleter(
resolvedCallAtom, resolvedCallAtom,
returnType returnType
) { ) {
if (!skipPostponedArguments) { if (collectAllCandidatesMode) {
it.setEmptyAnalyzedResults()
} else {
postponedArgumentsAnalyzer.analyze( postponedArgumentsAnalyzer.analyze(
constraintSystem.asPostponedArgumentsAnalyzerContext(), constraintSystem.asPostponedArgumentsAnalyzerContext(),
resolutionCallbacks, resolutionCallbacks,
@@ -1,17 +1,6 @@
/* /*
* Copyright 2010-2017 JetBrains s.r.o. * Copyright 2000-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.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.jetbrains.kotlin.resolve.calls.model package org.jetbrains.kotlin.resolve.calls.model
@@ -56,6 +45,11 @@ sealed class ResolvedAtom {
this.subResolvedAtoms = subResolvedAtoms this.subResolvedAtoms = subResolvedAtoms
} }
// For AllCandidates mode to avoid analyzing postponed arguments
fun setEmptyAnalyzedResults() {
setAnalyzedResults(emptyList())
}
} }
abstract class ResolvedCallAtom : ResolvedAtom() { abstract class ResolvedCallAtom : ResolvedAtom() {