Skip to content

Commit f7fa5b7

Browse files
committed
Get rid of KotlinQuickFixUtil: use QuickFixUtil from ide-common
1 parent abec556 commit f7fa5b7

File tree

3 files changed

+3
-66
lines changed

3 files changed

+3
-66
lines changed

kotlin-bundled-compiler/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ Export-Package: com.google.common.base,
267267
org.jetbrains.kotlin.frontend.java.di,
268268
org.jetbrains.kotlin.idea,
269269
org.jetbrains.kotlin.idea.codeInsight,
270+
org.jetbrains.kotlin.idea.core.quickfix,
270271
org.jetbrains.kotlin.idea.resolve,
271272
org.jetbrains.kotlin.idea.util,
272273
org.jetbrains.kotlin.incremental.components,

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/quickassist/KotlinChangeReturnTypeProposal.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
2222
import org.jetbrains.kotlin.psi.KtCallExpression
2323
import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
2424
import org.jetbrains.kotlin.psi.KtFunctionLiteral
25+
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
2526

2627
class KotlinChangeReturnTypeProposal : KotlinQuickAssistProposal() {
2728
private lateinit var function: KtFunction
@@ -100,7 +101,7 @@ class KotlinChangeReturnTypeProposal : KotlinQuickAssistProposal() {
100101
if (ktFunction !is KtFunction) return false
101102

102103
return when {
103-
KotlinQuickFixUtil.canFunctionOrGetterReturnExpression(ktFunction, expression) -> {
104+
QuickFixUtil.canFunctionOrGetterReturnExpression(ktFunction, expression) -> {
104105
val scope = ktFunction.getResolutionScope(bindingContext)
105106
type = expressionType.approximateWithResolvableType(scope, false)
106107
function = ktFunction

kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/quickassist/KotlinQuickFixUtil.java

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)