mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Fixed excessive code reformatting.

Browse source
This commit is contained in:
Sergey Prigogin 2012-03-20 01:36:06 -07:00
parent f329b641fe
commit 0116245961
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/changegenerator/ChangeGenerator.java
View file

@ -345,8 +345,12 @@ public class ChangeGenerator extends ASTVisitor {
int offset = edit.getOffset(); int offset = edit.getOffset();
int end = offset + edit.getLength(); int end = offset + edit.getLength();
int newOffset = document.getLineInformationOfOffset(offset).getOffset(); int newOffset = document.getLineInformationOfOffset(offset).getOffset();
int newEnd = endOffset(document.getLineInformationOfOffset(end));
edit = originalEdits[i]; edit = originalEdits[i];
int originalEnd = edit.getExclusiveEnd();
// Expand to the end of the line unless the end of the edit region is at
// the beginning of line both, before and after the change.
int newEnd = (originalEnd == 0 || code.charAt(originalEnd - 1) == '\n') && end == newOffset ?
end : endOffset(document.getLineInformationOfOffset(end));
int offsetBefore = edit.getOffset(); int offsetBefore = edit.getOffset();
int newOffsetBefore = newOffset + offsetBefore - offset; int newOffsetBefore = newOffset + offsetBefore - offset;
int newEndBefore = newEnd + offsetBefore + edit.getLength() - end; int newEndBefore = newEnd + offsetBefore + edit.getLength() - end;

4
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/extractfunction/ExtractFunctionRefactoringTest.java
View file

@ -285,7 +285,7 @@ public class ExtractFunctionRefactoringTest extends RefactoringTestBase {
//void main() { //void main() {
// /*$*/A a(""); // /*$*/A a("");
// a.m1();/*$$*/ // a.m1();/*$$*/
// A b(a); // A b(a); // nonstandard indent to check that it is preserved
//} //}
//==================== //====================
//class A { //class A {
@ -303,7 +303,7 @@ public class ExtractFunctionRefactoringTest extends RefactoringTestBase {
// //
//void main() { //void main() {
// A a = extracted(); // A a = extracted();
// A b(a); // A b(a); // nonstandard indent to check that it is preserved
//} //}
public void testLocalVariableDeclaration_3() throws Exception { public void testLocalVariableDeclaration_3() throws Exception {
assertRefactoringSuccess(); assertRefactoringSuccess();