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

Fix for EA-39487

Browse Source
This commit is contained in:
Nikolay Krasko
2012-11-14 15:38:26 +04:00
parent 2bc57ee8a2
commit c4dd556b92
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
+12 -7
View File
@@ -26,6 +26,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.psi.JetExpression;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.lang.psi.JetPostfixExpression;
@@ -112,14 +113,14 @@ public class ExclExclCallFix implements IntentionAction {
private static PsiElement getExclExclElement(Editor editor, PsiFile file) {
final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset());
if (elementAtCaret instanceof LeafPsiElement) {
LeafPsiElement leafElement = (LeafPsiElement) elementAtCaret;
if (leafElement.getElementType() == JetTokens.EXCLEXCL) {
return elementAtCaret;
}
if (isExclExclLeaf(elementAtCaret)) {
return elementAtCaret;
}
LeafPsiElement prevLeaf = (LeafPsiElement) PsiTreeUtil.prevLeaf(leafElement);
if (prevLeaf != null && prevLeaf.getElementType() == JetTokens.EXCLEXCL) {
if (elementAtCaret != null) {
// Case when caret is placed right after !!
PsiElement prevLeaf = PsiTreeUtil.prevLeaf(elementAtCaret);
if (isExclExclLeaf(prevLeaf)) {
return prevLeaf;
}
}
@@ -127,6 +128,10 @@ public class ExclExclCallFix implements IntentionAction {
return null;
}
private static boolean isExclExclLeaf(@Nullable PsiElement element) {
return (element instanceof LeafPsiElement) && ((LeafPsiElement) element).getElementType() == JetTokens.EXCLEXCL;
}
private static JetExpression getExpressionForIntroduceCall(Editor editor, PsiFile file) {
final PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset());
if (elementAtCaret != null) {