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

Deprecate KtElement.analyzeFullyAndGetResult(), use analyzeAndGetResult

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-02-14 14:43:49 +03:00
parent cd1745d354
commit 8c97f8cbb5
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt
+3 -3
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getTypeInfoForTypeArguments
@@ -41,7 +41,7 @@ object CreateClassFromConstructorCallActionFactory: CreateClassFromUsageFactory<
override fun getPossibleClassKinds(element: KtCallExpression, diagnostic: Diagnostic): List<ClassKind> {
val inAnnotationEntry = diagnostic.psiElement.getNonStrictParentOfType<KtAnnotationEntry>() != null
val (context, moduleDescriptor) = element.analyzeFullyAndGetResult()
val (context, moduleDescriptor) = element.analyzeAndGetResult()
val call = element.getCall(context) ?: return emptyList()
val targetParents = getTargetParentsByCall(call, context).ifEmpty { return emptyList() }
@@ -71,7 +71,7 @@ object CreateClassFromConstructorCallActionFactory: CreateClassFromUsageFactory<
val fullCallExpr =
if (callParent is KtQualifiedExpression && callParent.selectorExpression == callExpr) callParent else callExpr
val (context, moduleDescriptor) = callExpr.analyzeFullyAndGetResult()
val (context, moduleDescriptor) = callExpr.analyzeAndGetResult()
val call = callExpr.getCall(context) ?: return null
val targetParents = getTargetParentsByCall(call, context).ifEmpty { return null }
idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt
+3 -3
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.Diagnostic
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.*
@@ -59,7 +59,7 @@ object CreateClassFromReferenceExpressionActionFactory : CreateClassFromUsageFac
val name = element.getReferencedName()
val (context, moduleDescriptor) = element.analyzeFullyAndGetResult()
val (context, moduleDescriptor) = element.analyzeAndGetResult()
val fullCallExpr = getFullCallExpression(element) ?: return Collections.emptyList()
@@ -116,7 +116,7 @@ object CreateClassFromReferenceExpressionActionFactory : CreateClassFromUsageFac
override fun extractFixData(element: KtSimpleNameExpression, diagnostic: Diagnostic): ClassInfo? {
val name = element.getReferencedName()
val (context, moduleDescriptor) = element.analyzeFullyAndGetResult()
val (context, moduleDescriptor) = element.analyzeAndGetResult()
val fullCallExpr = getFullCallExpression(element) ?: return null