Skip to content

Commit cf43717

Browse files
mjbvzmjbvz
authored
Pick up new md grammar (microsoft#156844)
Also updates themes to better handle microsoft/vscode-markdown-tm-grammar#4
1 parent a7cd732 commit cf43717

13 files changed

Lines changed: 73 additions & 18 deletions

File tree

‎extensions/markdown-basics/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"git": {
3434
"name": "microsoft/vscode-markdown-tm-grammar",
3535
"repositoryUrl": "https://github.com/microsoft/vscode-markdown-tm-grammar",
36-
"commitHash": "69d3321b4923ca2d5e8e900018887cc38b5fe04a"
36+
"commitHash": "97f2f8d38f10d3febd77d85b745945dc60fe334e"
3737
}
3838
},
3939
"license": "MIT",

‎extensions/markdown-basics/syntaxes/markdown.tmLanguage.json‎

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/69d3321b4923ca2d5e8e900018887cc38b5fe04a",
7+
"version": "https://github.com/microsoft/vscode-markdown-tm-grammar/commit/97f2f8d38f10d3febd77d85b745945dc60fe334e",
88
"name": "Markdown",
99
"scopeName": "text.html.markdown",
1010
"patterns": [
@@ -2766,7 +2766,24 @@
27662766
"name": "punctuation.definition.link.title.begin.markdown"
27672767
},
27682768
"2": {
2769-
"name": "string.other.link.title.markdown"
2769+
"name": "string.other.link.title.markdown",
2770+
"patterns": [
2771+
{
2772+
"include": "#raw"
2773+
},
2774+
{
2775+
"include": "#bold"
2776+
},
2777+
{
2778+
"include": "#italic"
2779+
},
2780+
{
2781+
"include": "#strikethrough"
2782+
},
2783+
{
2784+
"include": "#image-inline"
2785+
}
2786+
]
27702787
},
27712788
"4": {
27722789
"name": "punctuation.definition.link.title.end.markdown"
@@ -2826,7 +2843,24 @@
28262843
"name": "punctuation.definition.link.title.begin.markdown"
28272844
},
28282845
"2": {
2829-
"name": "string.other.link.title.markdown"
2846+
"name": "string.other.link.title.markdown",
2847+
"patterns": [
2848+
{
2849+
"include": "#raw"
2850+
},
2851+
{
2852+
"include": "#bold"
2853+
},
2854+
{
2855+
"include": "#italic"
2856+
},
2857+
{
2858+
"include": "#strikethrough"
2859+
},
2860+
{
2861+
"include": "#image-inline"
2862+
}
2863+
]
28302864
},
28312865
"4": {
28322866
"name": "punctuation.definition.link.title.end.markdown"
@@ -2957,7 +2991,7 @@
29572991
"name": "punctuation.definition.strikethrough.markdown"
29582992
}
29592993
},
2960-
"match": "(~{2,})((?:[^~]|(?!(?<!~)\\1(?!~))~)*+)(\\1)",
2994+
"match": "(?<!\\\\)(~{2,})((?:[^~]|(?!(?<![~\\\\])\\1(?!~))~)*+)(\\1)",
29612995
"name": "markup.strikethrough.markdown"
29622996
}
29632997
}

‎extensions/theme-abyss/themes/abyss-color-theme.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
}
88
},
99
{
10-
"scope": ["meta.embedded", "source.groovy.embedded"],
10+
"scope": [
11+
"meta.embedded",
12+
"source.groovy.embedded",
13+
"string meta.image.inline.markdown"
14+
],
1115
"settings": {
1216
"foreground": "#6688cc"
1317
}

‎extensions/theme-defaults/themes/dark_vs.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
{
2727
"scope": [
2828
"meta.embedded",
29-
"source.groovy.embedded"
29+
"source.groovy.embedded",
30+
"string meta.image.inline.markdown",
3031
],
3132
"settings": {
3233
"foreground": "#D4D4D4"

‎extensions/theme-defaults/themes/hc_black.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
{
1818
"scope": [
1919
"meta.embedded",
20-
"source.groovy.embedded"
20+
"source.groovy.embedded",
21+
"string meta.image.inline.markdown"
2122
],
2223
"settings": {
2324
"foreground": "#FFFFFF"

‎extensions/theme-defaults/themes/light_vs.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
{
3333
"scope": [
3434
"meta.embedded",
35-
"source.groovy.embedded"
35+
"source.groovy.embedded",
36+
"string meta.image.inline.markdown"
3637
],
3738
"settings": {
3839
"foreground": "#000000ff"

‎extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@
6060
}
6161
},
6262
{
63-
"scope": ["meta.embedded", "source.groovy.embedded"],
63+
"scope": [
64+
"meta.embedded",
65+
"source.groovy.embedded",
66+
"string meta.image.inline.markdown"
67+
],
6468
"settings": {
6569
"foreground": "#d3af86"
6670
}

‎extensions/theme-monokai/themes/monokai-color-theme.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@
110110
{
111111
"scope": [
112112
"meta.embedded",
113-
"source.groovy.embedded"
113+
"source.groovy.embedded",
114+
"string meta.image.inline.markdown"
114115
],
115116
"settings": {
116117
"foreground": "#F8F8F2"

‎extensions/theme-quietlight/themes/quietlight-color-theme.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
{
1010
"scope": [
1111
"meta.embedded",
12-
"source.groovy.embedded"
12+
"source.groovy.embedded",
13+
"string meta.image.inline.markdown"
1314
],
1415
"settings": {
1516
"foreground": "#333333"

‎extensions/theme-red/themes/Red-color-theme.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
{
7070
"scope": [
7171
"meta.embedded",
72-
"source.groovy.embedded"
72+
"source.groovy.embedded",
73+
"string meta.image.inline.markdown"
7374
],
7475
"settings": {
7576
"foreground": "#F8F8F8"

0 commit comments

Comments
 (0)