diff --git a/idea/resources-en/inspectionDescriptions/ConvertInitializedValToNonNullType.html b/idea/resources-en/inspectionDescriptions/ConvertInitializedValToNonNullType.html deleted file mode 100644 index 5337dde721b..00000000000 --- a/idea/resources-en/inspectionDescriptions/ConvertInitializedValToNonNullType.html +++ /dev/null @@ -1,5 +0,0 @@ - - -This inspection reports nullable type of initialized 'val' should be converted into non-nullable type. - - diff --git a/idea/resources-en/messages/KotlinBundle.properties b/idea/resources-en/messages/KotlinBundle.properties index c678bc4b760..5360f43ae9f 100644 --- a/idea/resources-en/messages/KotlinBundle.properties +++ b/idea/resources-en/messages/KotlinBundle.properties @@ -1359,8 +1359,6 @@ condition.is.always.0=Condition is always ''{0}'' remove.fix.text=Delete expression simplify.fix.text=Simplify expression 0.has.empty.body=''{0}'' has empty body -initialized.val.should.be.converted.to.non.null.type=Initialized ''val'' should be converted to non-null type -convert.initialized.val.to.non.null.type.quick.fix.text=Convert initialized ''val'' to non-null type convert.na.n.equality.quick.fix.text=Replace with 'isNaN()' equality.check.with.nan.should.be.replaced.with.isnan=Equality check with NaN should be replaced with 'isNaN()' convert.pair.constructor.to.to.fix.text=Convert to 'to' @@ -2001,7 +1999,7 @@ action.ConfigureKotlinJsInProject.text=Configure Kotlin (JavaScript) in Project action.ConfigureKotlinInProject.text=Configure Kotlin in Project action.KotlinConsoleREPL.text=Kotlin REPL action.LibraryToSourceDependencySupportToggleAction.text=Toggle library to source dependency support -inspection.convert.initialized.val.to.non.null.type.display.name=Convert initialized 'val' to non-null type + inspection.unused.unary.operator.display.name=Unused unary operator inspection.incomplete.destructuring.declaration.display.name=Incomplete destructuring declaration inspection.replace.guard.clause.with.function.call.display.name=Replace guard clause with kotlin's function call diff --git a/idea/resources/META-INF/inspections.xml b/idea/resources/META-INF/inspections.xml index f6ea383e9fa..b23e611b910 100644 --- a/idea/resources/META-INF/inspections.xml +++ b/idea/resources/META-INF/inspections.xml @@ -2503,14 +2503,6 @@ language="kotlin" key="inspection.unused.unary.operator.display.name" bundle="messages.KotlinBundle"/> - - { - return !initializer.isNull() - } - is KtStringTemplateExpression -> { - return true - } - is KtNameReferenceExpression, is KtCallExpression -> { - val context = initializer.analyze(BodyResolveMode.PARTIAL) - val assignedType = initializer.getType(context) ?: return false - return !TypeUtils.isNullableType(assignedType) - } - else -> return false - } - } - } -} - -class RemoveRedundantNullableTypeQuickfix : LocalQuickFix { - override fun getName() = KotlinBundle.message("convert.initialized.val.to.non.null.type.quick.fix.text") - - override fun getFamilyName() = name - - override fun applyFix(project: Project, descriptor: ProblemDescriptor) { - val element = descriptor.psiElement - val factory = KtPsiFactory(project) - element.replace(factory.createType(element.text.removeSuffix("?"))) - } -} diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/.inspection b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/.inspection deleted file mode 100644 index 699cc6de182..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/.inspection +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.kotlin.idea.inspections.ConvertInitializedValToNonNullTypeInspection diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt deleted file mode 100644 index ee74e28354c..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - val s1: String? = bar() -} - -fun bar(): String = "" diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt.after b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt.after deleted file mode 100644 index c8ea1138d18..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt.after +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - val s1: String = bar() -} - -fun bar(): String = "" diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt deleted file mode 100644 index e97453f5a08..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt +++ /dev/null @@ -1,4 +0,0 @@ -fun foo() { - val s0: String = "" - val s1: String? = s0 -} diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt.after b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt.after deleted file mode 100644 index 534c22a4756..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt.after +++ /dev/null @@ -1,4 +0,0 @@ -fun foo() { - val s0: String = "" - val s1: String = s0 -} diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt deleted file mode 100644 index 763191b262e..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun foo() { - val s: String? = "Hello" -} diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt.after b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt.after deleted file mode 100644 index b684aae813d..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt.after +++ /dev/null @@ -1,3 +0,0 @@ -fun foo() { - val s: String = "Hello" -} diff --git a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/negative.kt b/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/negative.kt deleted file mode 100644 index 4719b503902..00000000000 --- a/idea/testData/inspectionsLocal/convertInitializedValToNonNullType/negative.kt +++ /dev/null @@ -1,7 +0,0 @@ -// PROBLEM: none -fun foo() { - val s1: String? = bar() - val s2: String? = null -} - -fun bar(): String? = "" diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 3459257a19d..abd48238dde 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -3485,39 +3485,6 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { } } - @TestMetadata("idea/testData/inspectionsLocal/convertInitializedValToNonNullType") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class ConvertInitializedValToNonNullType extends AbstractLocalInspectionTest { - private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); - } - - public void testAllFilesPresentInConvertInitializedValToNonNullType() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("idea/testData/inspectionsLocal/convertInitializedValToNonNullType"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), null, true); - } - - @TestMetadata("assignToMethodCall.kt") - public void testAssignToMethodCall() throws Exception { - runTest("idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToMethodCall.kt"); - } - - @TestMetadata("assignToVariable.kt") - public void testAssignToVariable() throws Exception { - runTest("idea/testData/inspectionsLocal/convertInitializedValToNonNullType/assignToVariable.kt"); - } - - @TestMetadata("basic.kt") - public void testBasic() throws Exception { - runTest("idea/testData/inspectionsLocal/convertInitializedValToNonNullType/basic.kt"); - } - - @TestMetadata("negative.kt") - public void testNegative() throws Exception { - runTest("idea/testData/inspectionsLocal/convertInitializedValToNonNullType/negative.kt"); - } - } - @TestMetadata("idea/testData/inspectionsLocal/convertNaNEquality") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)