editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java - Issue 10536180: Issue 3530. Import elements into separate import namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java

Issue 10536180: Issue 3530. Import elements into separate import namespace (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 6 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

« compiler/javatests/com/google/dart/compiler/DeltaAnalyzerTest.java ('K') | « editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/completion/CompletionEngine.java ('k') | tests/co19/co19-compiler.status » ('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/internal/index/impl/InMemoryIndex.java

diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java

index fe7091f1386aa1b047a7239440fb414b695d02b0..8854aaebefba4fbd6f2e0d9b97e07e404a8ef82e 100644

--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java

+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.java

@@ -255,10 +255,12 @@ public class InMemoryIndex implements Index {

Resource indexerResource;

if (SystemLibraryManager.isDartUri(unitUri)) {

indexerResource = new Resource(ResourceFactory.composeResourceId(

- librarySource.getUri().toString(), unitUri.toString()));

+ librarySource.getUri().toString(),

+ unitUri.toString()));

} else if (SystemLibraryManager.isPackageUri(unitUri)) {

indexerResource = new Resource(ResourceFactory.composeResourceId(

- libraryFile.toURI().toString(), sourceFile.toURI().toString()));

+ libraryFile.toURI().toString(),

+ sourceFile.toURI().toString()));

} else {

indexerResource = ResourceFactory.getResource(compilationUnit);

}

@@ -497,7 +499,7 @@ public class InMemoryIndex implements Index {

long endTime = System.currentTimeMillis();

initIndexingTime += endTime - startTime;

}

- for (LibraryUnit importedLibrary : libraryUnit.getImports()) {

+ for (LibraryUnit importedLibrary : libraryUnit.getImportedLibraries()) {

indexBundledLibrary(importedLibrary, initializedLibraries);

}

@@ -559,7 +561,7 @@ public class InMemoryIndex implements Index {

long endTime = System.currentTimeMillis();

initIndexingTime += endTime - startTime;

}

- for (LibraryUnit importedLibrary : libraryUnit.getImports()) {

+ for (LibraryUnit importedLibrary : libraryUnit.getImportedLibraries()) {

// library.getImportedLibrary(importedLibrary.getSource().getUri());

indexUserLibrary(importedLibrary, initializedLibraries);

}