Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3 from dart-lang/tweaks
Browse files Browse the repository at this point in the history 
A number of fixes for HTML5lib
  • Loading branch information
John Messerly committed Mar 4, 2015
2 parents faeb310 + 4816d43 commit b2ecd40
Show file tree
Hide file tree
Showing 24 changed files with 3,399 additions and 1,395 deletions.
106 changes: 32 additions & 74 deletions lib/dom.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ class AttributeName implements Comparable {
int compareTo(other) {
// Not sure about this sort order
if (other is! AttributeName) return 1;
int cmp = (prefix != null ? prefix : "").compareTo(
(other.prefix != null ? other.prefix : ""));
int cmp = (prefix != null ? prefix : "")
.compareTo((other.prefix != null ? other.prefix : ""));
if (cmp != 0) return cmp;
cmp = name.compareTo(other.name);
if (cmp != 0) return cmp;
Expand All @@ -80,8 +80,7 @@ abstract class _ParentNode implements Node {
/// are implemented. For example, nth-child does not implement An+B syntax
/// and *-of-type is not implemented. If a selector is not implemented this
/// method will throw [UniplmentedError].
Element querySelector(String selector) =>
query.querySelector(this, selector);
Element querySelector(String selector) => query.querySelector(this, selector);

/// Returns all descendant nodes matching the given selectors, using a
/// preorder traversal.
Expand Down Expand Up @@ -111,10 +110,9 @@ abstract class _ElementAndDocument implements _ParentNode {
List<Element> getElementsByTagName(String localName) =>
querySelectorAll(localName);

List<Element> getElementsByClassName(String classNames) =>
querySelectorAll(classNames.splitMapJoin(' ',
onNonMatch: (m) => m.isNotEmpty ? '.$m' : m,
onMatch: (m) => ''));
List<Element> getElementsByClassName(String classNames) => querySelectorAll(
classNames.splitMapJoin(' ',
onNonMatch: (m) => m.isNotEmpty ? '.$m' : m, onMatch: (m) => ''));
}

/// Really basic implementation of a DOM-core like Node.
Expand Down Expand Up @@ -272,46 +270,6 @@ abstract class Node {

bool contains(Node node) => nodes.contains(node);

/// Checks if this is a type selector.
/// See <http://www.w3.org/TR/CSS2/grammar.html>.
/// Note: this doesn't support '*', the universal selector, non-ascii chars or
/// escape chars.
bool _isTypeSelector(String selector) {
// Parser:

// element_name
// : IDENT | '*'
// ;

// Lexer:

// nmstart [_a-z]|{nonascii}|{escape}
// nmchar [_a-z0-9-]|{nonascii}|{escape}
// ident -?{nmstart}{nmchar}*
// nonascii [\240-\377]
// unicode \\{h}{1,6}(\r\n|[ \t\r\n\f])?
// escape {unicode}|\\[^\r\n\f0-9a-f]

// As mentioned above, no nonascii or escape support yet.
int len = selector.length;
if (len == 0) return false;

int i = 0;
const int DASH = 45;
if (selector.codeUnitAt(i) == DASH) i++;

if (i >= len || !isLetter(selector[i])) return false;
i++;

for (; i < len; i++) {
if (!isLetterOrDigit(selector[i]) && selector.codeUnitAt(i) != DASH) {
return false;
}
}

return true;
}

/// Initialize [attributeSpans] using [sourceSpan].
void _ensureAttributeSpans() {
if (_attributeSpans != null) return;
Expand All @@ -321,8 +279,8 @@ abstract class Node {

if (sourceSpan == null) return;

var tokenizer = new HtmlTokenizer(sourceSpan.text, generateSpans: true,
attributeSpans: true);
var tokenizer = new HtmlTokenizer(sourceSpan.text,
generateSpans: true, attributeSpans: true);

tokenizer.moveNext();
var token = tokenizer.current as StartTagToken;
Expand All @@ -331,8 +289,8 @@ abstract class Node {

for (var attr in token.attributeSpans) {
var offset = sourceSpan.start.offset;
_attributeSpans[attr.name] = sourceSpan.file.span(
offset + attr.start, offset + attr.end);
_attributeSpans[attr.name] =
sourceSpan.file.span(offset + attr.start, offset + attr.end);
if (attr.startValue != null) {
_attributeValueSpans[attr.name] = sourceSpan.file.span(
offset + attr.startValue, offset + attr.endValue);
Expand All @@ -352,7 +310,6 @@ abstract class Node {

class Document extends Node
with _ParentNode, _NonElementParentNode, _ElementAndDocument {

Document() : super._();
factory Document.html(String html) => parse(html);

Expand Down Expand Up @@ -389,9 +346,7 @@ class Document extends Node
DocumentFragment createDocumentFragment() => new DocumentFragment();
}

class DocumentFragment extends Node
with _ParentNode, _NonElementParentNode {

class DocumentFragment extends Node with _ParentNode, _NonElementParentNode {
DocumentFragment() : super._();
factory DocumentFragment.html(String html) => parseFragment(html);

Expand Down Expand Up @@ -422,7 +377,8 @@ class DocumentType extends Node {

DocumentType(String name, this.publicId, this.systemId)
// Note: once Node.tagName is removed, don't pass "name" to super
: name = name, super._();
: name = name,
super._();

int get nodeType => Node.DOCUMENT_TYPE_NODE;

Expand All @@ -438,7 +394,6 @@ class DocumentType extends Node {
}
}


void _addOuterHtml(StringBuffer str) {
str.write(toString());
}
Expand All @@ -460,7 +415,9 @@ class Text extends Node {
Text clone(bool deep) => new Text(data);

String get text => data;
set text(String value) { data = value; }
set text(String value) {
data = value;
}
}

// TODO(jmesserly): Elements should have a pointer back to their document
Expand All @@ -473,7 +430,9 @@ class Element extends Node with _ParentNode, _ElementAndDocument {

Element._(this.localName, [this.namespaceUri]) : super._();

Element.tag(this.localName) : namespaceUri = Namespaces.html, super._();
Element.tag(this.localName)
: namespaceUri = Namespaces.html,
super._();

static final _START_TAG_REGEXP = new RegExp('<(\\w+)');

Expand Down Expand Up @@ -593,7 +552,8 @@ class Element extends Node with _ParentNode, _ElementAndDocument {
str.write('>');

if (nodes.length > 0) {
if (localName == 'pre' || localName == 'textarea' ||
if (localName == 'pre' ||
localName == 'textarea' ||
localName == 'listing') {
final first = nodes[0];
if (first is Text && first.data.startsWith('\n')) {
Expand Down Expand Up @@ -626,7 +586,7 @@ class Element extends Node with _ParentNode, _ElementAndDocument {

Element clone(bool deep) {
var result = new Element._(localName, namespaceUri)
..attributes = new LinkedHashMap.from(attributes);
..attributes = new LinkedHashMap.from(attributes);
return _clone(result, deep);
}

Expand Down Expand Up @@ -684,7 +644,6 @@ class Comment extends Node {
}
}


// TODO(jmesserly): fix this to extend one of the corelib classes if possible.
// (The requirement to remove the node from the old node list makes it tricky.)
// TODO(jmesserly): is there any way to share code with the _NodeListImpl?
Expand Down Expand Up @@ -758,7 +717,7 @@ class NodeList extends ListProxy<Node> {
// TODO(jmesserly): These aren't implemented in DOM _NodeListImpl, see
// http://code.google.com/p/dart/issues/detail?id=5371
void setRange(int start, int rangeLength, List<Node> from,
[int startFrom = 0]) {
[int startFrom = 0]) {
if (from is NodeList) {
// Note: this is presumed to make a copy
from = from.sublist(startFrom, startFrom + rangeLength);
Expand Down Expand Up @@ -817,14 +776,12 @@ class NodeList extends ListProxy<Node> {
}
}


/// An indexable collection of a node's descendants in the document tree,
/// filtered so that only elements are in the collection.
// TODO(jmesserly): this was copied from dart:html
// TODO(jmesserly): "implements List<Element>" is a workaround for analyzer bug.
class FilteredElementList extends IterableBase<Element> with ListMixin<Element>
implements List<Element> {

final Node _node;
final List<Node> _childNodes;

Expand All @@ -834,15 +791,17 @@ class FilteredElementList extends IterableBase<Element> with ListMixin<Element>
///
/// var filteredElements = new FilteredElementList(query("#container"));
/// // filteredElements is [a, b, c].
FilteredElementList(Node node): _childNodes = node.nodes, _node = node;
FilteredElementList(Node node)
: _childNodes = node.nodes,
_node = node;

// We can't memoize this, since it's possible that children will be messed
// with externally to this class.
//
// TODO(nweiz): we don't always need to create a new list. For example
// forEach, every, any, ... could directly work on the _childNodes.
List<Element> get _filtered =>
new List<Element>.from(_childNodes.where((n) => n is Element));
new List<Element>.from(_childNodes.where((n) => n is Element));

void forEach(void f(Element element)) {
_filtered.forEach(f);
Expand Down Expand Up @@ -886,7 +845,7 @@ class FilteredElementList extends IterableBase<Element> with ListMixin<Element>
}

void setRange(int start, int end, Iterable<Element> iterable,
[int skipCount = 0]) {
[int skipCount = 0]) {
throw new UnimplementedError();
}

Expand Down Expand Up @@ -957,7 +916,7 @@ class FilteredElementList extends IterableBase<Element> with ListMixin<Element>

bool every(bool f(Element element)) => _filtered.every(f);
bool any(bool f(Element element)) => _filtered.any(f);
List<Element> toList({ bool growable: true }) =>
List<Element> toList({bool growable: true}) =>
new List<Element>.from(this, growable: growable);
Set<Element> toSet() => new Set<Element>.from(this);
Element firstWhere(bool test(Element value), {Element orElse()}) {
Expand All @@ -980,12 +939,11 @@ class FilteredElementList extends IterableBase<Element> with ListMixin<Element>
int get length => _filtered.length;
Element operator [](int index) => _filtered[index];
Iterator<Element> get iterator => _filtered.iterator;
List<Element> sublist(int start, [int end]) =>
_filtered.sublist(start, end);
List<Element> sublist(int start, [int end]) => _filtered.sublist(start, end);
Iterable<Element> getRange(int start, int end) =>
_filtered.getRange(start, end);
_filtered.getRange(start, end);
int indexOf(Element element, [int start = 0]) =>
_filtered.indexOf(element, start);
_filtered.indexOf(element, start);

int lastIndexOf(Element element, [int start = null]) {
if (start == null) start = length - 1;
Expand Down
64 changes: 45 additions & 19 deletions lib/dom_parsing.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,20 @@ import 'src/constants.dart' show rcdataElements;
class TreeVisitor {
visit(Node node) {
switch (node.nodeType) {
case Node.ELEMENT_NODE: return visitElement(node);
case Node.TEXT_NODE: return visitText(node);
case Node.COMMENT_NODE: return visitComment(node);
case Node.DOCUMENT_FRAGMENT_NODE: return visitDocumentFragment(node);
case Node.DOCUMENT_NODE: return visitDocument(node);
case Node.DOCUMENT_TYPE_NODE: return visitDocumentType(node);
default: throw new UnsupportedError('DOM node type ${node.nodeType}');
case Node.ELEMENT_NODE:
return visitElement(node);
case Node.TEXT_NODE:
return visitText(node);
case Node.COMMENT_NODE:
return visitComment(node);
case Node.DOCUMENT_FRAGMENT_NODE:
return visitDocumentFragment(node);
case Node.DOCUMENT_NODE:
return visitDocument(node);
case Node.DOCUMENT_TYPE_NODE:
return visitDocumentType(node);
default:
throw new UnsupportedError('DOM node type ${node.nodeType}');
}
}

Expand Down Expand Up @@ -92,8 +99,7 @@ class CodeMarkupVisitor extends TreeVisitor {
_str.write(">");
return;
}
_str.write(
'&lt;/<code class="markup element-name">$tag</code>>');
_str.write('&lt;/<code class="markup element-name">$tag</code>>');
}

visitComment(Comment node) {
Expand All @@ -102,7 +108,6 @@ class CodeMarkupVisitor extends TreeVisitor {
}
}


// TODO(jmesserly): reconcile this with dart:web htmlEscape.
// This one might be more useful, as it is HTML5 spec compliant.
/// Escapes [text] for use in the
Expand All @@ -128,11 +133,21 @@ String htmlSerializeEscape(String text, {bool attributeMode: false}) {
var ch = text[i];
String replace = null;
switch (ch) {
case '&': replace = '&amp;'; break;
case '\u00A0'/*NO-BREAK SPACE*/: replace = '&nbsp;'; break;
case '"': if (attributeMode) replace = '&quot;'; break;
case '<': if (!attributeMode) replace = '&lt;'; break;
case '>': if (!attributeMode) replace = '&gt;'; break;
case '&':
replace = '&amp;';
break;
case '\u00A0' /*NO-BREAK SPACE*/ :
replace = '&nbsp;';
break;
case '"':
if (attributeMode) replace = '&quot;';
break;
case '<':
if (!attributeMode) replace = '&lt;';
break;
case '>':
if (!attributeMode) replace = '&gt;';
break;
}
if (replace != null) {
if (result == null) result = new StringBuffer(text.substring(0, i));
Expand All @@ -145,16 +160,27 @@ String htmlSerializeEscape(String text, {bool attributeMode: false}) {
return result != null ? result.toString() : text;
}


/// Returns true if this tag name is a void element.
/// This method is useful to a pretty printer, because void elements must not
/// have an end tag.
/// See also: <http://dev.w3.org/html5/markup/syntax.html#void-elements>.
bool isVoidElement(String tagName) {
switch (tagName) {
case "area": case "base": case "br": case "col": case "command":
case "embed": case "hr": case "img": case "input": case "keygen":
case "link": case "meta": case "param": case "source": case "track":
case "area":
case "base":
case "br":
case "col":
case "command":
case "embed":
case "hr":
case "img":
case "input":
case "keygen":
case "link":
case "meta":
case "param":
case "source":
case "track":
case "wbr":
return true;
}
Expand Down
Loading

0 comments on commit b2ecd40

Please sign in to comment.