jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-04-14 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Control Flow: Fix CFG usage info for double-colon expressions

Browse Source 
#KT-12551 Fixed
 #KT-17092 Fixed
This commit is contained in:
Alexey Sedunov
2017-07-06 16:15:21 +03:00
parent 216b28ec55
commit 2e76a76088
7 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.kt
View File

@@ -1450,9 +1450,8 @@ class ControlFlowProcessor(private val trace: BindingTrace) {
val receiverExpression = expression.receiverExpression
if (receiverExpression != null &&
trace.bindingContext.get(BindingContext.DOUBLE_COLON_LHS, receiverExpression) is DoubleColonLHS.Expression) {
// TODO: UNUSED_EXPRESSION is not reported on the whole expression, see KT-12551
generateInstructions(receiverExpression)
createSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression)
createNonSyntheticValue(expression, MagicKind.BOUND_CALLABLE_REFERENCE, receiverExpression)
}
else {
createNonSyntheticValue(expression, MagicKind.UNBOUND_CALLABLE_REFERENCE)

2
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt
View File

@@ -134,7 +134,7 @@ enum class MagicKind(val sideEffectFree: Boolean = false) {
IS(),
CAST(),
UNBOUND_CALLABLE_REFERENCE(true),
BOUND_CALLABLE_REFERENCE(),
BOUND_CALLABLE_REFERENCE(true),
// implicit operations
LOOP_RANGE_ITERATION(),
IMPLICIT_RECEIVER(),

9
compiler/testData/diagnostics/tests/callableReference/bound/controlFlow.kt vendored
View File

@@ -1,7 +1,6 @@
fun unusedExpression(s: String) {
// TODO: report UNUSED_EXPRESSION (KT-12551)
s::hashCode
s::class
<!UNUSED_EXPRESSION!>s::hashCode<!>
<!UNUSED_EXPRESSION!>s::class<!>
}
fun noUnusedParameter(s: String): Int {
@@ -10,13 +9,13 @@ fun noUnusedParameter(s: String): Int {
}
fun unreachableCode(): Int {
(if (true) return 1 else return 0)::toString
(if (true) return 1 else return 0)<!UNREACHABLE_CODE!>::toString<!>
<!UNREACHABLE_CODE!>return 0<!>
}
fun unreachableCodeInLoop(): Int {
while (true) {
(break)::toString
(break)<!UNREACHABLE_CODE!>::toString<!>
<!UNREACHABLE_CODE!>return 1<!>
}
return 2

2
compiler/testData/diagnostics/tests/classLiteral/integerValueType.kt vendored
View File

@@ -7,5 +7,5 @@ fun f(<!UNUSED_PARAMETER!>x<!>: KClass<out Int>) {}
fun test() {
f(42::class)
f((40 + 2)::class)
42::toInt
<!UNUSED_EXPRESSION!>42::toInt<!>
}

8
idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt vendored Normal file
View File

@@ -0,0 +1,8 @@
// "Create function 'checkProperty'" "true"
internal object model {
val layer = ""
}
fun main(args: Array<String>) {
<caret>checkProperty(model.layer::class)
}

14
idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after vendored Normal file
View File

@@ -0,0 +1,14 @@
import kotlin.reflect.KClass
// "Create function 'checkProperty'" "true"
internal object model {
val layer = ""
}
fun main(args: Array<String>) {
checkProperty(model.layer::class)
}
fun checkProperty(kClass: KClass<out String>) {
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
}

6
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
View File

@@ -2433,6 +2433,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
doTest(fileName);
}
@TestMetadata("callWithClassLiteral.kt")
public void testCallWithClassLiteral() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt");
doTest(fileName);
}
@TestMetadata("callWithLambdaArg.kt")
public void testCallWithLambdaArg() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt");