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

Translate RemoveUnnecessaryParenthesesIntention and apply refactoring

Browse Source
This commit is contained in:
Alexey Sedunov
2013-11-18 18:47:47 +04:00
parent a24ee8745c
commit c63265bd69
2 changed files with 42 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.java
-60
View File
@@ -1,60 +0,0 @@
/*
* Copyright 2010-2013 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 com.intellij.codeInsight.intention.impl.BaseIntentionAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression;
import org.jetbrains.jet.lang.psi.JetPsiUtil;
import org.jetbrains.jet.plugin.JetBundle;
public class RemoveUnnecessaryParenthesesIntention extends BaseIntentionAction {
private JetParenthesizedExpression expression;
public RemoveUnnecessaryParenthesesIntention() {
setText(JetBundle.message("remove.unnecessary.parentheses"));
}
@NotNull
@Override
public String getFamilyName() {
return JetBundle.message("remove.unnecessary.parentheses.family");
}
@Override
public boolean isAvailable(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
PsiElement element = file.findElementAt(editor.getCaretModel().getOffset());
expression = PsiTreeUtil.getParentOfType(element, JetParenthesizedExpression.class);
return expression != null && JetPsiUtil.areParenthesesUseless(expression);
}
@Override
public void invoke(
@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file
) throws IncorrectOperationException {
JetExpression innerExpression = expression.getExpression();
assert innerExpression != null : "parenthesizedExpression.getExpression() == null despite @IfNotParsed annotation";
expression.replace(innerExpression);
}
}
idea/tests/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt
+42
View File
@@ -0,0 +1,42 @@
/*
* Copyright 2010-2013 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 com.intellij.codeInsight.intention.impl.BaseIntentionAction
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.IncorrectOperationException
import org.jetbrains.jet.lang.psi.JetExpression
import org.jetbrains.jet.lang.psi.JetParenthesizedExpression
import org.jetbrains.jet.lang.psi.JetPsiUtil
import org.jetbrains.jet.plugin.JetBundle
public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention<JetParenthesizedExpression>(
"remove.unnecessary.parentheses", javaClass()
) {
override fun isApplicableTo(element: JetParenthesizedExpression): Boolean = JetPsiUtil.areParenthesesUseless(element)
override fun applyTo(element: JetParenthesizedExpression, editor: Editor) {
with (element.getExpression()) {
assert (this != null, "parenthesizedExpression.getExpression() == null despite @IfNotParsed annotation")
element.replace(this!!)
}
}
}