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

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

Issue 137143010: New analyzer snapshot. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 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
Index: pkg/analyzer/lib/src/generated/html.dart
diff --git a/pkg/analyzer/lib/src/generated/html.dart b/pkg/analyzer/lib/src/generated/html.dart
index 3d1f3037391cdb6bb1b8b1579c59bdf97a0b1b90..9a24e0548de22f380587382a8f3bf0e361a840f4 100644
--- a/pkg/analyzer/lib/src/generated/html.dart
+++ b/pkg/analyzer/lib/src/generated/html.dart
@@ -16,7 +16,7 @@ import 'scanner.dart' as sc show Scanner, SubSequenceReader, Token;
import 'parser.dart' show Parser;
import 'ast.dart';
import 'element.dart';
-import 'engine.dart' show AnalysisEngine;
+import 'engine.dart' show AnalysisEngine, AngularHtmlUnitResolver;
/**
* Instances of the class `Token` represent a token that was scanned from the input. Each
@@ -277,18 +277,12 @@ class HtmlUnitUtils {
*/
static Element getElementToOpen(HtmlUnit htmlUnit, Expression expression) {
Element element = getElement(expression);
- // special cases for Angular
- if (isAngular(htmlUnit)) {
- // replace artificial controller variable Element with controller ClassElement
- if (element is VariableElement) {
- VariableElement variable = element as VariableElement;
- Type2 type = variable.type;
- if (variable.nameOffset == 0 && type is InterfaceType) {
- element = type.element;
- }
+ {
+ AngularElement angularElement = AngularHtmlUnitResolver.getAngularElement(element);
+ if (angularElement != null) {
+ return angularElement;
}
}
- // done
return element;
}
@@ -327,11 +321,6 @@ class HtmlUnitUtils {
}
/**
- * Returns `true` if the given [HtmlUnit] has Angular annotation.
- */
- static bool isAngular(HtmlUnit htmlUnit) => false; // AngularHtmlUnitResolver.hasAngularAnnotation(htmlUnit);
-
- /**
* Returns the [Expression] that is part of the given root [ASTNode] and encloses the
* given offset.
*/
@@ -874,7 +863,7 @@ abstract class AbstractScanner {
c = recordStartOfLineAndAdvance(c);
}
emit3(TokenType.DECLARATION, start, -1);
- if (!_tail.lexeme.endsWith(">")) {
+ if (!StringUtilities.endsWithChar(_tail.lexeme, 0x3E)) {
}
}
} else if (c == 0x3F) {

Powered by Google App Engine
This is Rietveld 408576698