mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-08-26 00:11:26 +07:00
IDEA-111702 Java Rearranger illegal forward reference on fields rearrangement [CR-IC-3034]
This commit is contained in:
Yaroslav Lepenkin
+256
@@ -0,0 +1,256 @@
|
||||
/*
|
||||
* Copyright 2000-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 com.intellij.psi.codeStyle.arrangement
|
||||
|
||||
import com.intellij.psi.codeStyle.arrangement.match.StdArrangementMatchRule
|
||||
|
||||
import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.*;
|
||||
import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Modifier.*;
|
||||
|
||||
class JavaRearrangerFieldReferenceTest extends AbstractJavaRearrangerTest {
|
||||
|
||||
private List<StdArrangementMatchRule> defaultFieldsArrangement = [
|
||||
rule(CLASS),
|
||||
rule(FIELD, PUBLIC),
|
||||
rule(FIELD, PROTECTED),
|
||||
rule(FIELD, PACKAGE_PRIVATE),
|
||||
rule(FIELD, PRIVATE)
|
||||
]
|
||||
|
||||
|
||||
void "test keep referenced package private field before public one which has reference through binary expression"() {
|
||||
doTest(initial: '''\
|
||||
public class TestRunnable {
|
||||
int i = 1;
|
||||
public int j = i + 1;
|
||||
public int k = 3;
|
||||
public int m = 23;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class TestRunnable {
|
||||
public int k = 3;
|
||||
public int m = 23;
|
||||
int i = 1;
|
||||
public int j = i + 1;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced fields before those who has reference through binary expression"() {
|
||||
doTest(initial: '''\
|
||||
public class javaTest {
|
||||
int i1 = 1;
|
||||
protected int i2 = i1 + 4;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class javaTest {
|
||||
int i1 = 1;
|
||||
protected int i2 = i1 + 4;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced static fields before those who has reference through binary expression"() {
|
||||
doTest(initial: '''\
|
||||
public class CodeFormatTest {
|
||||
private static String PREFIX = "prefix.";
|
||||
public static String NAME = PREFIX + "name";
|
||||
private static String PRIVATE_NAME = PREFIX + "private name";
|
||||
public static String TEST = "OK!";
|
||||
public static String BOOK = "ATLAS";
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class CodeFormatTest {
|
||||
public static String TEST = "OK!";
|
||||
public static String BOOK = "ATLAS";
|
||||
private static String PREFIX = "prefix.";
|
||||
private static String PRIVATE_NAME = PREFIX + "private name";
|
||||
public static String NAME = PREFIX + "name";
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced static fields before those who has direct reference"() {
|
||||
doTest(initial: '''\
|
||||
public class CodeFormatTest {
|
||||
private static String PREFIX = "prefix.";
|
||||
public static String NAME = PREFIX;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class CodeFormatTest {
|
||||
private static String PREFIX = "prefix.";
|
||||
public static String NAME = PREFIX;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced fields before those who has direct reference"() {
|
||||
doTest(initial: '''\
|
||||
public class CodeFormatTest {
|
||||
private String PREFIX = "prefix.";
|
||||
public String NAME = PREFIX;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class CodeFormatTest {
|
||||
private String PREFIX = "prefix.";
|
||||
public String NAME = PREFIX;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced fields before those who has reference through polyadic expression"() {
|
||||
doTest(initial: '''\
|
||||
public class CodeFormatTest {
|
||||
private String PREFIX = "prefix.";
|
||||
public String NAME = "ololo" + "bobob" + "line" + PREFIX + "ququ";
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class CodeFormatTest {
|
||||
private String PREFIX = "prefix.";
|
||||
public String NAME = "ololo" + "bobob" + "line" + PREFIX + "ququ";
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
void "test keep referenced field before who has reference through parenthesized nested binary expression"() {
|
||||
doTest(initial: '''\
|
||||
public class TestRunnable {
|
||||
int i = 3;
|
||||
public int j = (1 + i);
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class TestRunnable {
|
||||
int i = 3;
|
||||
public int j = (1 + i);
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void "test keep referenced fields before those who has reference through nested binary expression"() {
|
||||
doTest(initial: '''\
|
||||
public class TestRunnable {
|
||||
int i = 3;
|
||||
public int j = (1 + 2 + (5 + (5 + (5 + i))) + (1 + (i + 1)) + (3 + i) + 5) + 4;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class TestRunnable {
|
||||
int i = 3;
|
||||
public int j = (1 + 2 + (5 + (5 + (5 + i))) + (1 + (i + 1)) + (3 + i) + 5) + 4;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
void "test multiple references on instance fields"() {
|
||||
doTest(initial: '''\
|
||||
public class TestRunnable {
|
||||
int i = 3;
|
||||
int k = 12;
|
||||
public int j = (1 + 2 + (5 + (5 + (5 + i))) + (1 + (i + 1 + k)) + (3 + i) + 5) + 4;
|
||||
public int q = 64;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class TestRunnable {
|
||||
public int q = 64;
|
||||
int i = 3;
|
||||
int k = 12;
|
||||
public int j = (1 + 2 + (5 + (5 + (5 + i))) + (1 + (i + 1 + k)) + (3 + i) + 5) + 4;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
void "test field initializer has reference to method"() {
|
||||
doTest(initial: '''\
|
||||
public class TestRunnable {
|
||||
public int foo() {
|
||||
return 15;
|
||||
}
|
||||
|
||||
public int q = 64 + foo();
|
||||
int i = 3;
|
||||
int k = 12;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class TestRunnable {
|
||||
public int q = 64 + foo();
|
||||
int i = 3;
|
||||
int k = 12;
|
||||
|
||||
public int foo() {
|
||||
return 15;
|
||||
}
|
||||
}
|
||||
''',
|
||||
rules: [rule(CLASS),
|
||||
rule(FIELD, PUBLIC),
|
||||
rule(FIELD, PACKAGE_PRIVATE),
|
||||
rule(METHOD, PUBLIC)]
|
||||
)
|
||||
}
|
||||
|
||||
void "test illegal field reference arranged to legal"() {
|
||||
doTest(initial: '''\
|
||||
public class Alfa {
|
||||
int i = 3;
|
||||
public int j = i + 1 + q;
|
||||
int q = 2 + 3;
|
||||
public int r = 3;
|
||||
}
|
||||
''',
|
||||
expected: '''\
|
||||
public class Alfa {
|
||||
public int r = 3;
|
||||
int i = 3;
|
||||
int q = 2 + 3;
|
||||
public int j = i + 1 + q;
|
||||
}
|
||||
''',
|
||||
rules: defaultFieldsArrangement
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user