MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SortContentAction: fix warping in the middle of initializer: IDEA-185786

Browse Source
This commit is contained in:
Roman Ivanov
2018-01-30 13:58:05 +07:00
parent 2ad398daa9
commit 798fea215a
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
+1 -1
View File
@@ -375,7 +375,7 @@ public class SortContentAction extends PsiElementBaseIntentionAction {
}
for (int rowPosition = 0; rowPosition < entryCountOnRow; rowPosition++) {
currentEntryIndex++;
boolean isLastInRow = rowPosition + 1 == entryCountOnRow && rowPosition + 1 != lines;
boolean isLastInRow = rowPosition + 1 == entryCountOnRow && rowIndex + 1 != lines;
entries.get(entryIndex).generate(sb, isLastInRow, currentEntryIndex == entryCount);
entryIndex++;
}
java/java-impl/src/intentionDescriptions/SortContentAction/description.html
+2 -1
View File
@@ -2,7 +2,8 @@
<body>
Intention to sort content of array or vararg.
<!-- tooltip end -->
<p>This intention can sort literals (int and string) and enum constants.</p>>
<p>This intention can sort literals (int and string) and enum constants.</p>
<p>Inspection tries to preserve count of expression on line, but in case of comments it is not always possible.</p>
<small>New in 2018.1</small>
</body>
</html>
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/afterStringArrayCommentsLayout.java
+18
View File
@@ -0,0 +1,18 @@
// "Sort content" "true"
import java.util.*;
public class Main {
private void test() {
String[] LAST_NAMES = new String[]{
//A
"Allen", "Anderson", "Brown", "Clark", "Davis", "Garcia", "Hall",
"Harris", "Jackson", "Johnson", "Jones", "Lee", "Lewis", "Martin",
"Martinez", "Miller", "Moore", "Robinson", "Rodriguez", "Smith", "Taylor",
"Thomas", "Thompson", "Walker", "White", //B
"Williams", "Wilson", "Young"//Z
};
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/sortContent/beforeStringArrayCommentsLayout.java
+17
View File
@@ -0,0 +1,17 @@
// "Sort content" "true"
import java.util.*;
public class Main {
private void test() {
String[] LAST_NAMES = new String[]{
//A
"Smith", "Johnson", "Williams", "Jones", "Brown", "Davis", "Miller",
"Wilson", "Moore", "Taylor", "Anderson", "Thomas", "Jackson", "White",
//B<caret>
"Harris", "Martin", "Thompson", "Garcia", "Martinez", "Robinson", "Clark",
"Rodriguez", "Lewis", "Lee", "Walker", "Hall", "Allen", "Young"
//Z
};
}
}