azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: "simplify negated binary expression" is now an inspection

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-12-20 20:41:50 +03:00
parent 35d85ddd1f
commit bc361363d5
56 changed files with 292 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/.inspection
Vendored
+1
View File
@@ -0,0 +1 @@
org.jetbrains.kotlin.idea.inspections.SimplifyNegatedBinaryExpressionInspection
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/equals.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '==' expression to '!='
fun test(n: Int) {
<caret>!(0 == 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/equals.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '==' expression to '!='
fun test(n: Int) {
0 != 1
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/greaterThan.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '>' expression to '<='
fun test(n: Int) {
<caret>!(0 > 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/greaterThan.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '>' expression to '<='
fun test(n: Int) {
0 <= 1
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '>=' expression to '<'
fun test(n: Int) {
<caret>!(0 >= 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '>=' expression to '<'
fun test(n: Int) {
0 < 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/in.kt → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/in.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// INTENTION_TEXT: Simplify negated 'in' expression to '!in'
// FIX: Simplify negated 'in' expression to '!in'
class A(val e: Int) {
operator fun contains(i: Int): Boolean = e == i
}
idea/testData/intentions/simplifyNegatedBinaryExpression/in.kt.after → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/in.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// INTENTION_TEXT: Simplify negated 'in' expression to '!in'
// FIX: Simplify negated 'in' expression to '!in'
class A(val e: Int) {
operator fun contains(i: Int): Boolean = e == i
}
idea/testData/intentions/simplifyNegatedBinaryExpression/inapplicableBinaryOperation.kt → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inapplicableBinaryOperation.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IS_APPLICABLE: false
// PROBLEM: none
infix fun Int.lt(b: Int): Boolean = this < b
fun test(n: Int) {
<caret>!(1 lt 2)
idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/expected.xml → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inspectionData/expected.xml
Vendored
+20 -20
View File
@@ -5,8 +5,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/notIs.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '!is' expression to 'is'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -14,8 +14,8 @@
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/notIn.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '!in' expression to 'in'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -23,8 +23,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/notEquals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '!=' expression to '=='</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -32,8 +32,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/lessThanOrEquals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '&lt;=' expression to '&gt;'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -41,8 +41,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/lessThan.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '&lt;' expression to '&gt;='</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -50,8 +50,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/is.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated 'is' expression to '!is'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -59,8 +59,8 @@
<line>8</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/in.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated 'in' expression to '!in'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -68,8 +68,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/greaterThanOrEquals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '&gt;=' expression to '&lt;'</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -77,8 +77,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/greaterThan.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '&gt;' expression to '&lt;='</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
<problem>
@@ -86,8 +86,8 @@
<line>3</line>
<module>light_idea_test_case</module>
<entry_point TYPE="file" FQNAME="temp:///src/equals.kt" />
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Simplify Negated Binary Expression</problem_class>
<description>Simplify negated '==' expression to '!='</description>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Negated boolean expression that can be simplified</problem_class>
<description>Negated expression can be simplified</description>
</problem>
</problems>
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inspectionData/inspections.test
Vendored
+1
View File
@@ -0,0 +1 @@
// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.SimplifyNegatedBinaryExpressionInspection
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/is.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated 'is' expression to '!is'
fun test(n: Int) {
<caret>!(0 is Int)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/is.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated 'is' expression to '!is'
fun test(n: Int) {
0 !is Int
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/lessThan.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '<' expression to '>='
fun test(n: Int) {
<caret>!(0 < 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/lessThan.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '<' expression to '>='
fun test(n: Int) {
0 >= 1
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/lessThanOrEquals.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '<=' expression to '>'
fun test(n: Int) {
<caret>!(0 <= 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/lessThanOrEquals.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '<=' expression to '>'
fun test(n: Int) {
0 > 1
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notEquals.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '!=' expression to '=='
fun test(n: Int) {
<caret>!(0 != 1)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notEquals.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '!=' expression to '=='
fun test(n: Int) {
0 == 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notIn.kt → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notIn.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// INTENTION_TEXT: Simplify negated '!in' expression to 'in'
// FIX: Simplify negated '!in' expression to 'in'
class A(val e: Int) {
operator fun contains(i: Int): Boolean = e == i
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notIn.kt.after → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notIn.kt.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// INTENTION_TEXT: Simplify negated '!in' expression to 'in'
// FIX: Simplify negated '!in' expression to 'in'
class A(val e: Int) {
operator fun contains(i: Int): Boolean = e == i
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notIs.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '!is' expression to 'is'
fun test(n: Int) {
<caret>!(0 !is Int)
}
idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/notIs.kt.after
Vendored
+4
View File
@@ -0,0 +1,4 @@
// FIX: Simplify negated '!is' expression to 'is'
fun test(n: Int) {
0 is Int
}
idea/testData/intentions/simplifyNegatedBinaryExpression/simpleInvert.kt → idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/simpleInvert.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IS_APPLICABLE: false
// PROBLEM: none
fun test(n: Int) {
!<caret>true
}
idea/testData/intentions/simplifyNegatedBinaryExpression/.intention
Vendored
-1
View File
@@ -1 +0,0 @@
org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention
idea/testData/intentions/simplifyNegatedBinaryExpression/equals.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '==' expression to '!='
fun test(n: Int) {
!<caret>(0 == 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/equals.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '==' expression to '!='
fun test(n: Int) {
0 != 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThan.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '>' expression to '<='
fun test(n: Int) {
!<caret>(0 > 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThan.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '>' expression to '<='
fun test(n: Int) {
0 <= 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '>=' expression to '<'
fun test(n: Int) {
<caret>!(0 >= 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/greaterThanOrEquals.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '>=' expression to '<'
fun test(n: Int) {
0 < 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/inspectionData/inspections.test
Vendored
-1
View File
@@ -1 +0,0 @@
// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionInspection
idea/testData/intentions/simplifyNegatedBinaryExpression/is.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated 'is' expression to '!is'
fun test(n: Int) {
<caret>!(0 is Int)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/is.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated 'is' expression to '!is'
fun test(n: Int) {
0 !is Int
}
idea/testData/intentions/simplifyNegatedBinaryExpression/lessThan.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '<' expression to '>='
fun test(n: Int) {
<caret>!(0 < 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/lessThan.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '<' expression to '>='
fun test(n: Int) {
0 >= 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/lessThanOrEquals.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '<=' expression to '>'
fun test(n: Int) {
<caret>!(0 <= 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/lessThanOrEquals.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '<=' expression to '>'
fun test(n: Int) {
0 > 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notEquals.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '!=' expression to '=='
fun test(n: Int) {
<caret>!(0 != 1)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notEquals.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '!=' expression to '=='
fun test(n: Int) {
0 == 1
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notIs.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '!is' expression to 'is'
fun test(n: Int) {
<caret>!(0 !is Int)
}
idea/testData/intentions/simplifyNegatedBinaryExpression/notIs.kt.after
Vendored
-4
View File
@@ -1,4 +0,0 @@
// INTENTION_TEXT: Simplify negated '!is' expression to 'is'
fun test(n: Int) {
0 is Int
}