Merge pull request dart-lang/markdown#112 from dart-lang/fix_analyzer_errors
Remove unused members, properly implement Node in UnparsedContent
diff --git a/pkgs/markdown/lib/src/ast.dart b/pkgs/markdown/lib/src/ast.dart
index 26cd4a7..cf2b1f7 100644
--- a/pkgs/markdown/lib/src/ast.dart
+++ b/pkgs/markdown/lib/src/ast.dart
@@ -72,8 +72,8 @@
/// of a document are still being parsed, in order to gather all reference link
/// definitions.
class UnparsedContent implements Node {
- final String content;
- UnparsedContent(this.content);
+ final String textContent;
+ UnparsedContent(this.textContent);
void accept(NodeVisitor visitor) => null;
}
diff --git a/pkgs/markdown/lib/src/block_parser.dart b/pkgs/markdown/lib/src/block_parser.dart
index 13340f4..51f2f9a 100644
--- a/pkgs/markdown/lib/src/block_parser.dart
+++ b/pkgs/markdown/lib/src/block_parser.dart
@@ -190,17 +190,12 @@
/// Generates a valid HTML anchor from the inner text of [element].
static String generateAnchorHash(Element element) =>
- element.children.first.content
+ element.children.first.textContent
.toLowerCase()
.trim()
.replaceFirst(new RegExp(r'^[^a-z]+'), '')
.replaceAll(new RegExp(r'[^a-z0-9 _-]'), '')
.replaceAll(new RegExp(r'\s'), '-');
-
- /// Concatenates the text found in all the children of [element].
- static String _concatenatedText(Element element) => element.children
- .map((child) => (child is Text) ? child.text : _concatenatedText(child))
- .join('');
}
class EmptyBlockSyntax extends BlockSyntax {
@@ -747,7 +742,7 @@
List<String> _extractReflinkDefinitions(
BlockParser parser, List<String> lines) {
bool lineStartsReflinkDefinition(int i) =>
- lines[i].startsWith(new RegExp(r'[ ]{0,3}\['));
+ lines[i].startsWith(_reflinkDefinitionStart);
int i = 0;
loopOverDefinitions: while (true) {
diff --git a/pkgs/markdown/lib/src/document.dart b/pkgs/markdown/lib/src/document.dart
index f804d12..32361d7 100644
--- a/pkgs/markdown/lib/src/document.dart
+++ b/pkgs/markdown/lib/src/document.dart
@@ -43,7 +43,7 @@
for (int i = 0; i < nodes.length; i++) {
var node = nodes[i];
if (node is UnparsedContent) {
- List<Node> inlineNodes = parseInline(node.content);
+ List<Node> inlineNodes = parseInline(node.textContent);
nodes.removeAt(i);
nodes.insertAll(i, inlineNodes);
i += inlineNodes.length - 1;