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

Unified Diff: pkg/analyzer/lib/src/summary/package_bundle_reader.dart

Issue 1826353002: Add a fallback mode for building summaries. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 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 | « pkg/analyzer/lib/src/summary/idl.dart ('k') | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/package_bundle_reader.dart
diff --git a/pkg/analyzer/lib/src/summary/package_bundle_reader.dart b/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
index 13800da71b62c4b8614e2ec6d8f66974aa8acf98..9c70cbb012f6476970d5a608e4f90cd04c864afa 100644
--- a/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
+++ b/pkg/analyzer/lib/src/summary/package_bundle_reader.dart
@@ -4,8 +4,10 @@ import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/context/cache.dart';
import 'package:analyzer/src/context/context.dart';
import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/java_io.dart';
import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer/src/generated/source_io.dart';
import 'package:analyzer/src/summary/idl.dart';
import 'package:analyzer/src/summary/resynthesize.dart';
import 'package:analyzer/src/summary/summary_sdk.dart';
@@ -100,15 +102,77 @@ class InSummaryPackageUriResolver extends UriResolver {
@override
Source resolveAbsolute(Uri uri, [Uri actualUri]) {
actualUri ??= uri;
- if (_dataStore.unlinkedMap.containsKey(uri.toString())) {
- return new InSummarySource(
- actualUri, _dataStore.uriToSummaryPath[uri.toString()]);
+ UnlinkedUnit unit = _dataStore.unlinkedMap[uri.toString()];
+ if (unit != null) {
+ String summaryPath = _dataStore.uriToSummaryPath[uri.toString()];
+ if (unit.fallbackModePath.isNotEmpty) {
+ return new _InSummaryFallbackSource(
+ new JavaFile(unit.fallbackModePath), actualUri, summaryPath);
+ } else {
+ return new InSummarySource(actualUri, summaryPath);
+ }
}
return null;
}
}
/**
+ * A placeholder of a source that is part of a package whose analysis results
+ * are served from its summary. This source uses its URI as [fullName] and has
+ * empty contents.
+ */
+class InSummarySource extends Source {
+ final Uri uri;
+
+ /**
+ * The summary file where this source was defined.
+ */
+ final String summaryPath;
+
+ InSummarySource(this.uri, this.summaryPath);
+
+ @override
+ TimestampedData<String> get contents => new TimestampedData<String>(0, '');
+
+ @override
+ String get encoding => uri.toString();
+
+ @override
+ String get fullName => encoding;
+
+ @override
+ int get hashCode => uri.hashCode;
+
+ @override
+ bool get isInSystemLibrary => false;
+
+ @override
+ int get modificationStamp => 0;
+
+ @override
+ String get shortName => pathos.basename(fullName);
+
+ @override
+ UriKind get uriKind => UriKind.PACKAGE_URI;
+
+ @override
+ bool operator ==(Object object) =>
+ object is InSummarySource && object.uri == uri;
+
+ @override
+ bool exists() => true;
+
+ @override
+ Uri resolveRelativeUri(Uri relativeUri) {
+ Uri baseUri = uri;
+ return baseUri.resolveUri(relativeUri);
+ }
+
+ @override
+ String toString() => uri.toString();
+}
+
+/**
* A [SummaryDataStore] is a container for the data extracted from a set of
* summary package bundles. It contains maps which can be used to find linked
* and unlinked summaries by URI.
@@ -177,62 +241,21 @@ class _FileBasedSummaryResynthesizer extends SummaryResynthesizer {
@override
bool hasLibrarySummary(String uri) {
- return _dataStore.linkedMap.containsKey(uri);
+ LinkedLibrary linkedLibrary = _dataStore.linkedMap[uri];
+ return linkedLibrary != null && !linkedLibrary.fallbackMode;
}
}
/**
- * A placeholder of a source that is part of a package whose analysis results
- * are served from its summary. This source uses its URI as [fullName] and has
- * empty contents.
+ * A source that is part of a package whose summary was generated in fallback
+ * mode. This source behaves identically to a [FileBasedSource] except that it
+ * also provides [summaryPath].
*/
-class InSummarySource extends Source {
- final Uri uri;
-
- /**
- * The summary file where this source was defined.
- */
- final String summaryPath;
-
- InSummarySource(this.uri, this.summaryPath);
-
- @override
- TimestampedData<String> get contents => new TimestampedData<String>(0, '');
-
- @override
- String get encoding => uri.toString();
-
- @override
- String get fullName => encoding;
-
- @override
- int get hashCode => uri.hashCode;
-
- @override
- bool get isInSystemLibrary => false;
-
- @override
- int get modificationStamp => 0;
-
+class _InSummaryFallbackSource extends FileBasedSource
+ implements InSummarySource {
@override
- String get shortName => pathos.basename(fullName);
-
- @override
- UriKind get uriKind => UriKind.PACKAGE_URI;
-
- @override
- bool operator ==(Object object) =>
- object is InSummarySource && object.uri == uri;
-
- @override
- bool exists() => true;
-
- @override
- Uri resolveRelativeUri(Uri relativeUri) {
- Uri baseUri = uri;
- return baseUri.resolveUri(relativeUri);
- }
+ final String summaryPath;
- @override
- String toString() => uri.toString();
+ _InSummaryFallbackSource(JavaFile file, Uri uri, this.summaryPath)
+ : super(file, uri);
}
« no previous file with comments | « pkg/analyzer/lib/src/summary/idl.dart ('k') | pkg/analyzer/lib/src/summary/summarize_elements.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698