Merge pr/1692 into master
This commit is contained in:
commit
e70f0773df
1 changed files with 9 additions and 4 deletions
|
|
@ -83,7 +83,7 @@ var MarkdownHighlightRules = function() {
|
||||||
next : "githubblock"
|
next : "githubblock"
|
||||||
}, { // block quote
|
}, { // block quote
|
||||||
token : "string.blockquote",
|
token : "string.blockquote",
|
||||||
regex : "^>[ ].+$",
|
regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
|
||||||
next : "blockquote"
|
next : "blockquote"
|
||||||
}, { // HR * - _
|
}, { // HR * - _
|
||||||
token : "constant",
|
token : "constant",
|
||||||
|
|
@ -165,16 +165,21 @@ var MarkdownHighlightRules = function() {
|
||||||
}, {
|
}, {
|
||||||
include : "basic", noEscape: true
|
include : "basic", noEscape: true
|
||||||
}, {
|
}, {
|
||||||
defaultToken : "list"
|
defaultToken : "list" //do not use markup.list to allow stling leading `*` differntly
|
||||||
} ],
|
} ],
|
||||||
|
|
||||||
"blockquote" : [ { // BLockquotes only escape on blank lines.
|
"blockquote" : [ { // BLockquotes only escape on blank lines.
|
||||||
token : "empty_line",
|
token : "empty_line",
|
||||||
regex : "^\\s*$",
|
regex : "^\\s*$",
|
||||||
next : "start"
|
next : "start"
|
||||||
|
}, { // block quote
|
||||||
|
token : "string.blockquote",
|
||||||
|
regex : "^\\s*>\\s*(?:[*+-]|\\d+\\.)?\\s+",
|
||||||
|
next : "blockquote"
|
||||||
}, {
|
}, {
|
||||||
token : "string",
|
include : "basic", noEscape: true
|
||||||
regex : ".+"
|
}, {
|
||||||
|
defaultToken : "string.blockquote"
|
||||||
} ],
|
} ],
|
||||||
|
|
||||||
"githubblock" : [ {
|
"githubblock" : [ {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue