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

Unified Diff: packages/analyzer/lib/src/task/dart_work_manager.dart

Issue 1521693002: Roll Observatory deps (charted -> ^0.3.0) (Closed) Base URL: https://chromium.googlesource.com/external/github.com/dart-lang/observatory_pub_packages.git@master
Patch Set: Created 5 years 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 | « packages/analyzer/lib/src/task/dart.dart ('k') | packages/analyzer/lib/src/task/html.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: packages/analyzer/lib/src/task/dart_work_manager.dart
diff --git a/packages/analyzer/lib/src/task/dart_work_manager.dart b/packages/analyzer/lib/src/task/dart_work_manager.dart
index 7114053c19154f602d072ceb22e691bc2a3605bb..61f92e5568edc1ba031b160aa737c809cd16a230 100644
--- a/packages/analyzer/lib/src/task/dart_work_manager.dart
+++ b/packages/analyzer/lib/src/task/dart_work_manager.dart
@@ -46,6 +46,7 @@ class DartWorkManager implements WorkManager {
LIBRARY_UNIT_ERRORS,
RESOLVE_TYPE_NAMES_ERRORS,
RESOLVE_UNIT_ERRORS,
+ STRONG_MODE_ERRORS,
VARIABLE_REFERENCE_ERRORS,
VERIFY_ERRORS
];
@@ -193,6 +194,12 @@ class DartWorkManager implements WorkManager {
* Maybe empty, but not null.
*/
List<Source> getLibrariesContainingPart(Source part) {
+ if (part.isInSystemLibrary) {
+ DartWorkManager sdkDartWorkManager = _getSdkDartWorkManager();
+ if (sdkDartWorkManager != this) {
+ return sdkDartWorkManager.getLibrariesContainingPart(part);
+ }
+ }
List<Source> libraries = partLibrariesMap[part];
return libraries != null ? libraries : Source.EMPTY_LIST;
}
@@ -265,6 +272,14 @@ class DartWorkManager implements WorkManager {
void resultsComputed(
AnalysisTarget target, Map<ResultDescriptor, dynamic> outputs) {
bool isDartSource = _isDartSource(target);
+ // Route SDK outputs to the SDK WorkManager.
+ if (isDartSource && target.source.isInSystemLibrary) {
+ DartWorkManager sdkWorkManager = _getSdkDartWorkManager();
+ if (sdkWorkManager != this) {
+ sdkWorkManager.resultsComputed(target, outputs);
+ return;
+ }
+ }
// Organize sources.
bool isDartLibrarySource = false;
if (isDartSource) {
@@ -339,6 +354,22 @@ class DartWorkManager implements WorkManager {
}
/**
+ * Return the SDK [DartWorkManager] or this one.
+ */
+ DartWorkManager _getSdkDartWorkManager() {
+ SourceFactory sourceFactory = context.sourceFactory;
+ InternalAnalysisContext sdkContext = sourceFactory.dartSdk.context;
+ if (sdkContext != context) {
+ for (WorkManager workManager in sdkContext.workManagers) {
+ if (workManager is DartWorkManager) {
+ return workManager;
+ }
+ }
+ }
+ return this;
+ }
+
+ /**
* Invalidate all of the resolution results computed by this context. The flag
* [invalidateUris] should be `true` if the cached results of converting URIs
* to source files should also be invalidated.
« no previous file with comments | « packages/analyzer/lib/src/task/dart.dart ('k') | packages/analyzer/lib/src/task/html.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698