mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-26 10:25:32 +02:00
Code Issues Wiki Activity

Code simplification.

Browse source
This commit is contained in:
Sergey Prigogin 2012-04-01 20:38:10 -07:00
parent 309010c452
commit ffc583c84d
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/formatter/Scribe.java
View file

@ -128,7 +128,7 @@ public class Scribe {
indentationLevel= preferences.initial_indentation_level * indentationSize; indentationLevel= preferences.initial_indentation_level * indentationSize;
preserveNewLines = false; preserveNewLines = false;
textRegionStart= offset; textRegionStart= offset;
textRegionEnd= offset + length - 1; textRegionEnd= offset + length;
reset(); reset();
} }
@ -574,12 +574,12 @@ public class Scribe {
public TextEdit getRootEdit() { public TextEdit getRootEdit() {
MultiTextEdit edit= null; MultiTextEdit edit= null;
int length= textRegionEnd - textRegionStart + 1; int length= textRegionEnd - textRegionStart;
if (textRegionStart <= 0) { if (textRegionStart <= 0) {
if (length <= 0) { if (length <= 0) {
edit= new MultiTextEdit(0, 0); edit= new MultiTextEdit(0, 0);
} else { } else {
edit= new MultiTextEdit(0, textRegionEnd + 1); edit= new MultiTextEdit(0, textRegionEnd);
} }
} else { } else {
edit= new MultiTextEdit(textRegionStart, length); edit= new MultiTextEdit(textRegionStart, length);
@ -595,7 +595,7 @@ public class Scribe {
} }
public void handleLineTooLong() { public void handleLineTooLong() {
// Search for closest breakable alignment, using tie break rules. // Search for closest breakable alignment, using tie-breaking rules.
// Look for innermost breakable one. // Look for innermost breakable one.
int relativeDepth= 0; int relativeDepth= 0;
Alignment targetAlignment= currentAlignment; Alignment targetAlignment= currentAlignment;
@ -621,6 +621,7 @@ public class Scribe {
if (outerMostDepth >= 0) { if (outerMostDepth >= 0) {
throwAlignmentException(AlignmentException.LINE_TOO_LONG, outerMostDepth); throwAlignmentException(AlignmentException.LINE_TOO_LONG, outerMostDepth);
} }
// Look for innermost breakable one but don't stop if we encounter a R_OUTERMOST // Look for innermost breakable one but don't stop if we encounter a R_OUTERMOST
// tie-breaking rule. // tie-breaking rule.
relativeDepth= 0; relativeDepth= 0;
@ -710,7 +711,7 @@ public class Scribe {
final int editReplacementLength= edit.replacement.length(); final int editReplacementLength= edit.replacement.length();
final int editOffset= edit.offset; final int editOffset= edit.offset;
if (editLength != 0) { if (editLength != 0) {
if (textRegionStart <= editOffset && (editOffset + editLength - 1) <= textRegionEnd) { if (textRegionStart <= editOffset && editOffset + editLength <= textRegionEnd) {
if (editReplacementLength != 0 && editLength == editReplacementLength) { if (editReplacementLength != 0 && editLength == editReplacementLength) {
for (int i= editOffset, max= editOffset + editLength; i < max; i++) { for (int i= editOffset, max= editOffset + editLength; i < max; i++) {
if (scanner.source[i] != edit.replacement.charAt(i - editOffset)) { if (scanner.source[i] != edit.replacement.charAt(i - editOffset)) {
@ -737,9 +738,9 @@ public class Scribe {
return true; return true;
} }
} }
} else if (textRegionStart <= editOffset && editOffset <= textRegionEnd) { } else if (textRegionStart <= editOffset && editOffset < textRegionEnd) {
return true; return true;
} else if (editOffset == scannerEndPosition && editOffset == textRegionEnd + 1) { } else if (editOffset == scannerEndPosition && editOffset == textRegionEnd) {
return true; return true;
} }
return false; return false;