Merge pull request #371 from Stebalien/push-not-in-intention
Add an intention to simplify negated expressions.
This commit is contained in:
Svetlana Isakova
@@ -19,36 +19,33 @@ package org.jetbrains.jet.lexer;
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class JetKeywordToken extends JetToken {
|
||||
public class JetKeywordToken extends JetSingleValueToken {
|
||||
|
||||
/**
|
||||
* Generate keyword (identifier that has a keyword meaning in all possible contexts)
|
||||
*/
|
||||
public static JetKeywordToken keyword(String value) {
|
||||
return new JetKeywordToken(value, false);
|
||||
return keyword(value, value);
|
||||
}
|
||||
|
||||
public static JetKeywordToken keyword(String debugName, String value) {
|
||||
return new JetKeywordToken(debugName, value, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate soft keyword (identifier that has a keyword meaning only in some contexts)
|
||||
*/
|
||||
public static JetKeywordToken softKeyword(String value) {
|
||||
return new JetKeywordToken(value, true);
|
||||
return new JetKeywordToken(value, value, true);
|
||||
}
|
||||
|
||||
private final String myValue;
|
||||
private final boolean myIsSoft;
|
||||
|
||||
private JetKeywordToken(@NotNull @NonNls String value, boolean isSoft) {
|
||||
super(value);
|
||||
myValue = value;
|
||||
private JetKeywordToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value, boolean isSoft) {
|
||||
super(debugName, value);
|
||||
myIsSoft = isSoft;
|
||||
}
|
||||
|
||||
public String getValue() {
|
||||
return myValue;
|
||||
}
|
||||
|
||||
|
||||
public boolean isSoft() {
|
||||
return myIsSoft;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
/*
|
||||
* Copyright 2010-2014 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.lexer;
|
||||
|
||||
import org.jetbrains.annotations.NonNls;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
public class JetSingleValueToken extends JetToken {
|
||||
|
||||
private final String myValue;
|
||||
|
||||
public JetSingleValueToken(@NotNull @NonNls String debugName, @NotNull @NonNls String value) {
|
||||
super(debugName);
|
||||
myValue = value;
|
||||
}
|
||||
|
||||
@NotNull @NonNls
|
||||
public String getValue() {
|
||||
return myValue;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -83,58 +83,56 @@ public interface JetTokens {
|
||||
JetToken LABEL_IDENTIFIER = new JetToken("LABEL_IDENTIFIER");
|
||||
|
||||
JetToken FIELD_IDENTIFIER = new JetToken("FIELD_IDENTIFIER");
|
||||
JetToken LBRACKET = new JetToken("LBRACKET");
|
||||
JetToken RBRACKET = new JetToken("RBRACKET");
|
||||
JetToken LBRACE = new JetToken("LBRACE");
|
||||
JetToken RBRACE = new JetToken("RBRACE");
|
||||
JetToken LPAR = new JetToken("LPAR");
|
||||
JetToken RPAR = new JetToken("RPAR");
|
||||
JetToken DOT = new JetToken("DOT");
|
||||
JetToken PLUSPLUS = new JetToken("PLUSPLUS");
|
||||
JetToken MINUSMINUS = new JetToken("MINUSMINUS");
|
||||
JetToken MUL = new JetToken("MUL");
|
||||
JetToken PLUS = new JetToken("PLUS");
|
||||
JetToken MINUS = new JetToken("MINUS");
|
||||
JetToken EXCL = new JetToken("EXCL");
|
||||
JetToken DIV = new JetToken("DIV");
|
||||
JetToken PERC = new JetToken("PERC");
|
||||
JetToken LT = new JetToken("LT");
|
||||
JetToken GT = new JetToken("GT");
|
||||
JetToken LTEQ = new JetToken("LTEQ");
|
||||
JetToken GTEQ = new JetToken("GTEQ");
|
||||
JetToken EQEQEQ = new JetToken("EQEQEQ");
|
||||
JetToken ARROW = new JetToken("ARROW");
|
||||
JetToken DOUBLE_ARROW = new JetToken("DOUBLE_ARROW");
|
||||
JetToken EXCLEQEQEQ = new JetToken("EXCLEQEQEQ");
|
||||
JetToken EQEQ = new JetToken("EQEQ");
|
||||
JetToken EXCLEQ = new JetToken("EXCLEQ");
|
||||
JetToken EXCLEXCL = new JetToken("EXCLEXCL");
|
||||
JetToken ANDAND = new JetToken("ANDAND");
|
||||
JetToken OROR = new JetToken("OROR");
|
||||
JetToken SAFE_ACCESS = new JetToken("SAFE_ACCESS");
|
||||
JetToken ELVIS = new JetToken("ELVIS");
|
||||
// JetToken MAP = new JetToken("MAP");
|
||||
// JetToken FILTER = new JetToken("FILTER");
|
||||
JetToken QUEST = new JetToken("QUEST");
|
||||
JetToken COLONCOLON = new JetToken("COLONCOLON");
|
||||
JetToken COLON = new JetToken("COLON");
|
||||
JetToken SEMICOLON = new JetToken("SEMICOLON");
|
||||
JetToken RANGE = new JetToken("RANGE");
|
||||
JetToken EQ = new JetToken("EQ");
|
||||
JetToken MULTEQ = new JetToken("MULTEQ");
|
||||
JetToken DIVEQ = new JetToken("DIVEQ");
|
||||
JetToken PERCEQ = new JetToken("PERCEQ");
|
||||
JetToken PLUSEQ = new JetToken("PLUSEQ");
|
||||
JetToken MINUSEQ = new JetToken("MINUSEQ");
|
||||
JetToken NOT_IN = JetKeywordToken.keyword("NOT_IN");
|
||||
JetToken NOT_IS = JetKeywordToken.keyword("NOT_IS");
|
||||
JetToken HASH = new JetToken("HASH");
|
||||
JetToken AT = new JetToken("AT");
|
||||
JetToken ATAT = new JetToken("ATAT");
|
||||
JetSingleValueToken LBRACKET = new JetSingleValueToken("LBRACKET", "[");
|
||||
JetSingleValueToken RBRACKET = new JetSingleValueToken("RBRACKET", "]");
|
||||
JetSingleValueToken LBRACE = new JetSingleValueToken("LBRACE", "{");
|
||||
JetSingleValueToken RBRACE = new JetSingleValueToken("RBRACE", "}");
|
||||
JetSingleValueToken LPAR = new JetSingleValueToken("LPAR", "(");
|
||||
JetSingleValueToken RPAR = new JetSingleValueToken("RPAR", ")");
|
||||
JetSingleValueToken DOT = new JetSingleValueToken("DOT", ".");
|
||||
JetSingleValueToken PLUSPLUS = new JetSingleValueToken("PLUSPLUS", "++");
|
||||
JetSingleValueToken MINUSMINUS = new JetSingleValueToken("MINUSMINUS", "--");
|
||||
JetSingleValueToken MUL = new JetSingleValueToken("MUL", "*");
|
||||
JetSingleValueToken PLUS = new JetSingleValueToken("PLUS", "+");
|
||||
JetSingleValueToken MINUS = new JetSingleValueToken("MINUS", "-");
|
||||
JetSingleValueToken EXCL = new JetSingleValueToken("EXCL", "!");
|
||||
JetSingleValueToken DIV = new JetSingleValueToken("DIV", "/");
|
||||
JetSingleValueToken PERC = new JetSingleValueToken("PERC", "%");
|
||||
JetSingleValueToken LT = new JetSingleValueToken("LT", "<");
|
||||
JetSingleValueToken GT = new JetSingleValueToken("GT", ">");
|
||||
JetSingleValueToken LTEQ = new JetSingleValueToken("LTEQ", "<=");
|
||||
JetSingleValueToken GTEQ = new JetSingleValueToken("GTEQ", ">=");
|
||||
JetSingleValueToken EQEQEQ = new JetSingleValueToken("EQEQEQ", "==");
|
||||
JetSingleValueToken ARROW = new JetSingleValueToken("ARROW", "->");
|
||||
JetSingleValueToken DOUBLE_ARROW = new JetSingleValueToken("DOUBLE_ARROW", "=>");
|
||||
JetSingleValueToken EXCLEQEQEQ = new JetSingleValueToken("EXCLEQEQEQ", "!==");
|
||||
JetSingleValueToken EQEQ = new JetSingleValueToken("EQEQ", "==");
|
||||
JetSingleValueToken EXCLEQ = new JetSingleValueToken("EXCLEQ", "!=");
|
||||
JetSingleValueToken EXCLEXCL = new JetSingleValueToken("EXCLEXCL", "!!");
|
||||
JetSingleValueToken ANDAND = new JetSingleValueToken("ANDAND", "&&");
|
||||
JetSingleValueToken OROR = new JetSingleValueToken("OROR", "||");
|
||||
JetSingleValueToken SAFE_ACCESS = new JetSingleValueToken("SAFE_ACCESS", "?.");
|
||||
JetSingleValueToken ELVIS = new JetSingleValueToken("ELVIS", "?:");
|
||||
JetSingleValueToken QUEST = new JetSingleValueToken("QUEST", "?");
|
||||
JetSingleValueToken COLONCOLON = new JetSingleValueToken("COLONCOLON", "::");
|
||||
JetSingleValueToken COLON = new JetSingleValueToken("COLON", ":");
|
||||
JetSingleValueToken SEMICOLON = new JetSingleValueToken("SEMICOLON", ";");
|
||||
JetSingleValueToken RANGE = new JetSingleValueToken("RANGE", "..");
|
||||
JetSingleValueToken EQ = new JetSingleValueToken("EQ", "=");
|
||||
JetSingleValueToken MULTEQ = new JetSingleValueToken("MULTEQ", "*=");
|
||||
JetSingleValueToken DIVEQ = new JetSingleValueToken("DIVEQ", "/=");
|
||||
JetSingleValueToken PERCEQ = new JetSingleValueToken("PERCEQ", "%=");
|
||||
JetSingleValueToken PLUSEQ = new JetSingleValueToken("PLUSEQ", "+=");
|
||||
JetSingleValueToken MINUSEQ = new JetSingleValueToken("MINUSEQ", "-=");
|
||||
JetKeywordToken NOT_IN = JetKeywordToken.keyword("NOT_IN", "!in");
|
||||
JetKeywordToken NOT_IS = JetKeywordToken.keyword("NOT_IS", "!is");
|
||||
JetSingleValueToken HASH = new JetSingleValueToken("HASH", "#");
|
||||
JetSingleValueToken AT = new JetSingleValueToken("AT", "@");
|
||||
JetSingleValueToken ATAT = new JetSingleValueToken("ATAT", "@@");
|
||||
|
||||
TokenSet LABELS = TokenSet.create(AT, ATAT, LABEL_IDENTIFIER);
|
||||
|
||||
JetToken COMMA = new JetToken("COMMA");
|
||||
JetSingleValueToken COMMA = new JetSingleValueToken("COMMA", ",");
|
||||
|
||||
JetToken EOL_OR_SEMICOLON = new JetToken("EOL_OR_SEMICOLON");
|
||||
JetKeywordToken IMPORT_KEYWORD = JetKeywordToken.softKeyword("import");
|
||||
|
||||
@@ -376,6 +376,7 @@ fun main(args: Array<String>) {
|
||||
model("intentions/attributeCallReplacements/replaceBinaryInfixIntention", testMethod = "doTestReplaceBinaryInfixIntention")
|
||||
model("intentions/attributeCallReplacements/replaceUnaryPrefixIntention", testMethod = "doTestReplaceUnaryPrefixIntention")
|
||||
model("intentions/attributeCallReplacements/replaceInvokeIntention", testMethod = "doTestReplaceInvokeIntention")
|
||||
model("intentions/simplifyNegatedBinaryExpressionIntention", testMethod = "doTestSimplifyNegatedBinaryExpressionIntention")
|
||||
}
|
||||
|
||||
testClass(javaClass<AbstractHierarchyTest>()) {
|
||||
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
if (a != b) {
|
||||
println("Not Equal")
|
||||
}
|
||||
+3
@@ -0,0 +1,3 @@
|
||||
if (<spot>!(a == b)</spot>) {
|
||||
println("Not Equal")
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
<html>
|
||||
<body>
|
||||
This intention simplifies negated binary expressions by replacing expressions such as
|
||||
!(<b>a</b> <small>op</small> <b>b</b>) with <b>a</b> <small>negop</small> <b>b</b>
|
||||
(where <small>op</small> and <small>negop</small> are inverse comparison operators like <b>==</b> and <b>!=</b> or <b>in</b> and <b>!in</b>).
|
||||
</body>
|
||||
</html>
|
||||
@@ -535,6 +535,11 @@
|
||||
<category>Kotlin</category>
|
||||
</intentionAction>
|
||||
|
||||
<intentionAction>
|
||||
<className>org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention</className>
|
||||
<category>Kotlin</category>
|
||||
</intentionAction>
|
||||
|
||||
<intentionAction>
|
||||
<className>org.jetbrains.jet.plugin.intentions.RemoveUnnecessaryParenthesesIntention</className>
|
||||
<category>Kotlin</category>
|
||||
|
||||
@@ -81,6 +81,8 @@ remove.parameter=Remove parameter ''{0}''
|
||||
change.signature.family=Change signature of function/constructor
|
||||
cast.expression.to.type=Cast expression ''{0}'' to ''{1}''
|
||||
cast.expression.family=Cast Expression
|
||||
simplify.negated.binary.expression=Simplify negated ''{0}'' expression to ''{1}''
|
||||
simplify.negated.binary.expression.family=Simplify Negated Binary Expression
|
||||
|
||||
replace.call.error.skipped.defaults=Cannot skip default arguments.
|
||||
replace.call.error.undefined.returntype=Unable to determine the return type.
|
||||
|
||||
+95
@@ -0,0 +1,95 @@
|
||||
/*
|
||||
* Copyright 2010-2014 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.jetbrains.jet.plugin.intentions
|
||||
|
||||
import org.jetbrains.jet.lang.psi.JetPrefixExpression
|
||||
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
|
||||
import org.jetbrains.jet.lexer.JetTokens
|
||||
import org.jetbrains.jet.lang.psi.JetBinaryExpression
|
||||
import org.jetbrains.jet.lang.psi.JetPsiFactory
|
||||
import com.intellij.openapi.editor.Editor
|
||||
import org.jetbrains.jet.lang.psi.JetOperationExpression
|
||||
import org.jetbrains.jet.lang.psi.JetIsExpression
|
||||
import org.jetbrains.jet.lexer.JetToken
|
||||
import org.jetbrains.jet.lang.psi.JetExpression
|
||||
import org.jetbrains.jet.lang.psi.JetPsiUtil
|
||||
import org.jetbrains.jet.lexer.JetSingleValueToken
|
||||
import org.jetbrains.jet.plugin.JetBundle
|
||||
|
||||
|
||||
public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {
|
||||
|
||||
private fun JetPrefixExpression.unparenthesize(): JetExpression? {
|
||||
return (this.getBaseExpression() as? JetParenthesizedExpression)?.getExpression()
|
||||
}
|
||||
|
||||
public fun JetToken.negate(): JetSingleValueToken? = when (this) {
|
||||
JetTokens.IN_KEYWORD -> JetTokens.NOT_IN
|
||||
JetTokens.NOT_IN -> JetTokens.IN_KEYWORD
|
||||
|
||||
JetTokens.IS_KEYWORD -> JetTokens.NOT_IS
|
||||
JetTokens.NOT_IS -> JetTokens.IS_KEYWORD
|
||||
|
||||
JetTokens.EQEQ -> JetTokens.EXCLEQ
|
||||
JetTokens.EXCLEQ -> JetTokens.EQEQ
|
||||
|
||||
JetTokens.LT -> JetTokens.GTEQ
|
||||
JetTokens.GTEQ -> JetTokens.LT
|
||||
|
||||
JetTokens.GT -> JetTokens.LTEQ
|
||||
JetTokens.LTEQ -> JetTokens.GT
|
||||
|
||||
else -> null
|
||||
}
|
||||
|
||||
override fun isApplicableTo(element: JetPrefixExpression): Boolean {
|
||||
if (element.getOperationReference().getReferencedNameElementType() != JetTokens.EXCL) return false
|
||||
|
||||
val expression = element.unparenthesize() as? JetOperationExpression
|
||||
if (!(expression is JetIsExpression || expression is JetBinaryExpression)) return false
|
||||
|
||||
val operation = (JetPsiUtil.getOperationToken(expression) as? JetSingleValueToken) ?: return false
|
||||
val negOperation = operation.negate() ?: return false
|
||||
|
||||
setText(JetBundle.message(key, operation.getValue(), negOperation.getValue()))
|
||||
return true
|
||||
}
|
||||
|
||||
override fun applyTo(element: JetPrefixExpression, editor: Editor) {
|
||||
// Guaranteed to succeed (by isApplicableTo)
|
||||
val expression = element.unparenthesize()!!
|
||||
val invertedOperation = JetPsiUtil.getOperationToken(expression as JetOperationExpression)!!.negate()!!
|
||||
|
||||
element.replace(
|
||||
when (expression) {
|
||||
is JetIsExpression -> JetPsiFactory.createExpression(
|
||||
expression.getProject(),
|
||||
"${expression.getLeftHandSide().getText() ?: ""} ${invertedOperation.getValue()} ${expression.getTypeRef()?.getText() ?: ""}"
|
||||
)
|
||||
is JetBinaryExpression -> JetPsiFactory.createBinaryExpression(
|
||||
expression.getProject(),
|
||||
expression.getLeft(),
|
||||
invertedOperation.getValue(),
|
||||
expression.getRight()
|
||||
)
|
||||
else -> throw IllegalStateException(
|
||||
"Expression is neither a JetIsExpression or JetBinaryExpression (checked by isApplicableTo): ${expression.getText()}"
|
||||
)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '==' expression to '!='
|
||||
fun test(n: Int) {
|
||||
!(0<caret> == 1)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '==' expression to '!='
|
||||
fun test(n: Int) {
|
||||
0 != 1
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '>' expression to '<='
|
||||
fun test(n: Int) {
|
||||
!(0<caret> > 1)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '>' expression to '<='
|
||||
fun test(n: Int) {
|
||||
0 <= 1
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '>=' expression to '<'
|
||||
fun test(n: Int) {
|
||||
!(0<caret> >= 1)
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '>=' expression to '<'
|
||||
fun test(n: Int) {
|
||||
0 < 1
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
// INTENTION_TEXT: Simplify negated 'in' expression to '!in'
|
||||
fun test(n: Int) {
|
||||
val arr = ArrayList<Int>(1)
|
||||
!(0<caret> in arr)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
// INTENTION_TEXT: Simplify negated 'in' expression to '!in'
|
||||
fun test(n: Int) {
|
||||
val arr = ArrayList<Int>(1)
|
||||
0 !in arr
|
||||
}
|
||||
+5
@@ -0,0 +1,5 @@
|
||||
// IS_APPLICABLE: false
|
||||
fun lt(a: Int, b: Int): Boolean = a < b
|
||||
fun test(n: Int) {
|
||||
!(1<caret> lt 2)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated 'is' expression to '!is'
|
||||
fun test(n: Int) {
|
||||
!(0<caret> is Int)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated 'is' expression to '!is'
|
||||
fun test(n: Int) {
|
||||
0 !is Int
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '<' expression to '>='
|
||||
fun test(n: Int) {
|
||||
!(0<caret> < 1)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '<' expression to '>='
|
||||
fun test(n: Int) {
|
||||
0 >= 1
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '<=' expression to '>'
|
||||
fun test(n: Int) {
|
||||
!(0<caret> <= 1)
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '<=' expression to '>'
|
||||
fun test(n: Int) {
|
||||
0 > 1
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '!=' expression to '=='
|
||||
fun test(n: Int) {
|
||||
!(0<caret> != 1)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '!=' expression to '=='
|
||||
fun test(n: Int) {
|
||||
0 == 1
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
// INTENTION_TEXT: Simplify negated '!in' expression to 'in'
|
||||
fun test(n: Int) {
|
||||
val arr = ArrayList<Int>(1)
|
||||
!(0<caret> !in arr)
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
// INTENTION_TEXT: Simplify negated '!in' expression to 'in'
|
||||
fun test(n: Int) {
|
||||
val arr = ArrayList<Int>(1)
|
||||
0 in arr
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '!is' expression to 'is'
|
||||
fun test(n: Int) {
|
||||
!(0<caret> !is Int)
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// INTENTION_TEXT: Simplify negated '!is' expression to 'is'
|
||||
fun test(n: Int) {
|
||||
0 is Int
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
// IS_APPLICABLE: false
|
||||
fun test(n: Int) {
|
||||
!<caret>true
|
||||
}
|
||||
@@ -195,6 +195,10 @@ public abstract class AbstractCodeTransformationTest extends LightCodeInsightTes
|
||||
doTestIntention(path, new TestableReplaceInvokeIntention());
|
||||
}
|
||||
|
||||
public void doTestSimplifyNegatedBinaryExpressionIntention(@NotNull String path) throws Exception {
|
||||
doTestIntention(path, new SimplifyNegatedBinaryExpressionIntention());
|
||||
}
|
||||
|
||||
private void doTestIntention(@NotNull String path, @NotNull IntentionAction intentionAction) throws Exception {
|
||||
configureByFile(path);
|
||||
|
||||
|
||||
+70
-1
@@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationTest;
|
||||
|
||||
/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
|
||||
@SuppressWarnings("all")
|
||||
@InnerTestClasses({CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class})
|
||||
@InnerTestClasses({CodeTransformationTestGenerated.ElvisToIfThen.class, CodeTransformationTestGenerated.IfThenToElvis.class, CodeTransformationTestGenerated.SafeAccessToIfThen.class, CodeTransformationTestGenerated.IfThenToSafeAccess.class, CodeTransformationTestGenerated.IfToAssignment.class, CodeTransformationTestGenerated.IfToReturn.class, CodeTransformationTestGenerated.IfToReturnAsymmetrically.class, CodeTransformationTestGenerated.WhenToAssignment.class, CodeTransformationTestGenerated.WhenToReturn.class, CodeTransformationTestGenerated.AssignmentToIf.class, CodeTransformationTestGenerated.AssignmentToWhen.class, CodeTransformationTestGenerated.PropertyToIf.class, CodeTransformationTestGenerated.PropertyToWhen.class, CodeTransformationTestGenerated.ReturnToIf.class, CodeTransformationTestGenerated.ReturnToWhen.class, CodeTransformationTestGenerated.IfToWhen.class, CodeTransformationTestGenerated.WhenToIf.class, CodeTransformationTestGenerated.Flatten.class, CodeTransformationTestGenerated.Merge.class, CodeTransformationTestGenerated.IntroduceSubject.class, CodeTransformationTestGenerated.EliminateSubject.class, CodeTransformationTestGenerated.Split.class, CodeTransformationTestGenerated.Join.class, CodeTransformationTestGenerated.ConvertMemberToExtension.class, CodeTransformationTestGenerated.ReconstructedType.class, CodeTransformationTestGenerated.RemoveUnnecessaryParentheses.class, CodeTransformationTestGenerated.ReplaceWithDotQualifiedMethodCall.class, CodeTransformationTestGenerated.ReplaceWithInfixFunctionCall.class, CodeTransformationTestGenerated.RemoveCurlyBracesFromTemplate.class, CodeTransformationTestGenerated.MoveLambdaInsideParentheses.class, CodeTransformationTestGenerated.MoveLambdaOutsideParentheses.class, CodeTransformationTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, CodeTransformationTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, CodeTransformationTestGenerated.RemoveBraces.class, CodeTransformationTestGenerated.AddBraces.class, CodeTransformationTestGenerated.ReplaceGetIntention.class, CodeTransformationTestGenerated.ReplaceContainsIntention.class, CodeTransformationTestGenerated.ReplaceBinaryInfixIntention.class, CodeTransformationTestGenerated.ReplaceUnaryPrefixIntention.class, CodeTransformationTestGenerated.ReplaceInvokeIntention.class, CodeTransformationTestGenerated.SimplifyNegatedBinaryExpressionIntention.class})
|
||||
public class CodeTransformationTestGenerated extends AbstractCodeTransformationTest {
|
||||
@TestMetadata("idea/testData/intentions/branched/elvisToIfThen")
|
||||
public static class ElvisToIfThen extends AbstractCodeTransformationTest {
|
||||
@@ -2602,6 +2602,74 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
|
||||
|
||||
}
|
||||
|
||||
@TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention")
|
||||
public static class SimplifyNegatedBinaryExpressionIntention extends AbstractCodeTransformationTest {
|
||||
public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception {
|
||||
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention"), Pattern.compile("^(.+)\\.kt$"), true);
|
||||
}
|
||||
|
||||
@TestMetadata("equals.kt")
|
||||
public void testEquals() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/equals.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("greaterThan.kt")
|
||||
public void testGreaterThan() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThan.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("greaterThanOrEquals.kt")
|
||||
public void testGreaterThanOrEquals() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/greaterThanOrEquals.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("in.kt")
|
||||
public void testIn() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/in.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("inapplicableBinaryOperation.kt")
|
||||
public void testInapplicableBinaryOperation() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inapplicableBinaryOperation.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("is.kt")
|
||||
public void testIs() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/is.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("lessThan.kt")
|
||||
public void testLessThan() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThan.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("lessThanOrEquals.kt")
|
||||
public void testLessThanOrEquals() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/lessThanOrEquals.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("notEquals.kt")
|
||||
public void testNotEquals() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notEquals.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("notIn.kt")
|
||||
public void testNotIn() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIn.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("notIs.kt")
|
||||
public void testNotIs() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/notIs.kt");
|
||||
}
|
||||
|
||||
@TestMetadata("simpleInvert.kt")
|
||||
public void testSimpleInvert() throws Exception {
|
||||
doTestSimplifyNegatedBinaryExpressionIntention("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/simpleInvert.kt");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static Test suite() {
|
||||
TestSuite suite = new TestSuite("CodeTransformationTestGenerated");
|
||||
suite.addTestSuite(ElvisToIfThen.class);
|
||||
@@ -2644,6 +2712,7 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT
|
||||
suite.addTestSuite(ReplaceBinaryInfixIntention.class);
|
||||
suite.addTestSuite(ReplaceUnaryPrefixIntention.class);
|
||||
suite.addTestSuite(ReplaceInvokeIntention.class);
|
||||
suite.addTestSuite(SimplifyNegatedBinaryExpressionIntention.class);
|
||||
return suite;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user