Merge pull request dart-lang/markdown#72 from dart-lang/kevmoo_cleanup
Misc cleanup
diff --git a/pkgs/markdown/.gitignore b/pkgs/markdown/.gitignore
index 492ac23..282c7f8 100644
--- a/pkgs/markdown/.gitignore
+++ b/pkgs/markdown/.gitignore
@@ -2,3 +2,4 @@
.packages
.pub
packages
+pubspec.lock
diff --git a/pkgs/markdown/bin/markdown.dart b/pkgs/markdown/bin/markdown.dart
index f6932ec..76f68e1 100644
--- a/pkgs/markdown/bin/markdown.dart
+++ b/pkgs/markdown/bin/markdown.dart
@@ -2,7 +2,7 @@
import 'package:markdown/markdown.dart';
-void main(List<String> args) async {
+main(List<String> args) async {
if (args.length > 1) {
print('Usage: markdown.dart [file]');
exit(1);
diff --git a/pkgs/markdown/lib/src/html_renderer.dart b/pkgs/markdown/lib/src/html_renderer.dart
index d9f8111..184f9f9 100644
--- a/pkgs/markdown/lib/src/html_renderer.dart
+++ b/pkgs/markdown/lib/src/html_renderer.dart
@@ -7,6 +7,7 @@
import 'dart:collection';
import 'ast.dart';
+import 'block_parser.dart';
import 'document.dart';
import 'extension_set.dart';
import 'inline_parser.dart';
diff --git a/pkgs/markdown/lib/src/inline_parser.dart b/pkgs/markdown/lib/src/inline_parser.dart
index afa9d37..bdcb4a3 100644
--- a/pkgs/markdown/lib/src/inline_parser.dart
+++ b/pkgs/markdown/lib/src/inline_parser.dart
@@ -11,7 +11,8 @@
/// Maintains the internal state needed to parse inline span elements in
/// Markdown.
class InlineParser {
- static final List<InlineSyntax> _defaultSyntaxes = <InlineSyntax>[
+ static final List<InlineSyntax> _defaultSyntaxes =
+ new List<InlineSyntax>.unmodifiable(<InlineSyntax>[
// This first RegExp matches plain text to accelerate parsing. It's written
// so that it does not match any prefix of any following syntaxes. Most
// Markdown is plain text, so it's faster to match one RegExp per 'word'
@@ -53,7 +54,7 @@
new TagSyntax(r'\b_', tag: 'em', end: r'_\b'),
new CodeSyntax(),
// We will add the LinkSyntax once we know about the specific link resolver.
- ];
+ ]);
/// The string of Markdown being parsed.
final String source;
@@ -208,8 +209,6 @@
/// Escape punctuation preceded by a backslash.
class EscapeSyntax extends InlineSyntax {
- final String substitute;
-
EscapeSyntax() : super(r'''\\[!"#$%&'()*+,\-./:;<=>?@\[\\\]^_`{|}~]''');
bool onMatch(InlineParser parser, Match match) {
diff --git a/pkgs/markdown/pubspec.lock b/pkgs/markdown/pubspec.lock
deleted file mode 100644
index ad5b554..0000000
--- a/pkgs/markdown/pubspec.lock
+++ /dev/null
@@ -1,131 +0,0 @@
-# Generated by pub
-# See http://pub.dartlang.org/doc/glossary.html#lockfile
-packages:
- analyzer:
- description: analyzer
- source: hosted
- version: "0.26.1+3"
- args:
- description: args
- source: hosted
- version: "0.13.2"
- async:
- description: async
- source: hosted
- version: "1.3.0"
- barback:
- description: barback
- source: hosted
- version: "0.15.2+6"
- charcode:
- description: charcode
- source: hosted
- version: "1.1.0"
- collection:
- description: collection
- source: hosted
- version: "1.1.2"
- crypto:
- description: crypto
- source: hosted
- version: "0.9.0"
- csslib:
- description: csslib
- source: hosted
- version: "0.12.1"
- glob:
- description: glob
- source: hosted
- version: "1.0.5"
- html:
- description: html
- source: hosted
- version: "0.12.2"
- http_multi_server:
- description: http_multi_server
- source: hosted
- version: "1.3.2"
- http_parser:
- description: http_parser
- source: hosted
- version: "1.0.0"
- logging:
- description: logging
- source: hosted
- version: "0.11.1+1"
- matcher:
- description: matcher
- source: hosted
- version: "0.12.0+1"
- mime:
- description: mime
- source: hosted
- version: "0.9.3"
- package_config:
- description: package_config
- source: hosted
- version: "0.1.3"
- path:
- description: path
- source: hosted
- version: "1.3.6"
- plugin:
- description: plugin
- source: hosted
- version: "0.1.0"
- pool:
- description: pool
- source: hosted
- version: "1.1.0"
- pub_semver:
- description: pub_semver
- source: hosted
- version: "1.2.1"
- shelf:
- description: shelf
- source: hosted
- version: "0.6.3"
- shelf_static:
- description: shelf_static
- source: hosted
- version: "0.2.3+1"
- shelf_web_socket:
- description: shelf_web_socket
- source: hosted
- version: "0.0.1+4"
- source_map_stack_trace:
- description: source_map_stack_trace
- source: hosted
- version: "1.0.4"
- source_maps:
- description: source_maps
- source: hosted
- version: "0.10.1"
- source_span:
- description: source_span
- source: hosted
- version: "1.2.0"
- stack_trace:
- description: stack_trace
- source: hosted
- version: "1.4.2"
- string_scanner:
- description: string_scanner
- source: hosted
- version: "0.1.4"
- test:
- description: test
- source: hosted
- version: "0.12.4+7"
- utf:
- description: utf
- source: hosted
- version: "0.9.0+2"
- watcher:
- description: watcher
- source: hosted
- version: "0.9.7"
- yaml:
- description: yaml
- source: hosted
- version: "2.1.5"
