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

Unified Diff: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/dom/NodeFinder.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.core/src/com/google/dart/tools/core/dom/NodeFinder.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/dom/NodeFinder.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/dom/NodeFinder.java
index c1ab67cae83eb75adbc3e943d28debfb9a375f85..1a949a2fa8125b6fde0072ec0890054393ee33c6 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/dom/NodeFinder.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/dom/NodeFinder.java
@@ -13,11 +13,11 @@
*/
package com.google.dart.tools.core.dom;
+import com.google.dart.compiler.ast.ASTVisitor;
import com.google.dart.compiler.ast.DartClass;
import com.google.dart.compiler.ast.DartField;
import com.google.dart.compiler.ast.DartMethodDefinition;
import com.google.dart.compiler.ast.DartNode;
-import com.google.dart.compiler.ast.ASTVisitor;
import com.google.dart.compiler.parser.DartScanner;
import com.google.dart.compiler.parser.Token;
import com.google.dart.tools.core.buffer.Buffer;
@@ -88,8 +88,9 @@ public class NodeFinder extends ASTVisitor<Void> {
if (result == null) {
return null;
}
- int nodeStart = result.getSourceStart();
- if (start <= nodeStart && ((nodeStart + result.getSourceLength()) <= (start + length))) {
+ int nodeStart = result.getSourceInfo().getOffset();
+ if (start <= nodeStart
+ && nodeStart + result.getSourceInfo().getLength() <= start + length) {
Buffer buffer = source.getBuffer();
if (buffer != null) {
String src = buffer.getText(start, length);
@@ -97,8 +98,8 @@ public class NodeFinder extends ASTVisitor<Void> {
Token token = scanner.next();
if (token != Token.EOS) {
int tStart = scanner.getTokenLocation().getBegin().getPos();
- if (tStart == result.getSourceStart() - start) {
- int idx = tStart + result.getSourceLength();
+ if (tStart == result.getSourceInfo().getOffset() - start) {
+ int idx = tStart + result.getSourceInfo().getLength();
String nsrc = src.substring(idx, idx + length - 1);
scanner = new DartScanner(nsrc);
token = scanner.next();
@@ -163,8 +164,8 @@ public class NodeFinder extends ASTVisitor<Void> {
public DartNode selectNode() {
DartNode result = getCoveredNode();
- if (result == null || result.getSourceStart() != fStart
- || result.getSourceLength() != fEnd - fStart) {
+ if (result == null || result.getSourceInfo().getOffset() != fStart
+ || result.getSourceInfo().getLength() != fEnd - fStart) {
return getCoveringNode();
}
return result;
@@ -196,8 +197,8 @@ public class NodeFinder extends ASTVisitor<Void> {
@Override
public Void visitNode(DartNode node) {
- int nodeStart = node.getSourceStart();
- int nodeEnd = nodeStart + node.getSourceLength();
+ int nodeStart = node.getSourceInfo().getOffset();
+ int nodeEnd = nodeStart + node.getSourceInfo().getLength();
if (nodeEnd < fStart || fEnd < nodeStart) {
if (nodeEnd == -2) {
// TODO Remove this workaround for a parser bug: no source positions set

Powered by Google App Engine
This is Rietveld 408576698