Skip to content

fix escaping of html and Dart string literals #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2015
Merged

fix escaping of html and Dart string literals #131

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 25 additions & 11 deletions lib/src/html_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,21 @@

library dartdoc.html_utils;

//TODO: use HtmlEscape in dart:convert
String htmlEscape(String text) {
return text
.replaceAll('&', '&')
.replaceAll('>', '>')
.replaceAll('<', '&lt;');
}
import 'dart:convert';

String htmlEscape(String text) => HTML_ESCAPE.convert(text);

String escapeBrackets(String text) {
return text.replaceAll('>', '_').replaceAll('<', '_');
}

//TODO: Fix case of "\\n" which is mishandled with the current impl.
String stringEscape(String text, String quoteType) {
return text
.replaceAll('\\', r'\\')
.replaceAll(quoteType, "\\${quoteType}")
.replaceAll('\n', '\\n')
.replaceAll('\r', '\\r')
.replaceAll('\t', '\\t');
.replaceAllMapped(_escapeRegExp, (m) {
return _escapMap[m.input];
});
}

abstract class CodeResolver {
Expand Down Expand Up @@ -168,3 +164,21 @@ String replaceAll(String str, List<String> matchChars,
}
return buf.toString();
}

const _escapMap = const {
'\n': r'\n',
'\r': r'\r',
'\f': r'\f',
'\b': r'\b',
'\t': r'\t',
'\v': r'\v',
};

final _escapeStr = "[" + _escapMap.keys.map(_getHexLiteral).join() + "]";

final _escapeRegExp = new RegExp(_escapeStr);

String _getHexLiteral(String input) {
int rune = input.runes.single;
return r'\x' + rune.toRadixString(16).padLeft(2, '0');
}