MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-08-26 15:27:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

Browse Source 
1. Arrangement API provides 'dependent entries' concept now;
2. Java static and instance initialization blocks are defined to be 'dependent arrangement entries';
3. Corresponding tests are added;
4. Default java arrangement rules are expanded in order to preserve old 'generated class members order';
5. Test data is corrected;
This commit is contained in:
Denis.Zhdanov
2012-09-06 13:21:41 +04:00
parent 4a4aa01505
commit e76b02dc4e
19 changed files with 300 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after6.java
+17 -1
View File
@@ -1,9 +1,25 @@
/*
* Copyright 2000-2012 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.
*/
// "Create Inner Class 'MyCollection'" "true"
public class Test {
public static void main() {
Collection[] cc = new MyCollection[10];
}
<caret>
private static class MyCollection {
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/after8.java
+17 -1
View File
@@ -1,3 +1,19 @@
/*
* Copyright 2000-2012 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.
*/
// "Create Inner Class 'MyTableModel'" "true"
import javax.swing.*;
import javax.swing.table.TableModel;
@@ -6,7 +22,7 @@ public class Test {
public static void main() {
JTable table = new JTable(new MyTableModel());
}
<caret>
private static class MyTableModel implements TableModel {
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createInnerClassFromNew/afterGenerics.java
+17 -1
View File
@@ -1,9 +1,25 @@
/*
* Copyright 2000-2012 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.
*/
// "Create Inner Class 'Generic'" "true"
class Test {
void foo () {
new Generic<String> ();
}
<caret>
private class Generic<T> {
}
}
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateMethodUsed1.java
-1
View File
@@ -58,7 +58,6 @@ public class TestClass {
return yearsTo( expiry );
}
return 0.0;
}
private double yearsTo( final Date endDate ) {
java/java-tests/testData/refactoring/extractMethodObject/WithPrivateMethodUsed1.java.after
-1
View File
@@ -41,7 +41,6 @@ public class TestClass {
return yearsTo( expiry );
}
return 0.0;
}
private double riskFactor() {
java/java-tests/testData/refactoring/inheritanceToDelegation/hierarchy/after/X.java
+16 -2
View File
@@ -1,7 +1,21 @@
/*
* Copyright 2000-2012 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.
*/
public class X {
A myField;
private final Base myDelegate = new Base();
A myField;
public void method(Test t) {
myField = t.getA();
myField.methodFromA();
java/java-tests/testData/refactoring/inheritanceToDelegation/overridenMethods/after/A.java
+16 -1
View File
@@ -1,6 +1,21 @@
/*
* Copyright 2000-2012 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.
*/
class A {
int fieldFromA;
private final MyBase myDelegate = new MyBase();
int fieldFromA;
public void firstMethodFromBase() {
myDelegate.firstMethodFromBase();
java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAllCall_after.java
+16 -1
View File
@@ -1,6 +1,21 @@
/*
* Copyright 2000-2012 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.
*/
class Test {
private Foo myFoo;
private final Foo foo;
private Foo myFoo;
Test() {
foo = new Foo();
java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignmentReplaceAll_after.java
+16 -1
View File
@@ -1,6 +1,21 @@
/*
* Copyright 2000-2012 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.
*/
class Test {
private String myTimer;
private final String string;
private String myTimer;
Test() {
string = "";<caret>
java/java-tests/testData/refactoring/inplaceIntroduceField/beforeAssignment_after.java
+16 -1
View File
@@ -1,6 +1,21 @@
/*
* Copyright 2000-2012 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.
*/
class Test {
private String myTimer;
private final String string;
private String myTimer;
Test() {
string = "";