| 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 a72a1c8064d3d54dc351057af1b01f7c88c87c18..51fc3bff0672a19528a96921962d1c6e19a4310f 100644
|
| --- a/pkg/analyzer/lib/src/generated/html.dart
|
| +++ b/pkg/analyzer/lib/src/generated/html.dart
|
| @@ -401,9 +401,14 @@ class HtmlParser extends XmlParser {
|
| new XmlAttributeNode(name, equals, value);
|
|
|
| @override
|
| - XmlTagNode createTagNode(Token nodeStart, Token tag,
|
| - List<XmlAttributeNode> attributes, Token attributeEnd,
|
| - List<XmlTagNode> tagNodes, Token contentEnd, Token closingTag,
|
| + XmlTagNode createTagNode(
|
| + Token nodeStart,
|
| + Token tag,
|
| + List<XmlAttributeNode> attributes,
|
| + Token attributeEnd,
|
| + List<XmlTagNode> tagNodes,
|
| + Token contentEnd,
|
| + Token closingTag,
|
| Token nodeEnd) {
|
| if (_isScriptNode(tag, attributes, tagNodes)) {
|
| HtmlScriptTagNode tagNode = new HtmlScriptTagNode(nodeStart, tag,
|
| @@ -415,7 +420,8 @@ class HtmlParser extends XmlParser {
|
| new sc.SubSequenceReader(contents, contentOffset), _errorListener);
|
| scanner.setSourceStart(location.lineNumber, location.columnNumber);
|
| sc.Token firstToken = scanner.tokenize();
|
| - Parser parser = new Parser(source, _errorListener);
|
| + Parser parser = new Parser(source, _errorListener,
|
| + enableAssertMessage: _options.enableAssertMessage);
|
| CompilationUnit unit = parser.parseCompilationUnit(firstToken);
|
| unit.lineInfo = _lineInfo;
|
| tagNode.script = unit;
|
| @@ -529,12 +535,17 @@ class HtmlScriptTagNode extends XmlTagNode {
|
| * @param closingTag the name of the tag that occurs in the closing tag
|
| * @param nodeEnd the last token in the tag
|
| */
|
| - HtmlScriptTagNode(Token nodeStart, Token tag,
|
| - List<XmlAttributeNode> attributes, Token attributeEnd,
|
| - List<XmlTagNode> tagNodes, Token contentEnd, Token closingTag,
|
| + HtmlScriptTagNode(
|
| + Token nodeStart,
|
| + Token tag,
|
| + List<XmlAttributeNode> attributes,
|
| + Token attributeEnd,
|
| + List<XmlTagNode> tagNodes,
|
| + Token contentEnd,
|
| + Token closingTag,
|
| Token nodeEnd)
|
| : super(nodeStart, tag, attributes, attributeEnd, tagNodes, contentEnd,
|
| - closingTag, nodeEnd);
|
| + closingTag, nodeEnd);
|
|
|
| /**
|
| * Return the AST structure representing the Dart code within this tag, or `null` if this
|
| @@ -1421,11 +1432,17 @@ class XmlParser {
|
| * @param nodeEnd the last token in the tag
|
| * @return the node that was created
|
| */
|
| - XmlTagNode createTagNode(Token nodeStart, Token tag,
|
| - List<XmlAttributeNode> attributes, Token attributeEnd,
|
| - List<XmlTagNode> tagNodes, Token contentEnd, Token closingTag,
|
| - Token nodeEnd) => new XmlTagNode(nodeStart, tag, attributes, attributeEnd,
|
| - tagNodes, contentEnd, closingTag, nodeEnd);
|
| + XmlTagNode createTagNode(
|
| + Token nodeStart,
|
| + Token tag,
|
| + List<XmlAttributeNode> attributes,
|
| + Token attributeEnd,
|
| + List<XmlTagNode> tagNodes,
|
| + Token contentEnd,
|
| + Token closingTag,
|
| + Token nodeEnd) =>
|
| + new XmlTagNode(nodeStart, tag, attributes, attributeEnd, tagNodes,
|
| + contentEnd, closingTag, nodeEnd);
|
|
|
| /**
|
| * Answer `true` if the specified tag is self closing and thus should never have content or
|
| @@ -1736,9 +1753,15 @@ class XmlTagNode extends XmlNode {
|
| * @param nodeEnd the ending [TokenType.GT] or [TokenType.SLASH_GT] token (not
|
| * `null`)
|
| */
|
| - XmlTagNode(this.nodeStart, this._tag, List<XmlAttributeNode> attributes,
|
| - this.attributeEnd, List<XmlTagNode> tagNodes, this.contentEnd,
|
| - this.closingTag, this.nodeEnd) {
|
| + XmlTagNode(
|
| + this.nodeStart,
|
| + this._tag,
|
| + List<XmlAttributeNode> attributes,
|
| + this.attributeEnd,
|
| + List<XmlTagNode> tagNodes,
|
| + this.contentEnd,
|
| + this.closingTag,
|
| + this.nodeEnd) {
|
| this._attributes = becomeParentOfAll(attributes, ifEmpty: NO_ATTRIBUTES);
|
| this._tagNodes = becomeParentOfAll(tagNodes, ifEmpty: NO_TAG_NODES);
|
| }
|
|
|