Implcit new bug fix, hardcoding of flag now disabled.
Change-Id: I38f1535202cdba20e0db20f5df55eee314585ffc
Reviewed-on: https://dart-review.googlesource.com/38348
Commit-Queue: Jaime Wren <jwren@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analyzer/lib/src/generated/element_resolver.dart b/pkg/analyzer/lib/src/generated/element_resolver.dart
index d6d4c6c..1bf9bca 100644
--- a/pkg/analyzer/lib/src/generated/element_resolver.dart
+++ b/pkg/analyzer/lib/src/generated/element_resolver.dart
@@ -625,8 +625,7 @@
}
Element staticElement;
Element propagatedElement;
- bool previewDart2 =
- false; //_definingLibrary.context.analysisOptions.previewDart2;
+ bool previewDart2 = _definingLibrary.context.analysisOptions.previewDart2;
if (target == null) {
staticElement = _resolveInvokedElement(methodName);
propagatedElement = null;
@@ -1708,7 +1707,10 @@
bool isNamedConstructorCase = libraryPrefixId is PrefixedIdentifier;
ClassElement classElement;
if (isNamedConstructorCase) {
- classElement = (libraryPrefixId as PrefixedIdentifier).staticElement;
+ var elt = (libraryPrefixId as PrefixedIdentifier).staticElement;
+ if (elt is ClassElement) {
+ classElement = elt;
+ }
} else {
LibraryElementImpl libraryElementImpl = _getImportedLibrary(node.target);
classElement = libraryElementImpl.getType(node.methodName.name);
diff --git a/pkg/analyzer/test/generated/element_resolver_test.dart b/pkg/analyzer/test/generated/element_resolver_test.dart
index 1feb7a7..aaf88b9 100644
--- a/pkg/analyzer/test/generated/element_resolver_test.dart
+++ b/pkg/analyzer/test/generated/element_resolver_test.dart
@@ -33,7 +33,7 @@
defineReflectiveSuite(() {
defineReflectiveTests(ElementResolverCodeTest);
defineReflectiveTests(ElementResolverTest);
- //defineReflectiveTests(PreviewDart2Test);
+ defineReflectiveTests(PreviewDart2Test);
});
}
