Skip to content

Commit 7318fb7

Browse files
RedCMDRedCMD
committed
Update file/scope/lang names
1 parent 27dcf08 commit 7318fb7

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
}
9191
},
9292
{
93-
"id": "scopetm",
93+
"id": "textmate-scopes",
9494
"aliases": [
9595
"TextMate Scopes"
9696
],
@@ -113,7 +113,7 @@
113113
"scopeName": "source.json.textmate",
114114
"path": "./syntaxes/json.tmLanguage.json",
115115
"embeddedLanguages": {
116-
"meta.embedded.block.json.textmate.regexp": "json-textmate-regex"
116+
"meta.embedded.json.textmate.regexp": "json-textmate-regex"
117117
},
118118
"unbalancedBracketScopes": [
119119
"invalid.illegal.expected-dictionary-separator.json",
@@ -127,16 +127,16 @@
127127
"path": "./syntaxes/regex.tmLanguage.json"
128128
},
129129
{
130-
"language": "scopetm",
131-
"scopeName": "source.scopetm",
132-
"path": "./syntaxes/scopetm.tmLanguage.json",
130+
"language": "textmate-scopes",
131+
"scopeName": "source.textmate.scopes",
132+
"path": "./syntaxes/scopes.tmLanguage.json",
133133
"balancedBracketScopes": [
134134
"replace.capture"
135135
]
136136
},
137137
{
138138
"scopeName": "markdown.json.textmate.codeblock",
139-
"path": "./syntaxes/markdown-textmate.tmLanguage.json",
139+
"path": "./syntaxes/markdown.tmLanguage.json",
140140
"injectTo": [
141141
"text.html.markdown"
142142
],
@@ -152,8 +152,8 @@
152152
"path": "./snippets/textmate-regex.code-snippets"
153153
},
154154
{
155-
"language": "scopetm",
156-
"path": "./snippets/scopetm.code-snippets"
155+
"language": "textmate-scopes",
156+
"path": "./snippets/textmate-scopes.code-snippets"
157157
}
158158
],
159159
"configurationDefaults": {

snippets/scopetm.code-snippets renamed to snippets/textmate-scopes.code-snippets

File renamed without changes.

‎syntaxes/json.tmLanguage.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"comment": "This must be strict. So to reduce false positives",
9494
"begin": "\\A(?!$|\\s*{\\s*(?>$|})|\\s*\\[\\s*(?>$|\\[|{)|[^\t]*\t|(?>[^\\\\\"]+|\\\\.)*+.)",
9595
"end": "(?=[)\"])|$",
96-
"name": "meta.embedded.block.json.textmate.regexp",
96+
"name": "meta.embedded.json.textmate.regexp",
9797
"patterns": [
9898
{ "include": "source.json.textmate.regexp" },
9999
{
@@ -501,7 +501,7 @@
501501
"end": "\"",
502502
"beginCaptures": { "0": { "name": "punctuation.definition.string.begin.json.tm" } },
503503
"endCaptures": { "0": { "name": "punctuation.definition.string.end.json.tm" } },
504-
"contentName": "meta.embedded.block.json.textmate.regexp",
504+
"contentName": "meta.embedded.json.textmate.regexp",
505505
"patterns": [
506506
{ "include": "source.json.textmate.regexp" },
507507
{
@@ -536,7 +536,7 @@
536536
"end": "\"",
537537
"beginCaptures": { "0": { "name": "punctuation.definition.string.begin.json.tm" } },
538538
"endCaptures": { "0": { "name": "punctuation.definition.string.end.json.tm" } },
539-
"contentName": "meta.embedded.block.json.textmate.regexp",
539+
"contentName": "meta.embedded.json.textmate.regexp",
540540
"patterns": [
541541
{ "include": "source.json.textmate.regexp" },
542542
{
@@ -571,7 +571,7 @@
571571
"end": "\"",
572572
"beginCaptures": { "0": { "name": "punctuation.definition.string.begin.json.tm" } },
573573
"endCaptures": { "0": { "name": "punctuation.definition.string.end.json.tm" } },
574-
"contentName": "meta.embedded.block.json.textmate.regexp",
574+
"contentName": "meta.embedded.json.textmate.regexp",
575575
"patterns": [
576576
{ "include": "source.json.textmate.regexp" },
577577
{
@@ -827,7 +827,7 @@
827827
"end": "\"",
828828
"beginCaptures": { "0": { "name": "punctuation.definition.string.begin.json.tm" } },
829829
"endCaptures": { "0": { "name": "punctuation.definition.string.end.json.tm" } },
830-
"contentName": "meta.embedded.block.json.textmate.regexp",
830+
"contentName": "meta.embedded.json.textmate.regexp",
831831
"patterns": [
832832
{ "include": "source.json.textmate.regexp" },
833833
{

syntaxes/markdown-textmate.tmLanguage.json renamed to syntaxes/markdown.tmLanguage.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
2-
"version": "https://github.com/RedCMD/TmLanguage-Syntax-Highlighter/blob/main/syntaxes/markdown-textmate.tmLanguage.json",
2+
"version": "https://github.com/RedCMD/TmLanguage-Syntax-Highlighter/blob/main/syntaxes/markdown.tmLanguage.json",
33
"$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json",
4-
"name": "JSON TextMate Markdown codeblock",
4+
"comment": "https://github.com/mjbvz/vscode-fenced-code-block-grammar-injection-example/blob/master/syntaxes/codeblock.json",
5+
"name": "Markdown Code-Block Injection JSON TextMate",
56
"scopeName": "markdown.json.textmate.codeblock",
67
"injectionSelector": "L:text.html.markdown -meta.embedded.block.json.textmate",
78
"patterns": [
8-
{ "include": "#fenced_code_block_json-textmate" }
9+
{ "include": "#fenced_code_block_json_textmate" }
910
],
1011
"repository": {
11-
"fenced_code_block_json-textmate": {
12-
"begin": "(^|\\G)(\\s*)(`{3,}|~{3,})\\s*(?i:(json)((\\s+|:|,|\\{|\\?|-)textmate\\b[^`]*)$)",
12+
"fenced_code_block_json_textmate": {
13+
"begin": "(^|\\G)(\\s*)(\\`{3,}|~{3,})\\s*(?i:(json)((\\s+|:|,|\\{|\\?|-)textmate\\b[^`]*)$)",
1314
"name": "markup.fenced_code.block.markdown",
1415
"end": "(^|\\G)(\\2|\\s{0,3})(\\3)\\s*$",
1516
"beginCaptures": {

syntaxes/scopetm.tmLanguage.json renamed to syntaxes/scopes.tmLanguage.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"version": "https://github.com/RedCMD/TmLanguage-Syntax-Highlighter/blob/main/syntaxes/scopetm.tmLanguage.json",
2+
"version": "https://github.com/RedCMD/TmLanguage-Syntax-Highlighter/blob/main/syntaxes/scopes.tmLanguage.json",
33
"$schema": "https://raw.githubusercontent.com/RedCMD/TmLanguage-Syntax-Highlighter/main/vscode.tmLanguage.schema.json",
44
"name": "VSCode TextMate scope-name highlighter",
5-
"scopeName": "source.scopetm",
5+
"scopeName": "source.textmate.scopes",
66
"patterns": [ { "include": "#scope-name" } ],
77
"repository": {
88
"scope-name": {
@@ -17,7 +17,7 @@
1717
},
1818
{
1919
"comment": "Unresolvable capture group references do not convert, but instead just become plain text",
20-
"match": "(\\$)(0*)(\\d{1,3})(?!\\d)",
20+
"match": "(\\$)(0*)(\\d{3,1})(?!\\d)",
2121
"captures": {
2222
"0": { "name": "replace.capture.tm" },
2323
"1": { "name": "constant.character.escape.tm markup.italic.tm" },
@@ -26,7 +26,7 @@
2626
}
2727
},
2828
{
29-
"match": "(\\$)({)(0*)(\\d{1,3})(:/)(upcase|downcase)(})",
29+
"match": "(\\$)({)(0*)(\\d{3,1})(:/)(upcase|downcase)(})",
3030
"captures": {
3131
"0": { "name": "replace.capture.$6.tm" },
3232
"1": { "name": "constant.character.escape.tm markup.italic.tm" },

0 commit comments

Comments
 (0)