editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java - Issue 15741017: Issue 8365. Report error when user library imports an internal SDK library.

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.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java

Issue 15741017: Issue 8365. Report error when user library imports an internal SDK library. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 years, 7 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.engine/src/com/google/dart/engine/internal/resolver/LibraryElementBuilder.java ('k') | editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/sdk/SdkLibraryImpl.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java

index b1c402d1487c2e53a33df03e67a30088d9004469..399e5677a9e0ec8c98b94171123e96faf3dce927 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/resolver/LibraryResolver.java

@@ -451,6 +451,7 @@ public class LibraryResolver {

if (importedLibrary != null) {

// The imported library will be null if the URI in the import directive was invalid.

ImportElementImpl importElement = new ImportElementImpl();

+ importElement.setUri(library.getUri(importDirective));

importElement.setCombinators(buildCombinators(importDirective));

LibraryElement importedLibraryElement = importedLibrary.getLibraryElement();

if (importedLibraryElement != null) {

@@ -571,7 +572,7 @@ public class LibraryResolver {

for (Directive directive : unit.getDirectives()) {

if (directive instanceof ImportDirective) {

ImportDirective importDirective = (ImportDirective) directive;

- Source importedSource = library.getSource(importDirective.getUri());

+ Source importedSource = library.getSource(importDirective);

if (importedSource != null) {

// The imported source will be null if the URI in the import directive was invalid.

if (importedSource.equals(coreLibrarySource)) {

@@ -599,7 +600,7 @@ public class LibraryResolver {

}

} else if (directive instanceof ExportDirective) {

ExportDirective exportDirective = (ExportDirective) directive;

- Source exportedSource = library.getSource(exportDirective.getUri());

+ Source exportedSource = library.getSource(exportDirective);

if (exportedSource != null) {

// The exported source will be null if the URI in the export directive was invalid.

Library exportedLibrary = libraryMap.get(exportedSource);