From a4eb4d688477fb9f2176bb2ed932b0b1726caed3 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 5 Aug 2021 14:00:36 -0700 Subject: [PATCH] Update math fixture --- .../syntaxes/md-math-block.tmLanguage.json | 18 +-- .../test/colorize-results/md-math_md.json | 138 +++++++++--------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json b/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json index 02a476e1dff..b47ff12241f 100644 --- a/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json +++ b/extensions/markdown-math/syntaxes/md-math-block.tmLanguage.json @@ -3,18 +3,18 @@ "injectionSelector": "L:text.html.markdown - (comment, string, meta.paragraph.markdown, markup.math.block.markdown, markup.fenced_code.block.markdown)", "patterns": [ { - "include": "#double_quote_math_block" + "include": "#double_dollar_math_block" }, { - "include": "#single_math_block" + "include": "#single_dollar_math_block" } ], "repository": { - "double_quote_math_block": { + "double_dollar_math_block": { "name": "markup.math.block.markdown", "begin": "(?<=(^|\\G)\\s*)(\\${2})(?=\\s*$)", "beginCaptures": { - "1": { + "2": { "name": "punctuation.definition.math.begin.markdown" } }, @@ -37,15 +37,15 @@ } ] }, - "single_quote_math_block": { + "single_dollar_math_block": { "name": "markup.math.block.markdown", - "begin": "(?<=(^|\\G)\\s*)(\\$)(?=\\s*$)", + "begin": "(?<=(^|\\G)\\s*)(\\${1})(?=\\s*$)", "beginCaptures": { - "1": { + "2": { "name": "punctuation.definition.math.begin.markdown" } }, - "end": "(\\$)", + "end": "(\\${1})", "endCaptures": { "1": { "name": "punctuation.definition.math.end.markdown" @@ -54,7 +54,7 @@ "patterns": [ { "begin": "(^|\\G)(\\s*)(.*)", - "while": "(^|\\G)(?!.*(\\$))", + "while": "(^|\\G)(?!.*(\\${1}))", "contentName": "meta.embedded.math.markdown", "patterns": [ { diff --git a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json index 9a20eba5bd9..a86b6e52a41 100644 --- a/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json +++ b/extensions/vscode-colorize-tests/test/colorize-results/md-math_md.json @@ -34,7 +34,7 @@ }, { "c": "$$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -78,7 +78,7 @@ }, { "c": "$$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -155,62 +155,62 @@ }, { "c": "$$", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.end.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" } }, { "c": "**", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.math.operator.latex", + "t": "text.html.markdown meta.paragraph.markdown markup.bold.markdown punctuation.definition.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } }, { "c": "a", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex", + "t": "text.html.markdown meta.paragraph.markdown markup.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } }, { "c": "**", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.math.operator.latex", + "t": "text.html.markdown meta.paragraph.markdown markup.bold.markdown punctuation.definition.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } }, { "c": "$$", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" } }, { "c": "\\", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex meta.function.math.tex storage.type.function.math.tex punctuation.definition.function.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex storage.type.function.math.tex punctuation.definition.function.math.tex", "r": { "dark_plus": "storage.type: #569CD6", "light_plus": "storage.type: #0000FF", @@ -221,7 +221,7 @@ }, { "c": "relax", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex meta.function.math.tex storage.type.function.math.tex entity.name.function.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex storage.type.function.math.tex entity.name.function.math.tex", "r": { "dark_plus": "entity.name.function: #DCDCAA", "light_plus": "entity.name.function: #795E26", @@ -232,7 +232,7 @@ }, { "c": "{", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex meta.function.math.tex punctuation.definition.arguments.begin.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.definition.arguments.begin.math.tex", "r": { "dark_plus": "meta.embedded: #D4D4D4", "light_plus": "meta.embedded: #000000", @@ -243,7 +243,7 @@ }, { "c": "x", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex meta.function.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex", "r": { "dark_plus": "meta.embedded: #D4D4D4", "light_plus": "meta.embedded: #000000", @@ -254,7 +254,7 @@ }, { "c": "}", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex meta.function.math.tex punctuation.definition.arguments.end.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.definition.arguments.end.math.tex", "r": { "dark_plus": "meta.embedded: #D4D4D4", "light_plus": "meta.embedded: #000000", @@ -265,7 +265,7 @@ }, { "c": "{", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.math.begin.bracket.curly", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown punctuation.math.begin.bracket.curly", "r": { "dark_plus": "meta.embedded: #D4D4D4", "light_plus": "meta.embedded: #000000", @@ -276,7 +276,7 @@ }, { "c": "1", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex constant.numeric.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown constant.numeric.math.tex", "r": { "dark_plus": "constant.numeric: #B5CEA8", "light_plus": "constant.numeric: #098658", @@ -287,7 +287,7 @@ }, { "c": "}", - "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown meta.function.math.tex punctuation.definition.arguments.end.math.tex", + "t": "text.html.markdown markup.math.block.markdown meta.embedded.math.markdown punctuation.math.end.bracket.curly", "r": { "dark_plus": "meta.embedded: #D4D4D4", "light_plus": "meta.embedded: #000000", @@ -683,7 +683,7 @@ }, { "c": "$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -793,7 +793,7 @@ }, { "c": "$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1035,7 +1035,7 @@ }, { "c": "$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -1552,7 +1552,7 @@ }, { "c": "$", - "t": "text.html.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4027,7 +4027,7 @@ }, { "c": "$$", - "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown", + "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown punctuation.definition.math.begin.markdown", "r": { "dark_plus": "default: #D4D4D4", "light_plus": "default: #000000", @@ -4379,13 +4379,13 @@ }, { "c": "$$", - "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown meta.embedded.math.markdown", + "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown punctuation.definition.math.end.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "default: #D4D4D4", + "light_plus": "default: #000000", + "dark_vs": "default: #D4D4D4", + "light_vs": "default: #000000", + "hc_black": "default: #FFFFFF" } }, { @@ -4401,35 +4401,35 @@ }, { "c": "**", - "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown meta.embedded.math.markdown punctuation.math.operator.latex", + "t": "text.html.markdown markup.list.unnumbered.markdown meta.paragraph.markdown markup.bold.markdown punctuation.definition.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } }, { "c": "xyz", - "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown meta.embedded.math.markdown", + "t": "text.html.markdown markup.list.unnumbered.markdown meta.paragraph.markdown markup.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } }, { "c": "**", - "t": "text.html.markdown markup.list.unnumbered.markdown markup.math.block.markdown meta.embedded.math.markdown punctuation.math.operator.latex", + "t": "text.html.markdown markup.list.unnumbered.markdown meta.paragraph.markdown markup.bold.markdown punctuation.definition.bold.markdown", "r": { - "dark_plus": "meta.embedded: #D4D4D4", - "light_plus": "meta.embedded: #000000", - "dark_vs": "meta.embedded: #D4D4D4", - "light_vs": "meta.embedded: #000000", - "hc_black": "meta.embedded: #FFFFFF" + "dark_plus": "markup.bold: #569CD6", + "light_plus": "markup.bold: #000080", + "dark_vs": "markup.bold: #569CD6", + "light_vs": "markup.bold: #000080", + "hc_black": "default: #FFFFFF" } } ] \ No newline at end of file