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

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

Browse Source 
Correct tree merge when single node is replaced
This commit is contained in:
Denis.Zhdanov
2012-08-22 23:19:37 +04:00
parent d3be439ac9
commit 0d3fae35e9
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtilTest.groovy
+37 -5
View File
@@ -80,9 +80,7 @@ four = '4'()
'3'()}
from = '4' {
to = '5'()
'6'()
}
'6'()}
}
// Modify.
@@ -100,8 +98,42 @@ to = '5'()
'3'()
'5'()}
'4' {
'6'()
}
'6'()}
}
assertNodesEqual(expected, initial)
checkRowMappings([:], rowMappings)
}
@Test
void replaceWithTwoLevelMergeToNodeAbove() {
// Init.
def node;
def initial = new TreeNodeBuilder().
'0' {
'1'() {
'2'()
'3'()}
node = '4'()
'5'() {
'6'()}
}
// Modify.
def replacement = new TreeNodeBuilder().
'1' {
'4'()
}
def rowMappings = doReplace(initial, node, node, replacement)
// Check.
def expected = new TreeNodeBuilder().
'0' {
'1' {
'2'()
'3'()
'4'()}
'5' {
'6'()}
}
assertNodesEqual(expected, initial)
checkRowMappings([:], rowMappings)