diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java index ccba84517a2..6f10bc322d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetLabelQualifiedInstanceExpression.java @@ -20,8 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; -public abstract class JetLabelQualifiedInstanceExpression extends JetLabelQualifiedExpression - implements JetStatementExpression { +public abstract class JetLabelQualifiedInstanceExpression extends JetLabelQualifiedExpression { public JetLabelQualifiedInstanceExpression(@NotNull ASTNode node) { super(node); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java index 020f2b12c69..35821b9a70d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -public class JetSuperExpression extends JetLabelQualifiedInstanceExpression { +public class JetSuperExpression extends JetLabelQualifiedInstanceExpression implements JetStatementExpression { public JetSuperExpression(@NotNull ASTNode node) { super(node); diff --git a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt new file mode 100644 index 00000000000..e4ecc0bcfe9 --- /dev/null +++ b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt @@ -0,0 +1,6 @@ +class C() { + fun get(i: Int) = i + 1 + + // KT-4513: Unnecessary parenthesis around 'this' + val foo = (this)[41] +} diff --git a/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt.after b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt.after new file mode 100644 index 00000000000..2b597c6f0f3 --- /dev/null +++ b/idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt.after @@ -0,0 +1,6 @@ +class C() { + fun get(i: Int) = i + 1 + + // KT-4513: Unnecessary parenthesis around 'this' + val foo = this[41] +} diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java index 35de3fd4b5d..1aff6c9a6fa 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/CodeTransformationTestGenerated.java @@ -1176,6 +1176,11 @@ public class CodeTransformationTestGenerated extends AbstractCodeTransformationT doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses7.kt"); } + @TestMetadata("unnecessaryParentheses8.kt") + public void testUnnecessaryParentheses8() throws Exception { + doTestRemoveUnnecessaryParentheses("idea/testData/intentions/removeUnnecessaryParentheses/unnecessaryParentheses8.kt"); + } + } public static Test suite() {