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

Unified Diff: pkg/analyzer/lib/src/generated/engine.dart

Issue 1155473003: Don't schedule LIBRARY_ERRORS_READY for libraries that should not be analyzed. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 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 | « pkg/analyzer/lib/src/context/context.dart ('k') | pkg/analyzer/lib/src/task/dart_work_manager.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/generated/engine.dart
diff --git a/pkg/analyzer/lib/src/generated/engine.dart b/pkg/analyzer/lib/src/generated/engine.dart
index 7920a6a8fcd4b1a7b13c67bc12d31ed676abaead..3650fc84f4295198d424794fc088b3e09902bf7c 100644
--- a/pkg/analyzer/lib/src/generated/engine.dart
+++ b/pkg/analyzer/lib/src/generated/engine.dart
@@ -2505,6 +2505,17 @@ class AnalysisContextImpl implements InternalAnalysisContext {
}
@override
+ bool shouldErrorsBeAnalyzed(Source source, DartEntry dartEntry) {
+ if (source.isInSystemLibrary) {
+ return _generateSdkErrors;
+ } else if (!dartEntry.explicitlyAdded) {
+ return _generateImplicitErrors;
+ } else {
+ return true;
+ }
+ }
+
+ @override
void visitCacheItems(void callback(Source source, SourceEntry dartEntry,
DataDescriptor rowDesc, CacheState state)) {
bool hintsEnabled = _options.hint;
@@ -3637,7 +3648,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
return new AnalysisContextImpl_TaskData(
new ResolveDartLibraryTask(this, source, librarySource), false);
}
- if (_shouldErrorsBeAnalyzed(source, dartEntry)) {
+ if (shouldErrorsBeAnalyzed(source, dartEntry)) {
CacheState verificationErrorsState = dartEntry.getStateInLibrary(
DartEntry.VERIFICATION_ERRORS, librarySource);
if (verificationErrorsState == CacheState.INVALID ||
@@ -3819,7 +3830,7 @@ class AnalysisContextImpl implements InternalAnalysisContext {
return;
}
}
- if (_shouldErrorsBeAnalyzed(source, dartEntry)) {
+ if (shouldErrorsBeAnalyzed(source, dartEntry)) {
CacheState verificationErrorsState = dartEntry.getStateInLibrary(
DartEntry.VERIFICATION_ERRORS, librarySource);
if (verificationErrorsState == CacheState.INVALID ||
@@ -3993,47 +4004,6 @@ class AnalysisContextImpl implements InternalAnalysisContext {
}
}
- /**
- * Given that the given [source] (with the corresponding [sourceEntry]) has
- * been invalidated, invalidate all of the libraries that depend on it.
- */
- void _propagateInvalidation(Source source, SourceEntry sourceEntry) {
- if (sourceEntry is HtmlEntry) {
- HtmlEntry htmlEntry = sourceEntry;
- htmlEntry.modificationTime = getModificationStamp(source);
- htmlEntry.invalidateAllInformation();
- _cache.removedAst(source);
- _workManager.add(source, SourcePriority.HTML);
- } else if (sourceEntry is DartEntry) {
- List<Source> containingLibraries = getLibrariesContaining(source);
- List<Source> dependentLibraries = getLibrariesDependingOn(source);
- HashSet<Source> librariesToInvalidate = new HashSet<Source>();
- for (Source containingLibrary in containingLibraries) {
- _computeAllLibrariesDependingOn(
- containingLibrary, librariesToInvalidate);
- }
- for (Source dependentLibrary in dependentLibraries) {
- _computeAllLibrariesDependingOn(
- dependentLibrary, librariesToInvalidate);
- }
- for (Source library in librariesToInvalidate) {
- _invalidateLibraryResolution(library);
- }
- DartEntry dartEntry = _cache.get(source);
- _removeFromParts(source, dartEntry);
- dartEntry.modificationTime = getModificationStamp(source);
- dartEntry.invalidateAllInformation();
- _cache.removedAst(source);
- _workManager.add(source, SourcePriority.UNKNOWN);
- }
- // reset unit in the notification, it is out of date now
- ChangeNoticeImpl notice = _pendingNotices[source];
- if (notice != null) {
- notice.resolvedDartUnit = null;
- notice.resolvedHtmlUnit = null;
- }
- }
-
// /**
// * Notify all of the analysis listeners that the given source is no longer included in the set of
// * sources that are being analyzed.
@@ -4113,6 +4083,47 @@ class AnalysisContextImpl implements InternalAnalysisContext {
// }
/**
+ * Given that the given [source] (with the corresponding [sourceEntry]) has
+ * been invalidated, invalidate all of the libraries that depend on it.
+ */
+ void _propagateInvalidation(Source source, SourceEntry sourceEntry) {
+ if (sourceEntry is HtmlEntry) {
+ HtmlEntry htmlEntry = sourceEntry;
+ htmlEntry.modificationTime = getModificationStamp(source);
+ htmlEntry.invalidateAllInformation();
+ _cache.removedAst(source);
+ _workManager.add(source, SourcePriority.HTML);
+ } else if (sourceEntry is DartEntry) {
+ List<Source> containingLibraries = getLibrariesContaining(source);
+ List<Source> dependentLibraries = getLibrariesDependingOn(source);
+ HashSet<Source> librariesToInvalidate = new HashSet<Source>();
+ for (Source containingLibrary in containingLibraries) {
+ _computeAllLibrariesDependingOn(
+ containingLibrary, librariesToInvalidate);
+ }
+ for (Source dependentLibrary in dependentLibraries) {
+ _computeAllLibrariesDependingOn(
+ dependentLibrary, librariesToInvalidate);
+ }
+ for (Source library in librariesToInvalidate) {
+ _invalidateLibraryResolution(library);
+ }
+ DartEntry dartEntry = _cache.get(source);
+ _removeFromParts(source, dartEntry);
+ dartEntry.modificationTime = getModificationStamp(source);
+ dartEntry.invalidateAllInformation();
+ _cache.removedAst(source);
+ _workManager.add(source, SourcePriority.UNKNOWN);
+ }
+ // reset unit in the notification, it is out of date now
+ ChangeNoticeImpl notice = _pendingNotices[source];
+ if (notice != null) {
+ notice.resolvedDartUnit = null;
+ notice.resolvedHtmlUnit = null;
+ }
+ }
+
+ /**
* Record the results produced by performing a [task] and return the cache
* entry associated with the results.
*/
@@ -4511,20 +4522,6 @@ class AnalysisContextImpl implements InternalAnalysisContext {
}
/**
- * Return `true` if errors should be produced for the given [source]. The
- * [dartEntry] associated with the source is passed in for efficiency.
- */
- bool _shouldErrorsBeAnalyzed(Source source, DartEntry dartEntry) {
- if (source.isInSystemLibrary) {
- return _generateSdkErrors;
- } else if (!dartEntry.explicitlyAdded) {
- return _generateImplicitErrors;
- } else {
- return true;
- }
- }
-
- /**
* Create an entry for the newly added [source] and invalidate any sources
* that referenced the source before it existed.
*/
@@ -9168,6 +9165,15 @@ abstract class InternalAnalysisContext implements AnalysisContext {
void recordLibraryElements(Map<Source, LibraryElement> elementMap);
/**
+ * Return `true` if errors should be produced for the given [source].
+ * The [entry] associated with the source is passed in for efficiency.
+ *
+ * TODO(scheglov) remove [entry] after migration to the new task model.
+ * It is not used there anyway.
+ */
+ bool shouldErrorsBeAnalyzed(Source source, Object entry);
+
+ /**
* Call the given callback function for eache cache item in the context.
*/
void visitCacheItems(void callback(Source source, SourceEntry dartEntry,
« no previous file with comments | « pkg/analyzer/lib/src/context/context.dart ('k') | pkg/analyzer/lib/src/task/dart_work_manager.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698