[REPL] Copy findLabelAndCall to scripting-ide-services to fix problems with embeddable artifact
This commit is contained in:
committed by
teamcityserver
parent
7caadd87a2
commit
9412fe094b
@@ -28,7 +28,6 @@ dependencies {
|
|||||||
testRuntimeOnly(project(":kotlin-compiler"))
|
testRuntimeOnly(project(":kotlin-compiler"))
|
||||||
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
|
||||||
testRuntimeOnly(project(":idea:ide-common")) { isTransitive = false }
|
testRuntimeOnly(project(":idea:ide-common")) { isTransitive = false }
|
||||||
testRuntimeOnly(project(":idea:idea-frontend-independent")) { isTransitive = false }
|
|
||||||
|
|
||||||
embeddableTestRuntime(project(":kotlin-scripting-ide-services", configuration="runtimeElements"))
|
embeddableTestRuntime(project(":kotlin-scripting-ide-services", configuration="runtimeElements"))
|
||||||
embeddableTestRuntime(project(":kotlin-scripting-compiler-impl-embeddable", configuration="runtimeElements"))
|
embeddableTestRuntime(project(":kotlin-scripting-compiler-impl-embeddable", configuration="runtimeElements"))
|
||||||
|
|||||||
+40
@@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* 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 org.jetbrains.kotlin.name.Name
|
||||||
|
import org.jetbrains.kotlin.psi.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This extension method was copied from `idea:idea-frontend-independent` module because it's the only method that
|
||||||
|
* included in `idea:idea-frontend-independent` and needed for performing REPL completion
|
||||||
|
*/
|
||||||
|
@Suppress("unused")
|
||||||
|
fun KtFunctionLiteral.findLabelAndCall(): Pair<Name?, KtCallExpression?> {
|
||||||
|
val literalParent = (this.parent as KtLambdaExpression).parent
|
||||||
|
|
||||||
|
fun KtValueArgument.callExpression(): KtCallExpression? {
|
||||||
|
val parent = parent
|
||||||
|
return (if (parent is KtValueArgumentList) parent else this).parent as? KtCallExpression
|
||||||
|
}
|
||||||
|
|
||||||
|
when (literalParent) {
|
||||||
|
is KtLabeledExpression -> {
|
||||||
|
val callExpression = (literalParent.parent as? KtValueArgument)?.callExpression()
|
||||||
|
return Pair(literalParent.getLabelNameAsName(), callExpression)
|
||||||
|
}
|
||||||
|
|
||||||
|
is KtValueArgument -> {
|
||||||
|
val callExpression = literalParent.callExpression()
|
||||||
|
val label = (callExpression?.calleeExpression as? KtSimpleNameExpression)?.getReferencedNameAsName()
|
||||||
|
return Pair(label, callExpression)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
return Pair(null, null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user