Merge remote-tracking branch 'origin/master' into SDK_AT_HEAD
diff --git a/angular_analyzer_plugin/lib/src/completion.dart b/angular_analyzer_plugin/lib/src/completion.dart
index 124700a..69563db 100644
--- a/angular_analyzer_plugin/lib/src/completion.dart
+++ b/angular_analyzer_plugin/lib/src/completion.dart
@@ -1185,9 +1185,9 @@
}
}
-/// Used to create a shell [ResolveResult] class for usage in
+/// Used to create a shell [ResolvedUnitResult] class for usage in
/// [TypeMemberContributor] and [InheritedReferenceContributor].
-class _ResolveResultShell implements ResolveResult {
+class _ResolveResultShell implements ResolvedUnitResult {
@override
LibraryElement libraryElement;
diff --git a/angular_analyzer_plugin/lib/src/standard_components.dart b/angular_analyzer_plugin/lib/src/standard_components.dart
index dbc3b49..5e5132e 100644
--- a/angular_analyzer_plugin/lib/src/standard_components.dart
+++ b/angular_analyzer_plugin/lib/src/standard_components.dart
@@ -1,3 +1,4 @@
+import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/ast/ast.dart' as ast;
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
@@ -321,9 +322,9 @@
this.securitySchema});
factory StandardAngular.fromAnalysis(
- {AnalysisResult angularResult,
- AnalysisResult securityResult,
- AnalysisResult protoSecurityResult}) {
+ {ResolvedUnitResult angularResult,
+ ResolvedUnitResult securityResult,
+ ResolvedUnitResult protoSecurityResult}) {
final ng = angularResult.unit.element.library.exportNamespace;
final security = securityResult.unit.element.library.exportNamespace;
final protoSecurity = protoSecurityResult == null
diff --git a/tools/update_deps.sh b/tools/update_deps.sh
index 46c8509..3e44b97 100755
--- a/tools/update_deps.sh
+++ b/tools/update_deps.sh
@@ -6,6 +6,9 @@
echo Updating the sdk with depot_tools
gclient sync
+cd sdk
+git checkout analyzer
+cd ..
echo done
echo
