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

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

Issue 2668473002: Allow SDKs to be analyzed that lack a definition of FutureOr<T>. (Closed)
Patch Set: Created 3 years, 11 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/generated/resolver.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/src/summary/summary_sdk.dart
diff --git a/pkg/analyzer/lib/src/summary/summary_sdk.dart b/pkg/analyzer/lib/src/summary/summary_sdk.dart
index b178fdcf081225890781a03e9d1281d0cfd2d21b..7e9e1f5efd577b0525458880b9b7df8d872711d7 100644
--- a/pkg/analyzer/lib/src/summary/summary_sdk.dart
+++ b/pkg/analyzer/lib/src/summary/summary_sdk.dart
@@ -15,6 +15,7 @@ import 'package:analyzer/src/generated/resolver.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/generated/source.dart'
show DartUriResolver, Source, SourceFactory;
+import 'package:analyzer/src/generated/testing/element_factory.dart';
import 'package:analyzer/src/summary/idl.dart';
import 'package:analyzer/src/summary/package_bundle_reader.dart';
@@ -192,7 +193,14 @@ class SummaryTypeProvider extends TypeProviderBase {
@override
InterfaceType get futureOrType {
assert(_asyncLibrary != null);
- _futureOrType ??= _getType(_asyncLibrary, "FutureOr");
+ try {
+ _futureOrType ??= _getType(_asyncLibrary, "FutureOr");
+ } on StateError {
+ // FutureOr<T> is still fairly new, so if we're analyzing an SDK that
+ // doesn't have it yet, create an element for it.
+ _futureOrType =
+ TypeProviderImpl.createPlaceholderFutureOr(futureType, objectType);
+ }
return _futureOrType;
}
« no previous file with comments | « pkg/analyzer/lib/src/generated/resolver.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698