mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Flip parameters correctly in Flip Comma intention (IDEA-179397)
This commit is contained in:
@@ -16,10 +16,7 @@
|
||||
package com.intellij.codeInsight.intention.impl;
|
||||
|
||||
import com.intellij.openapi.editor.actions.FlipCommaIntention;
|
||||
import com.intellij.psi.JavaTokenType;
|
||||
import com.intellij.psi.PsiElement;
|
||||
import com.intellij.psi.PsiIdentifier;
|
||||
import com.intellij.psi.PsiVariable;
|
||||
import com.intellij.psi.*;
|
||||
import com.intellij.psi.util.PsiUtil;
|
||||
|
||||
/**
|
||||
@@ -30,6 +27,8 @@ public class JavaFlipper implements FlipCommaIntention.Flipper {
|
||||
@Override
|
||||
public boolean flip(PsiElement left, PsiElement right) {
|
||||
if (left instanceof PsiVariable && right instanceof PsiVariable) {
|
||||
if (left instanceof PsiParameter || right instanceof PsiParameter) return false;
|
||||
// flips multiple variables in a single declaration
|
||||
final PsiVariable leftVariable = (PsiVariable)left;
|
||||
final PsiVariable rightVariable = (PsiVariable)right;
|
||||
final PsiIdentifier leftIdentifier = leftVariable.getNameIdentifier();
|
||||
|
||||
+9
@@ -23,6 +23,15 @@ import com.siyeh.ipp.IPPTestCase;
|
||||
*/
|
||||
public class FlipCommaIntentionTest extends IPPTestCase {
|
||||
|
||||
public void testFlipParameters() {
|
||||
doTest("class C {" +
|
||||
" void foo(int a,/*_Flip ','*/ String b) {}" +
|
||||
"}",
|
||||
"class C {" +
|
||||
" void foo(String b, int a) {}" +
|
||||
"}");
|
||||
}
|
||||
|
||||
public void testMultipleFieldsSingleDeclaration() {
|
||||
doTest("class C {\n" +
|
||||
" int a,/*_Flip ','*/ b;\n" +
|
||||
|
||||
Reference in New Issue
Block a user