WIP: Porting to <expr> test notation
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionInfoProvider/AbstractIsUsedAsExpressionTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionInfoProvider/AbstractIsUsedAsExpressionTest.kt
index a9626db..fe32eae1 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionInfoProvider/AbstractIsUsedAsExpressionTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/expressionInfoProvider/AbstractIsUsedAsExpressionTest.kt
@@ -15,7 +15,7 @@
abstract class AbstractIsUsedAsExpressionTest : AbstractAnalysisApiSingleFileTest() {
override fun doTestByFileStructure(ktFile: KtFile, module: TestModule, testServices: TestServices) {
- val expression = testServices.expressionMarkerProvider.getElementOfTypAtCaret<KtExpression>(ktFile)
+ val expression = testServices.expressionMarkerProvider.getSelectedElementOfType<KtExpression>(ktFile)
val actual = analyseForTest(expression) {
expression.isUsedAsExpression().toString()
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/argument.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/argument.kt
index 4566559..c8c1886 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/argument.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/argument.kt
@@ -1,6 +1,6 @@
fun println(x: Boolean) {}
fun test(b: Boolean): Int {
- println(<caret>b)
+ println(<expr>b</expr>)
return 54
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/boolean_else.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/boolean_else.kt
index e49cdde..6c88786 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/boolean_else.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/boolean_else.kt
@@ -1,5 +1,5 @@
fun test(b: Boolean) {
- <caret>when(b) {
+ <expr>when(b) {
else -> {}
- }
+ }</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/default_parameter.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/default_parameter.kt
index b56b8c7..63b8e95 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/default_parameter.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/default_parameter.kt
@@ -1,3 +1,3 @@
-fun test(b: Boolean = <caret>true): Int {
+fun test(b: Boolean = <expr>true</expr>): Int {
return 54
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/if_subject.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/if_subject.kt
index b9ecc9e..ab05982 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/if_subject.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/if_subject.kt
@@ -1,5 +1,5 @@
fun test(b: Boolean): Int {
- if (<caret>b) {
+ if (<expr>b</expr>) {
return 54
} else {
return 45
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch.kt
index 94195d4..5705e9d 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch.kt
@@ -1,6 +1,6 @@
fun test(b: Boolean) {
val a = when(b) {
- true -> <caret>5
+ true -> <expr>5</expr>
else -> 0
}
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block.kt
index 7db483a..11b8a42 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block.kt
@@ -1,7 +1,7 @@
fun test(b: Boolean) {
val a = when(b) {
true -> {
- <caret>5
+ <expr>5</expr>
}
else -> 0
}
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block_stmt.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block_stmt.kt
index 1038fb3..e098b46 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block_stmt.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/initializer_when_branch_block_stmt.kt
@@ -1,7 +1,7 @@
fun test(b: Boolean) {
val a = when(b) {
true -> {
- <caret>5
+ <expr>5</expr>
45
}
}
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda.kt
index a94eb59..f0f7f14 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda.kt
@@ -8,5 +8,5 @@
}
fun test(b: Boolean) {
- builder { intFunction<caret>() }
+ builder { <expr>intFunction()</expr> }
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda_multiple_statements.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda_multiple_statements.kt
index 8f39187..6379b71 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda_multiple_statements.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/nonunit_lambda_multiple_statements.kt
@@ -9,7 +9,7 @@
fun test(b: Boolean) {
builder {
- intFunction<caret>()
+ <expr>intFunction()</expr>
intFunction()
}
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_explicit_unit.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_explicit_unit.kt
index ae46ca0..e4442d0 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_explicit_unit.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_explicit_unit.kt
@@ -1,3 +1,3 @@
fun test(): Unit {
- return <caret>Unit
+ return <expr>Unit</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_implicit_unit.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_implicit_unit.kt
index e195b9c..796f029 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_implicit_unit.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_implicit_unit.kt
@@ -1,3 +1,3 @@
fun test(): Unit = {
- <caret>Unit
+ <expr>Unit</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_value.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_value.kt
index fda8dd9..e94dd2e 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_value.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/return_value.kt
@@ -1,3 +1,3 @@
fun test(b: Boolean): Int {
- return <caret>5
+ return <expr>5</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/run_block.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/run_block.kt
index 9cb5b2c..ed6f606 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/run_block.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/run_block.kt
@@ -1,5 +1,5 @@
fun test(b: Boolean) {
run {
- <caret>5
+ <expr>5</expr>
}
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw.kt
index 128fc17..cb87245 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw.kt
@@ -1,5 +1,5 @@
import java.lang.Exception
fun test() {
- throw Exception<caret>()
+ throw <expr>Exception()</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw_if_branch.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw_if_branch.kt
index 6567e4d..6d5764d 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw_if_branch.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/throw_if_branch.kt
@@ -1,5 +1,5 @@
import java.lang.Exception
fun test(b: Boolean) {
- throw if (b) { Exception<caret>() } else { Exception() }
+ throw if (b) { <expr>Exception()</expr> } else { Exception() }
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/try_catch_binop.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/try_catch_binop.kt
index 5689700..fa033c2 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/try_catch_binop.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/try_catch_binop.kt
@@ -1,6 +1,6 @@
import java.lang.Exception
fun test() {
- <caret>try { throw Exception() } finally { return } + 4
+ <expr>try { throw Exception() } finally { return }</expr> + 4
return
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda.kt
index 440bb92..462abfc 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda.kt
@@ -8,5 +8,5 @@
}
fun test(b: Boolean) {
- builder { unitFunction<caret>() }
+ builder { <expr>unitFunction()</expr> }
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda_nonunit_function.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda_nonunit_function.kt
index 76a7776..fdf00b0 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda_nonunit_function.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/unit_lambda_nonunit_function.kt
@@ -8,5 +8,5 @@
}
fun test(b: Boolean) {
- builder { nonunitFunction<caret>() }
+ builder { <expr>nonunitFunction()</expr> }
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/value_initializer.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/value_initializer.kt
index b6e3186..dae0dc6 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/value_initializer.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/value_initializer.kt
@@ -1,4 +1,4 @@
fun test(b: Boolean): Int {
- val a = <caret>54
+ val a = <expr>54</expr>
return a
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/var_reassignment_if.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/var_reassignment_if.kt
index 5eee9fa..8a9dc5f 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/var_reassignment_if.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/var_reassignment_if.kt
@@ -1,7 +1,7 @@
var a = 5
-fun foo() = <caret>if (true) {
+fun foo() = <expr>if (true) {
a = 6
} else {
a = 8
-}
\ No newline at end of file
+}</expr>
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when.kt
index 8e1d08f..212f88d 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when.kt
@@ -1,6 +1,6 @@
fun test(b: Boolean) {
- <caret>when(b) {
+ <expr>when(b) {
true -> 5
else -> 0
- }
+ }</expr>
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_branch.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_branch.kt
index e921155..af2a3211 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_branch.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_branch.kt
@@ -1,6 +1,6 @@
fun test(b: Boolean) {
when(b) {
- true -> <caret>5
+ true -> <expr>5</expr>
else -> 0
}
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject.kt
index c7af3d7..557ca62 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject.kt
@@ -1,5 +1,5 @@
fun test(b: Boolean) {
- when(<caret>b) {
+ when(<expr>b</expr>) {
else -> {}
}
}
\ No newline at end of file
diff --git a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject_with_branches.kt b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject_with_branches.kt
index 35e4819..9894986 100644
--- a/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject_with_branches.kt
+++ b/analysis/analysis-api/testData/components/expressionInfoProvider/isUsedAsExpression/when_subject_with_branches.kt
@@ -1,5 +1,5 @@
fun test(b: Boolean) {
- when(<caret>b) {
+ when(<expr>b</expr>) {
true -> 5
else -> {}
}
