editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java - Issue 9651004: Make SourceInfo a class, rename its menthods.

Unified Diff: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.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

« no previous file with comments | « editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/ast/DartElementLocator.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/callhierarchy/CalleeAnalyzerVisitor.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java

diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java

index 68a9fd25a8a66e133cb04ecf83325cac1af2fbd9..99d01240e85d0f60f87179ac2b7a00a1530cb0f5 100644

--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java

+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.java

@@ -240,8 +240,9 @@ public class DartCompilerUtilities {

@Override

public Source getSourceBefore() {

for (DartUnit u : enclosingLibrary.getLibraryUnit().getUnits()) {

- if (u.getSource().getUri().equals(unitUri)) {

- return u.getSource();

+ Source unitSource = u.getSourceInfo().getSource();

+ if (unitSource.getUri().equals(unitUri)) {

+ return unitSource;

}

return null;

@@ -449,7 +450,7 @@ public class DartCompilerUtilities {

libraryResult = secureAnalyzeLibrary(librarySource, parsedUnits, config, provider, this);

if (libraryResult != null && unitUri != null) {

for (DartUnit unit : libraryResult.getUnits()) {

- DartSource source = unit.getSource();

+ DartSource source = (DartSource) unit.getSourceInfo().getSource();

if (source != null) {

if (equalUris(libraryManager, unitUri, source.getUri())) {

unitResult = unit;

@@ -485,7 +486,7 @@ public class DartCompilerUtilities {

}

return completionNode;

}

- DartSource src = suppliedUnit.getSource();

+ DartSource src = (DartSource) suppliedUnit.getSourceInfo().getSource();

URI unitUri = src.getUri();

Map<URI, String> suppliedSources = new HashMap<URI, String>();

suppliedSources.put(unitUri, sourceString);

@@ -821,7 +822,7 @@ public class DartCompilerUtilities {

}

Map<URI, DartUnit> parsedUnits = new HashMap<URI, DartUnit>(suppliedUnits.size());

for (DartUnit unit : suppliedUnits) {

- DartSource src = unit.getSource();

+ DartSource src = (DartSource) unit.getSourceInfo().getSource();

URI uri = src.getUri();

parsedUnits.put(uri, unit);

}