Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java

Issue 9651004: Make SourceInfo a class, rename its menthods. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Tweak for formatting, lazily create LainesInfo Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java
index b69a909c50ec59778ba12eb5ba37eb060bec2264..533cab2c23e8fd56b68dcec2de361b12a111a8d3 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartAutoIndentStrategy.java
@@ -237,7 +237,8 @@ public class DartAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
}
private static IRegion createRegion(DartNode node, int delta) {
- return node == null ? null : new Region(node.getSourceStart() + delta, node.getSourceLength());
+ return node == null ? null : new Region(node.getSourceInfo().getOffset() + delta,
+ node.getSourceInfo().getLength());
}
/**
@@ -1029,8 +1030,8 @@ public class DartAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
if (length == 0) {
while (node != null
- && (relativeOffset == node.getSourceStart() || relativeOffset == node.getSourceStart()
- + node.getSourceLength())) {
+ && (relativeOffset == node.getSourceInfo().getOffset() || relativeOffset == node.getSourceInfo().getOffset()
+ + node.getSourceInfo().getLength())) {
node = node.getParent();
}
}
@@ -1096,7 +1097,7 @@ public class DartAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
}
try {
- int p = (c.offset == d.getLength() ? c.offset - 1 : c.offset);
+ int p = c.offset == d.getLength() ? c.offset - 1 : c.offset;
int line = d.getLineOfOffset(p);
int start = d.getLineOffset(line);
int whiteend = findEndOfWhiteSpace(d, start, c.offset);
@@ -1143,7 +1144,7 @@ public class DartAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
}
try {
- int p = (c.offset == docLength ? c.offset - 1 : c.offset);
+ int p = c.offset == docLength ? c.offset - 1 : c.offset;
int line = d.getLineOfOffset(p);
StringBuffer buf = new StringBuffer(c.text + indent);
@@ -1226,7 +1227,7 @@ public class DartAutoIndentStrategy extends DefaultIndentLineAutoEditStrategy {
DartHeuristicScanner scanner = new DartHeuristicScanner(d);
- int p = (c.offset == d.getLength() ? c.offset - 1 : c.offset);
+ int p = c.offset == d.getLength() ? c.offset - 1 : c.offset;
try {
// current line

Powered by Google App Engine
This is Rietveld 408576698