diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java index ce9f6bd9108f..16012bfd69d1 100644 --- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java +++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/KotlinRefactoringUtil.java @@ -431,7 +431,7 @@ public class KotlinRefactoringUtil { KtExpression expression = (KtExpression)element; BindingContext bindingContext = ResolutionUtils.analyze(expression, BodyResolveMode.FULL); KotlinType expressionType = bindingContext.getType(expression); - if (expressionType != null && KotlinBuiltIns.isUnit(expressionType)) { + if (expressionType == null || KotlinBuiltIns.isUnit(expressionType)) { addElement = false; } } diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java index 1bb94bf9265d..1b28cc61e9c0 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java @@ -373,6 +373,12 @@ public class ExtractionTestGenerated extends AbstractExtractionTest { doIntroduceVariableTest(fileName); } + @TestMetadata("skipClassReference.kt") + public void testSkipClassReference() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/skipClassReference.kt"); + doIntroduceVariableTest(fileName); + } + @TestMetadata("StringInjection.kt") public void testStringInjection() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/introduceVariable/StringInjection.kt"); diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt b/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt new file mode 100644 index 000000000000..2ad782dacfef --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt @@ -0,0 +1,6 @@ +// WITH_RUNTIME +import java.util.* + +fun foo() { + Arrays.asList(1, 2, 3) +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt.after new file mode 100644 index 000000000000..18588f7b9c7a --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/introduceVariable/skipClassReference.kt.after @@ -0,0 +1,6 @@ +// WITH_RUNTIME +import java.util.* + +fun foo() { + val asList = Arrays.asList(1, 2, 3) +} \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/smartSelection/simple.kt b/plugins/kotlin/idea/tests/testData/smartSelection/simple.kt index c1942c64cc52..e70d5d0c0d14 100644 --- a/plugins/kotlin/idea/tests/testData/smartSelection/simple.kt +++ b/plugins/kotlin/idea/tests/testData/smartSelection/simple.kt @@ -5,5 +5,4 @@ fun main(args: Array) { 1.0 1.0 + 1 Math.pow(...) -print(...) */