azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes after rebase on master

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-11-07 19:49:21 +03:00
parent 4915b049c4
commit 109ec11d51
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt
+3 -7
View File
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
import org.jetbrains.kotlin.psi.KtUserType import org.jetbrains.kotlin.psi.KtUserType
import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.resolve.lazy.DefaultImportProvider import org.jetbrains.kotlin.resolve.lazy.DefaultImportProvider
@@ -41,6 +42,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.chainImportingScopes
import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope
import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
import org.jetbrains.kotlin.types.expressions.PreliminaryDeclarationVisitor
import java.util.* import java.util.*
data class ReplaceWith(val pattern: String, val imports: List<String>) data class ReplaceWith(val pattern: String, val imports: List<String>)
@@ -77,13 +79,7 @@ object ReplaceWithAnnotationAnalyzer {
val scope = getResolutionScope(symbolDescriptor, symbolDescriptor, val scope = getResolutionScope(symbolDescriptor, symbolDescriptor,
listOf(explicitImportsScope) + defaultImportsScopes) ?: return null listOf(explicitImportsScope) + defaultImportsScopes) ?: return null
val expressionTypingServices = if (module.builtIns.builtInsModule == module) { val expressionTypingServices = resolutionFacade.getFrontendService(module, ExpressionTypingServices::class.java)
// TODO: doubtful place, do we require this module or not? Built-ins module doesn't have some necessary components...
resolutionFacade.getFrontendService(ExpressionTypingServices::class.java)
}
else {
resolutionFacade.getFrontendService(module, ExpressionTypingServices::class.java)
}
fun analyzeExpression(): BindingContext { fun analyzeExpression(): BindingContext {
return expression.analyzeInContext(scope, expressionTypingServices = expressionTypingServices) return expression.analyzeInContext(scope, expressionTypingServices = expressionTypingServices)