From 6479dd998f5916ac7e4afb8ac6c3eb113bd4a566 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 8 Jun 2013 18:26:45 +0400 Subject: [PATCH 1/3] move underline to core styles --- lib/ace/theme/clouds.css | 4 ---- lib/ace/theme/clouds_midnight.css | 4 ---- lib/ace/theme/cobalt.css | 4 ---- lib/ace/theme/dawn.css | 4 ---- lib/ace/theme/idle_fingers.css | 4 ---- lib/ace/theme/kr_theme.css | 4 ---- lib/ace/theme/merbivore.css | 4 ---- lib/ace/theme/merbivore_soft.css | 4 ---- lib/ace/theme/mono_industrial.css | 4 ---- lib/ace/theme/monokai.css | 4 ---- lib/ace/theme/pastel_on_dark.css | 4 ---- lib/ace/theme/solarized_dark.css | 4 ---- lib/ace/theme/solarized_light.css | 4 ---- lib/ace/theme/terminal.css | 4 ---- lib/ace/theme/tomorrow.css | 4 ---- lib/ace/theme/tomorrow_night.css | 4 ---- lib/ace/theme/tomorrow_night_blue.css | 4 ---- lib/ace/theme/tomorrow_night_bright.css | 4 ---- lib/ace/theme/tomorrow_night_eighties.css | 4 ---- lib/ace/theme/twilight.css | 4 ---- 20 files changed, 80 deletions(-) diff --git a/lib/ace/theme/clouds.css b/lib/ace/theme/clouds.css index b89cc7c3..3424088b 100644 --- a/lib/ace/theme/clouds.css +++ b/lib/ace/theme/clouds.css @@ -112,10 +112,6 @@ color: #606060 } -.ace-clouds .ace_markup.ace_underline { - text-decoration: underline -} - .ace-clouds .ace_indent-guide { background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/clouds_midnight.css b/lib/ace/theme/clouds_midnight.css index da5d5b12..b84b6706 100644 --- a/lib/ace/theme/clouds_midnight.css +++ b/lib/ace/theme/clouds_midnight.css @@ -113,10 +113,6 @@ color: #606060 } -.ace-clouds-midnight .ace_markup.ace_underline { - text-decoration: underline -} - .ace-clouds-midnight .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 4f18d9a8..7caccf15 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -123,10 +123,6 @@ color: #9EFFFF } -.ace-cobalt .ace_markup.ace_underline { - text-decoration: underline -} - .ace-cobalt .ace_markup.ace_heading { color: #C8E4FD; background-color: #001221 diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index 2857035d..ac3a02f5 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -121,10 +121,6 @@ color: #234A97 } -.ace-dawn .ace_markup.ace_underline { - text-decoration: underline -} - .ace-dawn .ace_markup.ace_heading { color: #19356D } diff --git a/lib/ace/theme/idle_fingers.css b/lib/ace/theme/idle_fingers.css index f3e0345c..a0f2ffed 100644 --- a/lib/ace/theme/idle_fingers.css +++ b/lib/ace/theme/idle_fingers.css @@ -112,10 +112,6 @@ color: #FFC66D } -.ace-idle-fingers .ace_markup.ace_underline { - text-decoration: underline -} - .ace-idle-fingers .ace_collab.ace_user1 { color: #323232; background-color: #FFF980 diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index 899c4fba..54e38a8f 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -119,10 +119,6 @@ color: #BABD9C } -.ace-kr-theme .ace_markup.ace_underline { - text-decoration: underline -} - .ace-kr-theme .ace_markup.ace_list { background-color: #0F0040 } diff --git a/lib/ace/theme/merbivore.css b/lib/ace/theme/merbivore.css index 0f9c89a7..5770ce3b 100644 --- a/lib/ace/theme/merbivore.css +++ b/lib/ace/theme/merbivore.css @@ -110,10 +110,6 @@ color: #FFFF89 } -.ace-merbivore .ace_markup.ace_underline { - text-decoration: underline -} - .ace-merbivore .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/merbivore_soft.css b/lib/ace/theme/merbivore_soft.css index 038273cb..975493c6 100644 --- a/lib/ace/theme/merbivore_soft.css +++ b/lib/ace/theme/merbivore_soft.css @@ -111,10 +111,6 @@ color: #EAF1A3 } -.ace-merbivore-soft .ace_markup.ace_underline { - text-decoration: underline -} - .ace-merbivore-soft .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 83e8bd7b..90aaf5d1 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -122,10 +122,6 @@ color: #909993 } -.ace-mono-industrial .ace_markup.ace_underline { - text-decoration: underline -} - .ace-mono-industrial .ace_entity.ace_name.ace_tag { color: #A65EFF } diff --git a/lib/ace/theme/monokai.css b/lib/ace/theme/monokai.css index 2f34149a..6bcf4f5c 100644 --- a/lib/ace/theme/monokai.css +++ b/lib/ace/theme/monokai.css @@ -117,10 +117,6 @@ color: #75715E } -.ace-monokai .ace_markup.ace_underline { - text-decoration: underline -} - .ace-monokai .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/pastel_on_dark.css b/lib/ace/theme/pastel_on_dark.css index 729a7b65..6f54986b 100644 --- a/lib/ace/theme/pastel_on_dark.css +++ b/lib/ace/theme/pastel_on_dark.css @@ -129,10 +129,6 @@ color: #494949 } -.ace-pastel-on-dark .ace_markup.ace_underline { - text-decoration: underline -} - .ace-pastel-on-dark .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/solarized_dark.css b/lib/ace/theme/solarized_dark.css index 9fd8a8d5..43f6f12d 100644 --- a/lib/ace/theme/solarized_dark.css +++ b/lib/ace/theme/solarized_dark.css @@ -105,10 +105,6 @@ color: #657B83 } -.ace-solarized-dark .ace_markup.ace_underline { - text-decoration: underline -} - .ace-solarized-dark .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/solarized_light.css b/lib/ace/theme/solarized_light.css index d10ed1b3..3a99d732 100644 --- a/lib/ace/theme/solarized_light.css +++ b/lib/ace/theme/solarized_light.css @@ -106,10 +106,6 @@ color: #93A1A1 } -.ace-solarized-light .ace_markup.ace_underline { - text-decoration: underline -} - .ace-solarized-light .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/terminal.css b/lib/ace/theme/terminal.css index e6a94aca..ee4e5dea 100644 --- a/lib/ace/theme/terminal.css +++ b/lib/ace/theme/terminal.css @@ -132,10 +132,6 @@ color: orangered } -.ace-terminal-theme .ace_markup.ace_underline { - text-decoration: underline -} - .ace-terminal-theme .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLBWV/8PAAK4AYnhiq+xAAAAAElFTkSuQmCC) right repeat-y; } diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 210b0e18..9c39d916 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -125,10 +125,6 @@ color: #8E908C } -.ace-tomorrow .ace_markup.ace_underline { - text-decoration: underline -} - .ace-tomorrow .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index 686b5ea3..cd61a463 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -124,10 +124,6 @@ color: #969896 } -.ace-tomorrow-night .ace_markup.ace_underline { - text-decoration: underline -} - .ace-tomorrow-night .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index b819e1ad..c2d9a616 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -124,10 +124,6 @@ color: #7285B7 } -.ace-tomorrow-night-blue .ace_markup.ace_underline { - text-decoration: underline -} - .ace-tomorrow-night-blue .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 2c9eedfa..656f9736 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -124,10 +124,6 @@ color: #969896 } -.ace-tomorrow-night-bright .ace_markup.ace_underline { - text-decoration: underline -} - .ace-tomorrow-night-bright .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 62308e6c..74ef8370 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -123,10 +123,6 @@ color: #F2777A } -.ace-tomorrow-night-eighties .ace_markup.ace_underline { - text-decoration: underline -} - .ace-tomorrow-night-eighties .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ09NrYAgMjP4PAAtGAwchHMyAAAAAAElFTkSuQmCC) right repeat-y } \ No newline at end of file diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 5ee32e93..9ca52358 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -126,10 +126,6 @@ color: #494949 } -.ace-twilight .ace_markup.ace_underline { - text-decoration: underline -} - .ace-twilight .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y; } \ No newline at end of file From 186e6b1b86923ba7510ef3d079604147c01fe514 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 8 Jun 2013 18:34:42 +0400 Subject: [PATCH 2/3] use `markup.heading` for `#` and `heading` for the defaultToken fixes #1457 --- lib/ace/mode/markdown_highlight_rules.js | 4 ++-- lib/ace/theme/chrome.css | 4 ++-- lib/ace/theme/cobalt.css | 4 ++-- lib/ace/theme/dawn.css | 4 ++-- lib/ace/theme/dreamweaver.css | 4 ++-- lib/ace/theme/kr_theme.css | 2 +- lib/ace/theme/terminal.css | 2 +- lib/ace/theme/textmate.css | 4 ++-- lib/ace/theme/tomorrow.css | 2 +- lib/ace/theme/tomorrow_night.css | 2 +- lib/ace/theme/tomorrow_night_blue.css | 2 +- lib/ace/theme/tomorrow_night_bright.css | 2 +- lib/ace/theme/tomorrow_night_eighties.css | 2 +- lib/ace/theme/twilight.css | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js index f9591b36..56ee5e60 100644 --- a/lib/ace/mode/markdown_highlight_rules.js +++ b/lib/ace/mode/markdown_highlight_rules.js @@ -140,7 +140,7 @@ var MarkdownHighlightRules = function() { }, { include: "basic" }, { - defaultToken : "markup.heading" + defaultToken : "heading" } ], "listblock-start" : [{ @@ -160,7 +160,7 @@ var MarkdownHighlightRules = function() { }, { include : "basic", noEscape: true }, { - defaultToken : "markup.list" + defaultToken : "list" } ], "blockquote" : [ { // BLockquotes only escape on blank lines. diff --git a/lib/ace/theme/chrome.css b/lib/ace/theme/chrome.css index e2bcb11d..f7e65098 100644 --- a/lib/ace/theme/chrome.css +++ b/lib/ace/theme/chrome.css @@ -97,11 +97,11 @@ } -.ace-chrome .ace_markup.ace_heading { +.ace-chrome .ace_heading { color: rgb(12, 7, 255); } -.ace-chrome .ace_markup.ace_list { +.ace-chrome .ace_list { color:rgb(185, 6, 144); } diff --git a/lib/ace/theme/cobalt.css b/lib/ace/theme/cobalt.css index 7caccf15..36608202 100644 --- a/lib/ace/theme/cobalt.css +++ b/lib/ace/theme/cobalt.css @@ -123,12 +123,12 @@ color: #9EFFFF } -.ace-cobalt .ace_markup.ace_heading { +.ace-cobalt .ace_heading { color: #C8E4FD; background-color: #001221 } -.ace-cobalt .ace_markup.ace_list { +.ace-cobalt .ace_list { background-color: #130D26 } diff --git a/lib/ace/theme/dawn.css b/lib/ace/theme/dawn.css index ac3a02f5..3bbf33fe 100644 --- a/lib/ace/theme/dawn.css +++ b/lib/ace/theme/dawn.css @@ -94,7 +94,7 @@ border-color: #080808 } -.ace-dawn .ace_markup.ace_list, +.ace-dawn .ace_list, .ace-dawn .ace_support.ace_function { color: #693A17 } @@ -121,7 +121,7 @@ color: #234A97 } -.ace-dawn .ace_markup.ace_heading { +.ace-dawn .ace_heading { color: #19356D } diff --git a/lib/ace/theme/dreamweaver.css b/lib/ace/theme/dreamweaver.css index a0b42806..949be9ca 100644 --- a/lib/ace/theme/dreamweaver.css +++ b/lib/ace/theme/dreamweaver.css @@ -105,11 +105,11 @@ } -.ace-dreamweaver .ace_markup.ace_heading { +.ace-dreamweaver .ace_heading { color: rgb(12, 7, 255); } -.ace-dreamweaver .ace_markup.ace_list { +.ace-dreamweaver .ace_list { color:rgb(185, 6, 144); } diff --git a/lib/ace/theme/kr_theme.css b/lib/ace/theme/kr_theme.css index 54e38a8f..e9e336f5 100644 --- a/lib/ace/theme/kr_theme.css +++ b/lib/ace/theme/kr_theme.css @@ -119,7 +119,7 @@ color: #BABD9C } -.ace-kr-theme .ace_markup.ace_list { +.ace-kr-theme .ace_list { background-color: #0F0040 } diff --git a/lib/ace/theme/terminal.css b/lib/ace/theme/terminal.css index ee4e5dea..2bafcbc2 100644 --- a/lib/ace/theme/terminal.css +++ b/lib/ace/theme/terminal.css @@ -115,7 +115,7 @@ color: #E7C547 } -.ace-terminal-theme .ace_markup.ace_heading, +.ace-terminal-theme .ace_heading, .ace-terminal-theme .ace_string { color: #B9CA4A } diff --git a/lib/ace/theme/textmate.css b/lib/ace/theme/textmate.css index eb657170..43b8ed36 100644 --- a/lib/ace/theme/textmate.css +++ b/lib/ace/theme/textmate.css @@ -105,11 +105,11 @@ } -.ace-tm .ace_markup.ace_heading { +.ace-tm .ace_heading { color: rgb(12, 7, 255); } -.ace-tm .ace_markup.ace_list { +.ace-tm .ace_list { color:rgb(185, 6, 144); } diff --git a/lib/ace/theme/tomorrow.css b/lib/ace/theme/tomorrow.css index 9c39d916..f8f05614 100644 --- a/lib/ace/theme/tomorrow.css +++ b/lib/ace/theme/tomorrow.css @@ -108,7 +108,7 @@ color: #C99E00 } -.ace-tomorrow .ace_markup.ace_heading, +.ace-tomorrow .ace_heading, .ace-tomorrow .ace_string { color: #718C00 } diff --git a/lib/ace/theme/tomorrow_night.css b/lib/ace/theme/tomorrow_night.css index cd61a463..1118799a 100644 --- a/lib/ace/theme/tomorrow_night.css +++ b/lib/ace/theme/tomorrow_night.css @@ -107,7 +107,7 @@ color: #F0C674 } -.ace-tomorrow-night .ace_markup.ace_heading, +.ace-tomorrow-night .ace_heading, .ace-tomorrow-night .ace_string { color: #B5BD68 } diff --git a/lib/ace/theme/tomorrow_night_blue.css b/lib/ace/theme/tomorrow_night_blue.css index c2d9a616..51dfe2bf 100644 --- a/lib/ace/theme/tomorrow_night_blue.css +++ b/lib/ace/theme/tomorrow_night_blue.css @@ -107,7 +107,7 @@ color: #FFEEAD } -.ace-tomorrow-night-blue .ace_markup.ace_heading, +.ace-tomorrow-night-blue .ace_heading, .ace-tomorrow-night-blue .ace_string { color: #D1F1A9 } diff --git a/lib/ace/theme/tomorrow_night_bright.css b/lib/ace/theme/tomorrow_night_bright.css index 656f9736..065d9783 100644 --- a/lib/ace/theme/tomorrow_night_bright.css +++ b/lib/ace/theme/tomorrow_night_bright.css @@ -107,7 +107,7 @@ color: #E7C547 } -.ace-tomorrow-night-bright .ace_markup.ace_heading, +.ace-tomorrow-night-bright .ace_heading, .ace-tomorrow-night-bright .ace_string { color: #B9CA4A } diff --git a/lib/ace/theme/tomorrow_night_eighties.css b/lib/ace/theme/tomorrow_night_eighties.css index 74ef8370..613fd9a0 100644 --- a/lib/ace/theme/tomorrow_night_eighties.css +++ b/lib/ace/theme/tomorrow_night_eighties.css @@ -107,7 +107,7 @@ color: #FFCC66 } -.ace-tomorrow-night-eighties .ace_markup.ace_heading, +.ace-tomorrow-night-eighties .ace_heading, .ace-tomorrow-night-eighties .ace_string { color: #99CC99 } diff --git a/lib/ace/theme/twilight.css b/lib/ace/theme/twilight.css index 9ca52358..3f9d40e6 100644 --- a/lib/ace/theme/twilight.css +++ b/lib/ace/theme/twilight.css @@ -65,7 +65,7 @@ .ace-twilight .ace_constant.ace_character, .ace-twilight .ace_constant.ace_character.ace_escape, .ace-twilight .ace_constant.ace_other, -.ace-twilight .ace_markup.ace_heading, +.ace-twilight .ace_heading, .ace-twilight .ace_support.ace_constant { color: #CF6A4C } @@ -94,7 +94,7 @@ color: #DAD085 } -.ace-twilight .ace_markup.ace_list, +.ace-twilight .ace_list, .ace-twilight .ace_storage { color: #F9EE98 } From b46250ffa19520b624bd0ead8a3584374eb1fbd4 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 8 Jun 2013 18:49:44 +0400 Subject: [PATCH 3/3] update markdown test --- lib/ace/mode/_test/tokens_lsl.json | 2 +- lib/ace/mode/_test/tokens_markdown.json | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/lib/ace/mode/_test/tokens_lsl.json b/lib/ace/mode/_test/tokens_lsl.json index a34106a6..b007cf11 100644 --- a/lib/ace/mode/_test/tokens_lsl.json +++ b/lib/ace/mode/_test/tokens_lsl.json @@ -492,4 +492,4 @@ ["paren.rparen.lsl","}"] ],[ "start" -]] +]] \ No newline at end of file diff --git a/lib/ace/mode/_test/tokens_markdown.json b/lib/ace/mode/_test/tokens_markdown.json index 91f7f992..0d2de0e3 100644 --- a/lib/ace/mode/_test/tokens_markdown.json +++ b/lib/ace/mode/_test/tokens_markdown.json @@ -4,28 +4,28 @@ ],[ "start", ["markup.heading.1","#"], - ["markup.heading","f"] + ["heading","f"] ],[ "start", ["text","test: header 2"] ],[ "start", ["markup.heading.2","##"], - ["markup.heading"," foo"] + ["heading"," foo"] ],[ "start", ["text","test: header ends with ' #'"] ],[ "start", ["markup.heading.1","#"], - ["markup.heading"," # # "] + ["heading"," # # "] ],[ "start", ["text","test: header ends with '#'"] ],[ "start", ["markup.heading.1","#"], - ["markup.heading","foo# "] + ["heading","foo# "] ],[ "start", ["text","test: 6+ #s is not a valid header"] @@ -49,13 +49,13 @@ ],[ "start", ["markup.heading.1","#"], - ["markup.heading"," test links "], + ["heading"," test links "], ["text","["], ["string","Cloud9 IDE"], ["text","]("], ["markup.underline","http://www.c9.io/"], ["text",")"], - ["markup.heading"," #"] + ["heading"," #"] ],[ "listblock", ["markup.list","* "], @@ -64,17 +64,18 @@ ["text","]("], ["markup.underline","http://ajaxorg.github.com/ace/"], ["text",")"], - ["markup.list"," "] + ["list"," "] ],[ "listblock", - ["markup.list","* usually "], + ["markup.list","* "], + ["list","usually "], ["string","*work*"], - ["markup.list"," fine ("], + ["list"," fine ("], ["string","_em_"], - ["markup.list",")"] + ["list",")"] ],[ "listblock", - ["markup.list","in lists"] + ["list","in lists"] ],[ "start" ],[