From 8fdf170a0850c1cc027382f31650aaf300d3ae2a Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 12 Feb 2018 16:54:35 +0100 Subject: [PATCH] update grammar script: remove unused properties --- build/npm/update-grammar.js | 10 +- .../bat/syntaxes/batchfile.tmLanguage.json | 6 +- .../clojure/syntaxes/clojure.tmLanguage.json | 19 +- .../syntaxes/coffeescript.tmLanguage.json | 10 +- extensions/cpp/syntaxes/c.tmLanguage.json | 8 +- extensions/cpp/syntaxes/cpp.tmLanguage.json | 22 +- .../cpp/syntaxes/platform.tmLanguage.json | 9 +- .../csharp/syntaxes/csharp.tmLanguage.json | 4 - extensions/css/syntaxes/css.tmLanguage.json | 7 +- extensions/diff/syntaxes/diff.tmLanguage.json | 12 +- .../docker/syntaxes/docker.tmLanguage.json | 8 +- .../fsharp/syntaxes/fsharp.tmLanguage.json | 5 - .../gitsyntax/syntaxes/diff.tmLanguage.json | 12 +- .../syntaxes/git-commit.tmLanguage.json | 11 +- .../syntaxes/git-rebase.tmLanguage.json | 8 +- extensions/go/syntaxes/go.tmLanguage.json | 7 +- .../groovy/syntaxes/groovy.tmLanguage.json | 12 +- .../syntaxes/Handlebars.tmLanguage.json | 90 ++-- extensions/hlsl/syntaxes/hlsl.tmLanguage.json | 12 +- extensions/html/syntaxes/html.tmLanguage.json | 18 +- extensions/ini/syntaxes/ini.tmLanguage.json | 10 +- extensions/java/syntaxes/java.tmLanguage.json | 6 +- .../syntaxes/JavaScript.tmLanguage.json | 13 +- .../syntaxes/JavaScriptReact.tmLanguage.json | 13 +- extensions/json/syntaxes/JSON.tmLanguage.json | 19 +- extensions/less/syntaxes/less.tmLanguage.json | 8 - extensions/log/syntaxes/log.tmLanguage.json | 8 +- extensions/lua/syntaxes/lua.tmLanguage.json | 14 +- extensions/make/syntaxes/make.tmLanguage.json | 11 +- .../syntaxes/markdown.tmLanguage.json | 12 +- .../syntaxes/objective-c++.tmLanguage.json | 7 +- .../syntaxes/objective-c.tmLanguage.json | 10 +- extensions/perl/syntaxes/perl.tmLanguage.json | 18 +- .../perl/syntaxes/perl6.tmLanguage.json | 13 +- extensions/php/syntaxes/html.tmLanguage.json | 20 +- .../syntaxes/powershell.tmLanguage.json | 10 +- extensions/pug/syntaxes/pug.tmLanguage.json | 8 +- .../syntaxes/MagicPython.tmLanguage.json | 21 - .../syntaxes/MagicRegExp.tmLanguage.json | 4 - extensions/r/syntaxes/r.tmLanguage.json | 15 +- .../razor/syntaxes/cshtml.tmLanguage.json | 4 - extensions/ruby/syntaxes/ruby.tmLanguage.json | 45 +- extensions/rust/syntaxes/rust.tmLanguage.json | 407 +++++++++--------- extensions/scss/syntaxes/scss.tmLanguage.json | 9 +- .../syntaxes/shaderlab.tmLanguage.json | 5 +- .../syntaxes/shell-unix-bash.tmLanguage.json | 64 +-- extensions/sql/syntaxes/sql.tmLanguage.json | 11 +- .../swift/syntaxes/swift.tmLanguage.json | 6 +- .../syntaxes/TypeScript.tmLanguage.json | 10 +- .../syntaxes/TypeScriptReact.tmLanguage.json | 10 +- .../vb/syntaxes/asp-vb-net.tmlanguage.json | 11 +- extensions/xml/syntaxes/xml.tmLanguage.json | 82 +--- extensions/xml/syntaxes/xsl.tmLanguage.json | 6 +- extensions/yaml/syntaxes/yaml.tmLanguage.json | 17 +- 54 files changed, 353 insertions(+), 864 deletions(-) diff --git a/build/npm/update-grammar.js b/build/npm/update-grammar.js index 21c37de6762..822de7c59c2 100644 --- a/build/npm/update-grammar.js +++ b/build/npm/update-grammar.js @@ -46,7 +46,7 @@ function download(url, redirectCount) { let location = response.headers['location']; if (location) { console.log("Redirected " + url + " to " + location); - download(location, count+1).then(c, e); + download(location, count + 1).then(c, e); return; } } @@ -86,7 +86,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas } else if (ext === '.json') { grammar = JSON.parse(content); } else { - return Promise.reject(new Error(('Unknown file extension: ' + ext))); + return Promise.reject(new Error('Unknown file extension: ' + ext)); } if (modifyGrammar) { modifyGrammar(grammar); @@ -103,8 +103,10 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas if (info) { result.version = 'https://github.com/' + repoId + '/commit/' + info.commitSha; } - for (let key in grammar) { - if (!result.hasOwnProperty(key)) { + + let keys = ['name', 'scopeName', 'comment', 'injections', 'patterns', 'repository']; + for (let key of keys) { + if (grammar.hasOwnProperty(key)) { result[key] = grammar[key]; } } diff --git a/extensions/bat/syntaxes/batchfile.tmLanguage.json b/extensions/bat/syntaxes/batchfile.tmLanguage.json index 42adcf64854..2aee0692ad8 100644 --- a/extensions/bat/syntaxes/batchfile.tmLanguage.json +++ b/extensions/bat/syntaxes/batchfile.tmLanguage.json @@ -5,12 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/mmims/language-batchfile/commit/3dd105c31484e5975144478dac1aa91d8f51e528", - "scopeName": "source.batchfile", "name": "Batch File", - "fileTypes": [ - "bat", - "cmd" - ], + "scopeName": "source.batchfile", "patterns": [ { "include": "#commands" diff --git a/extensions/clojure/syntaxes/clojure.tmLanguage.json b/extensions/clojure/syntaxes/clojure.tmLanguage.json index 033e3e2a178..3d059513af0 100644 --- a/extensions/clojure/syntaxes/clojure.tmLanguage.json +++ b/extensions/clojure/syntaxes/clojure.tmLanguage.json @@ -5,25 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-clojure/commit/ecc790326bc8e14220e4d2d72a392a30876c3219", - "scopeName": "source.clojure", - "fileTypes": [ - "boot", - "clj", - "clj.hl", - "cljc", - "cljs", - "cljs.hl", - "cljx", - "clojure", - "edn", - "org", - "joke", - "joker" - ], - "foldingStartMarker": "\\(\\s*$", - "foldingStopMarker": "^\\s*\\)", - "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n boot\n(?:$|\\s)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n clojure(script)?\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n clojure\n (?=\\s|:|$)\n)", "name": "Clojure", + "scopeName": "source.clojure", "patterns": [ { "include": "#comment" diff --git a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json index 0e4c904a029..5fcff295c61 100644 --- a/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json +++ b/extensions/coffeescript/syntaxes/coffeescript.tmLanguage.json @@ -5,16 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-coffee-script/commit/a0da2a73ad817e2fc13c2ef8fcd2624017c39610", - "scopeName": "source.coffee", "name": "CoffeeScript", - "fileTypes": [ - "coffee", - "Cakefile", - "coffee.erb", - "cson", - "_coffee" - ], - "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n coffee\n(?:$|\\s)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n coffee\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n coffee\n (?=\\s|:|$)\n)", + "scopeName": "source.coffee", "patterns": [ { "match": "(new)\\s+(?:(?:(class)\\s+(\\w+(?:\\.\\w*)*)?)|(\\w+(?:\\.\\w*)*))", diff --git a/extensions/cpp/syntaxes/c.tmLanguage.json b/extensions/cpp/syntaxes/c.tmLanguage.json index d5143bd4901..bcd5470a64c 100644 --- a/extensions/cpp/syntaxes/c.tmLanguage.json +++ b/extensions/cpp/syntaxes/c.tmLanguage.json @@ -5,14 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-c/commit/9c0c5f202741a5647025db8d5df5fefba47b036c", - "scopeName": "source.c", - "fileTypes": [ - "c", - "h.in", - "xpm" - ], - "firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C(\\s*;.*?)?\\s*-\\*-", "name": "C", + "scopeName": "source.c", "patterns": [ { "include": "#preprocessor-rule-enabled" diff --git a/extensions/cpp/syntaxes/cpp.tmLanguage.json b/extensions/cpp/syntaxes/cpp.tmLanguage.json index 4cd5c4e8d91..f29bc255ba8 100644 --- a/extensions/cpp/syntaxes/cpp.tmLanguage.json +++ b/extensions/cpp/syntaxes/cpp.tmLanguage.json @@ -5,28 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-c/commit/3a269f88b12e512fb9495dc006a1dabf325d3d7f", - "scopeName": "source.cpp", - "fileTypes": [ - "cc", - "cpp", - "cp", - "cxx", - "c++", - "cu", - "cuh", - "h", - "hh", - "hpp", - "hxx", - "h++", - "inl", - "ino", - "ipp", - "tcc", - "tpp" - ], - "firstLineMatch": "(?i)-\\*-[^*]*(Mode:\\s*)?C\\+\\+(\\s*;.*?)?\\s*-\\*-", "name": "C++", + "scopeName": "source.cpp", "patterns": [ { "include": "#special_block" diff --git a/extensions/cpp/syntaxes/platform.tmLanguage.json b/extensions/cpp/syntaxes/platform.tmLanguage.json index bc4821b4f63..14fb45016c0 100644 --- a/extensions/cpp/syntaxes/platform.tmLanguage.json +++ b/extensions/cpp/syntaxes/platform.tmLanguage.json @@ -5,10 +5,9 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/c.tmbundle/commit/9aa365882274ca52f01722f3dbb169b9539a20ee", - "comment": "This file was generated with clang-C using MacOSX10.12.sdk", - "fileTypes": [], - "hideFromUser": true, "name": "Platform", + "scopeName": "source.c.platform", + "comment": "This file was generated with clang-C using MacOSX10.12.sdk", "patterns": [ { "match": "\\bkCF(?:CalendarUnitWeek|Gregorian(?:AllUnits|Units(?:Days|Hours|M(?:inutes|onths)|Seconds|Years)))\\b", @@ -568,7 +567,5 @@ } ] } - }, - "scopeName": "source.c.platform", - "uuid": "3E3CB242-CEBA-4B61-9806-9A97B5783D2A" + } } \ No newline at end of file diff --git a/extensions/csharp/syntaxes/csharp.tmLanguage.json b/extensions/csharp/syntaxes/csharp.tmLanguage.json index 074c761a4d5..fb3f667f5b1 100644 --- a/extensions/csharp/syntaxes/csharp.tmLanguage.json +++ b/extensions/csharp/syntaxes/csharp.tmLanguage.json @@ -7,10 +7,6 @@ "version": "https://github.com/dotnet/csharp-tmLanguage/commit/ca22c5211b87a6a1a8fd5356895237bb821df728", "name": "C#", "scopeName": "source.cs", - "fileTypes": [ - "cs" - ], - "uuid": "f7de61e2-bdde-4e2a-a139-8221b179584e", "patterns": [ { "include": "#preprocessor" diff --git a/extensions/css/syntaxes/css.tmLanguage.json b/extensions/css/syntaxes/css.tmLanguage.json index 4c734ddba93..a8fc2fe565e 100644 --- a/extensions/css/syntaxes/css.tmLanguage.json +++ b/extensions/css/syntaxes/css.tmLanguage.json @@ -5,13 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-css/commit/2bc1e294e2440ad91197263cd9f95dc4b00bab2f", - "scopeName": "source.css", "name": "CSS", - "fileTypes": [ - "css", - "css.erb" - ], - "firstLineMatch": "(?xi)\n# Emacs modeline\n-\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n css\n(?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n css\n(?=\\s|:|$)", + "scopeName": "source.css", "patterns": [ { "include": "#comment-block" diff --git a/extensions/diff/syntaxes/diff.tmLanguage.json b/extensions/diff/syntaxes/diff.tmLanguage.json index e0d60de1081..d60bbb145f7 100644 --- a/extensions/diff/syntaxes/diff.tmLanguage.json +++ b/extensions/diff/syntaxes/diff.tmLanguage.json @@ -5,14 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7", - "fileTypes": [ - "patch", - "diff", - "rej" - ], - "firstLineMatch": "(?x)^\n\t\t(===\\ modified\\ file\n\t\t|==== \\s* // .+ \\s - \\s .+ \\s+ ====\n\t\t|Index:\\ \n\t\t|---\\ [^%\\n]\n\t\t|\\*\\*\\*.*\\d{4}\\s*$\n\t\t|\\d+(,\\d+)* (a|d|c) \\d+(,\\d+)* $\n\t\t|diff\\ --git\\ \n\t\t|commit\\ [0-9a-f]{40}$\n\t\t)", - "keyEquivalent": "^~D", "name": "Diff", + "scopeName": "source.diff", "patterns": [ { "captures": { @@ -162,7 +156,5 @@ "match": "^Only in .*: .*$\\n?", "name": "meta.diff.only-in" } - ], - "scopeName": "source.diff", - "uuid": "7E848FF4-708E-11D9-97B4-0011242E4184" + ] } \ No newline at end of file diff --git a/extensions/docker/syntaxes/docker.tmLanguage.json b/extensions/docker/syntaxes/docker.tmLanguage.json index 44a028e7858..f7f414636c4 100644 --- a/extensions/docker/syntaxes/docker.tmLanguage.json +++ b/extensions/docker/syntaxes/docker.tmLanguage.json @@ -5,10 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/moby/moby/commit/abd39744c6f3ed854500e423f5fabf952165161f", - "fileTypes": [ - "Dockerfile" - ], "name": "Dockerfile", + "scopeName": "source.dockerfile", "patterns": [ { "captures": { @@ -100,7 +98,5 @@ "comment": "comment.line", "match": "^(\\s*)((#).*$\\n?)" } - ], - "scopeName": "source.dockerfile", - "uuid": "a39d8795-59d2-49af-aa00-fe74ee29576e" + ] } \ No newline at end of file diff --git a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json index a47bc570fbe..eb16f2829ad 100644 --- a/extensions/fsharp/syntaxes/fsharp.tmLanguage.json +++ b/extensions/fsharp/syntaxes/fsharp.tmLanguage.json @@ -7,11 +7,6 @@ "version": "https://github.com/ionide/ionide-fsgrammar/commit/9aa4b1055e3173225bc0d4b4e48542c2450beb99", "name": "fsharp", "scopeName": "source.fsharp", - "fileTypes": [ - "fs" - ], - "foldingStartMarker": "", - "foldingStopMarker": "", "patterns": [ { "include": "#comments" diff --git a/extensions/gitsyntax/syntaxes/diff.tmLanguage.json b/extensions/gitsyntax/syntaxes/diff.tmLanguage.json index e0d60de1081..d60bbb145f7 100644 --- a/extensions/gitsyntax/syntaxes/diff.tmLanguage.json +++ b/extensions/gitsyntax/syntaxes/diff.tmLanguage.json @@ -5,14 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/diff.tmbundle/commit/0593bb775eab1824af97ef2172fd38822abd97d7", - "fileTypes": [ - "patch", - "diff", - "rej" - ], - "firstLineMatch": "(?x)^\n\t\t(===\\ modified\\ file\n\t\t|==== \\s* // .+ \\s - \\s .+ \\s+ ====\n\t\t|Index:\\ \n\t\t|---\\ [^%\\n]\n\t\t|\\*\\*\\*.*\\d{4}\\s*$\n\t\t|\\d+(,\\d+)* (a|d|c) \\d+(,\\d+)* $\n\t\t|diff\\ --git\\ \n\t\t|commit\\ [0-9a-f]{40}$\n\t\t)", - "keyEquivalent": "^~D", "name": "Diff", + "scopeName": "source.diff", "patterns": [ { "captures": { @@ -162,7 +156,5 @@ "match": "^Only in .*: .*$\\n?", "name": "meta.diff.only-in" } - ], - "scopeName": "source.diff", - "uuid": "7E848FF4-708E-11D9-97B4-0011242E4184" + ] } \ No newline at end of file diff --git a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json b/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json index 5b2ccacd56d..c2b8d628ab0 100644 --- a/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json +++ b/extensions/gitsyntax/syntaxes/git-commit.tmLanguage.json @@ -5,13 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/git.tmbundle/commit/93897a78c6e52bef13dadc0d4091d203c5facb40", - "fileTypes": [ - "COMMIT_EDITMSG", - "MERGE_MSG" - ], - "foldingStartMarker": "^\\+\\+\\+", - "foldingStopMarker": "^---", "name": "Git Commit Message", + "scopeName": "text.git-commit", "patterns": [ { "begin": "\\A(?!# Please enter the commit message)", @@ -142,7 +137,5 @@ } ] } - }, - "scopeName": "text.git-commit", - "uuid": "BFE83C06-8508-44BE-A975-95A57BF619A7" + } } \ No newline at end of file diff --git a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json b/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json index 89ef957a1b9..3ee481bede1 100644 --- a/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json +++ b/extensions/gitsyntax/syntaxes/git-rebase.tmLanguage.json @@ -5,10 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/git.tmbundle/commit/d1db42c2d71948662098183a6df519fb53a7a15b", - "fileTypes": [ - "git-rebase-todo" - ], "name": "Git Rebase Message", + "scopeName": "text.git-rebase", "patterns": [ { "captures": { @@ -34,7 +32,5 @@ "match": "^\\s*(pick|p|reword|r|edit|e|squash|s|fixup|f|exec|x|drop|d)\\s+([0-9a-f]+)\\s+(.*)$", "name": "meta.commit-command.git-rebase" } - ], - "scopeName": "text.git-rebase", - "uuid": "7F1CC209-5F6D-486A-8180-09FA282381A1" + ] } \ No newline at end of file diff --git a/extensions/go/syntaxes/go.tmLanguage.json b/extensions/go/syntaxes/go.tmLanguage.json index f4e17874a84..bc73a1d91bd 100644 --- a/extensions/go/syntaxes/go.tmLanguage.json +++ b/extensions/go/syntaxes/go.tmLanguage.json @@ -5,14 +5,9 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-go/commit/b6fd68f74efa109679e31fe6f4a41ac105262d0e", - "scopeName": "source.go", "name": "Go", + "scopeName": "source.go", "comment": "Go language", - "fileTypes": [ - "go" - ], - "foldingStartMarker": "({|\\()\\s*$", - "foldingStopMarker": "(}|\\))\\s*$", "patterns": [ { "include": "#comments" diff --git a/extensions/groovy/syntaxes/groovy.tmLanguage.json b/extensions/groovy/syntaxes/groovy.tmLanguage.json index 9e8be43b53b..57ebab39405 100644 --- a/extensions/groovy/syntaxes/groovy.tmLanguage.json +++ b/extensions/groovy/syntaxes/groovy.tmLanguage.json @@ -5,14 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/groovy.tmbundle/commit/85d8f7c97ae473ccb9473f6c8d27e4ec957f4be1", - "fileTypes": [ - "groovy", - "gvy" - ], - "foldingStartMarker": "(\\{\\s*$|^\\s*// \\{\\{\\{)", - "foldingStopMarker": "^\\s*(\\}|// \\}\\}\\}$)", - "keyEquivalent": "^~G", "name": "Groovy", + "scopeName": "source.groovy", "patterns": [ { "captures": { @@ -1385,7 +1379,5 @@ } ] } - }, - "scopeName": "source.groovy", - "uuid": "B3A64888-EBBB-4436-8D9E-F1169C5D7613" + } } \ No newline at end of file diff --git a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json index ddd7547935f..957f16ae035 100644 --- a/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json +++ b/extensions/handlebars/syntaxes/Handlebars.tmLanguage.json @@ -6,6 +6,42 @@ ], "version": "https://github.com/daaain/Handlebars/commit/790f2b0222098a3a236bd9e91bb9a039eeca4d8e", "name": "Handlebars", + "scopeName": "text.html.handlebars", + "patterns": [ + { + "include": "#yfm" + }, + { + "include": "#extends" + }, + { + "include": "#block_comments" + }, + { + "include": "#comments" + }, + { + "include": "#block_helper" + }, + { + "include": "#end_block" + }, + { + "include": "#else_token" + }, + { + "include": "#partial_and_var" + }, + { + "include": "#inline_script" + }, + { + "include": "#html_tags" + }, + { + "include": "text.html.basic" + } + ], "repository": { "html_tags": { "patterns": [ @@ -812,57 +848,5 @@ } ] } - }, - "scopeName": "text.html.handlebars", - "patterns": [ - { - "include": "#yfm" - }, - { - "include": "#extends" - }, - { - "include": "#block_comments" - }, - { - "include": "#comments" - }, - { - "include": "#block_helper" - }, - { - "include": "#end_block" - }, - { - "include": "#else_token" - }, - { - "include": "#partial_and_var" - }, - { - "include": "#inline_script" - }, - { - "include": "#html_tags" - }, - { - "include": "text.html.basic" - } - ], - "fileTypes": [ - "handlebars", - "handlebars.html", - "hbr", - "hbrs", - "hbs", - "hdbs", - "hjs", - "mu", - "mustache", - "rac", - "stache", - "template", - "tmpl" - ], - "uuid": "70E91676-DE0A-4266-A2B9-3AD2E535E484" + } } \ No newline at end of file diff --git a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json index 475923aaca5..dd8f5356fee 100644 --- a/extensions/hlsl/syntaxes/hlsl.tmLanguage.json +++ b/extensions/hlsl/syntaxes/hlsl.tmLanguage.json @@ -5,18 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/tgjones/shaders-tmLanguage/commit/cd1ef40f549f9ce2b9e6b73498688de114a85382", - "scopeName": "source.hlsl", "name": "HLSL", - "fileTypes": [ - "hlsl", - "hlsli", - "fx", - "fxh", - "vsh", - "psh", - "cginc", - "compute" - ], + "scopeName": "source.hlsl", "patterns": [ { "name": "comment.line.block.hlsl", diff --git a/extensions/html/syntaxes/html.tmLanguage.json b/extensions/html/syntaxes/html.tmLanguage.json index 0efe7ca55f0..6b9b1f58e7d 100644 --- a/extensions/html/syntaxes/html.tmLanguage.json +++ b/extensions/html/syntaxes/html.tmLanguage.json @@ -5,16 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/html.tmbundle/commit/a723f08ebd49c67c22aca08dd8f17d0bf836ec93", - "fileTypes": [ - "html", - "htm", - "shtml", - "xhtml", - "inc", - "tmpl", - "tpl" - ], - "firstLineMatch": "<(?i:(!DOCTYPE\\s*)?html)", + "name": "HTML", + "scopeName": "text.html.basic", "injections": { "R:text.html - (comment.block, text.html source)": { "comment": "Use R: to ensure this matches after any other injections.", @@ -26,8 +18,6 @@ ] } }, - "keyEquivalent": "^~H", - "name": "HTML", "patterns": [ { "begin": "(<)([a-zA-Z][a-zA-Z0-9:-]*)(?=[^>]*>)", @@ -746,7 +736,5 @@ "match": "(?<==)(?:[^\\s<>/'\"]|/(?!>))+", "name": "string.unquoted.html" } - }, - "scopeName": "text.html.basic", - "uuid": "17994EC8-6B1D-11D9-AC3A-000D93589AF6" + } } \ No newline at end of file diff --git a/extensions/ini/syntaxes/ini.tmLanguage.json b/extensions/ini/syntaxes/ini.tmLanguage.json index ff87d4c6dc8..bd1496149f7 100644 --- a/extensions/ini/syntaxes/ini.tmLanguage.json +++ b/extensions/ini/syntaxes/ini.tmLanguage.json @@ -5,12 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/ini.tmbundle/commit/2af0cbb0704940f967152616f2f1ff0aae6287a6", - "fileTypes": [ - "ini", - "conf" - ], - "keyEquivalent": "^~I", "name": "Ini", + "scopeName": "source.ini", "patterns": [ { "begin": "(^[ \\t]+)?(?=#)", @@ -113,7 +109,5 @@ }, "name": "string.quoted.double.ini" } - ], - "scopeName": "source.ini", - "uuid": "77DC23B6-8A90-11D9-BAA4-000A9584EC8C" + ] } \ No newline at end of file diff --git a/extensions/java/syntaxes/java.tmLanguage.json b/extensions/java/syntaxes/java.tmLanguage.json index 5be7bc9f4ee..0d29f449e02 100644 --- a/extensions/java/syntaxes/java.tmLanguage.json +++ b/extensions/java/syntaxes/java.tmLanguage.json @@ -5,12 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-java/commit/5c2863da1425d61914d2e04ef31b86f8c5883c5f", - "scopeName": "source.java", "name": "Java", - "fileTypes": [ - "java", - "bsh" - ], + "scopeName": "source.java", "patterns": [ { "begin": "\\b(package)\\b\\s*", diff --git a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json index 9411c748bee..a8527fe9618 100644 --- a/extensions/javascript/syntaxes/JavaScript.tmLanguage.json +++ b/extensions/javascript/syntaxes/JavaScript.tmLanguage.json @@ -4,16 +4,9 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/24c7fb5254f50dad85eae03836b1b9ff92ecf273", + "version": "https://github.com/Microsoft/TypeScript-TmLanguage/commit/77d21fd8d3f750fcf67bdf7436f4e46565cba350", "name": "JavaScript (with React support)", "scopeName": "source.js", - "fileTypes": [ - ".js", - ".jsx", - ".es6", - ".mjs" - ], - "uuid": "805375ec-d614-41f5-8993-5843fe63ea82", "patterns": [ { "include": "#directives" @@ -3157,6 +3150,10 @@ { "name": "keyword.operator.ternary.js", "match": "(\\?|\\:)" + }, + { + "name": "keyword.operator.expression.infer.js", + "match": "(?]?\\d+|m)?|(?!^)\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n\tperl\n (?=\\s|:|$)\n)", - "keyEquivalent": "^~P", "name": "Perl", + "scopeName": "source.perl", + "comment": "\n\tTODO:\tInclude RegExp syntax\n", "patterns": [ { "include": "#line_comment" @@ -2545,7 +2535,5 @@ } ] } - }, - "scopeName": "source.perl", - "uuid": "EDBFE125-6B1C-11D9-9189-000D93589AF6" + } } \ No newline at end of file diff --git a/extensions/perl/syntaxes/perl6.tmLanguage.json b/extensions/perl/syntaxes/perl6.tmLanguage.json index 109dc422363..89c69ebe79b 100644 --- a/extensions/perl/syntaxes/perl6.tmLanguage.json +++ b/extensions/perl/syntaxes/perl6.tmLanguage.json @@ -5,15 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/perl.tmbundle/commit/d9841a0878239fa43f88c640f8d458590f97e8f5", - "fileTypes": [ - "p6", - "pl6", - "pm6", - "nqp" - ], - "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/|(?<=!)\\b)(?:perl6|nqp)(?:$|\\s)\n|\n# Perl 6 pragma\n\\buse\\s+v6\\b\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:(?:(?!mode\\s*:)[^:;]+:[^:;]+;)*\\s*mode\\s*:)?\\s*\n\tperl6\n \\s*(?:;[^:;]+:[^:;]+?)*;?\\s*-\\*-\n |\n # Vim\n (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|(?!^)\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n\tperl6\n (?=\\s|:|$)\n)", - "keyEquivalent": "^~P", "name": "Perl 6", + "scopeName": "source.perl.6", "patterns": [ { "begin": "^=begin", @@ -318,7 +311,5 @@ } ] } - }, - "scopeName": "source.perl.6", - "uuid": "E685440C-0E20-4424-9693-864D5240A269" + } } \ No newline at end of file diff --git a/extensions/php/syntaxes/html.tmLanguage.json b/extensions/php/syntaxes/html.tmLanguage.json index 747d39b1d0d..1ed6de8d2c9 100644 --- a/extensions/php/syntaxes/html.tmLanguage.json +++ b/extensions/php/syntaxes/html.tmLanguage.json @@ -5,26 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-php/commit/29c140e1531e0b5e842e5bfd4377f879d8b79cd4", - "scopeName": "text.html.php", "name": "PHP", - "fileTypes": [ - "aw", - "ctp", - "inc", - "install", - "module", - "php", - "php_cs", - "php3", - "php4", - "php5", - "phpt", - "phtml", - "profile" - ], - "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n php\\d?\n(?:$|\\s)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n php\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n (?:php|phtml)\n (?=\\s|:|$)\n)\n|\n# Regular opening PHP tags\n^\\s*<\\?(?i:php|=|\\s|$)", - "foldingStartMarker": "(/\\*|\\{\\s*$|<<]?\\d+|m)?|\\sex)\n (?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))\n (?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*\n [\\s:]\n (?:filetype|ft|syntax)\\s*=\n ruby\n (?=\\s|:|$)\n)", - "keyEquivalent": "^~R", "name": "Ruby", + "scopeName": "source.ruby", + "comment": "\n\tTODO: unresolved issues\n\n\ttext:\n\t\"p <", - "patterns": [ - { - "include": "#block_comment" - }, - { - "include": "#line_comment" - }, - { - "include": "#sigils" - }, - { - "include": "#mut" - }, - { - "include": "#lifetime" - }, - { - "include": "#core_types" - }, - { - "include": "#core_marker" - }, - { - "include": "#core_traits" - }, - { - "include": "#std_types" - }, - { - "include": "#std_traits" - }, - { - "include": "#type_params" - } - ] - } - }, "patterns": [ { "comment": "Implementation", @@ -654,5 +450,206 @@ } ] } - ] + ], + "repository": { + "block_doc_comment": { + "comment": "Block documentation comment", + "name": "comment.block.documentation.rust", + "begin": "/\\*[\\*!](?![\\*/])", + "end": "\\*/", + "patterns": [ + { + "include": "#block_doc_comment" + }, + { + "include": "#block_comment" + } + ] + }, + "block_comment": { + "comment": "Block comment", + "name": "comment.block.rust", + "begin": "/\\*", + "end": "\\*/", + "patterns": [ + { + "include": "#block_doc_comment" + }, + { + "include": "#block_comment" + } + ] + }, + "line_doc_comment": { + "comment": "Single-line documentation comment", + "name": "comment.line.documentation.rust", + "begin": "//[!/](?=[^/])", + "end": "$" + }, + "line_comment": { + "comment": "Single-line comment", + "name": "comment.line.double-slash.rust", + "begin": "//", + "end": "$" + }, + "escaped_character": { + "name": "constant.character.escape.rust", + "match": "\\\\(x[0-9A-Fa-f]{2}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)" + }, + "string_literal": { + "comment": "Double-quote string literal", + "name": "string.quoted.double.rust", + "begin": "b?\"", + "end": "\"", + "patterns": [ + { + "include": "#escaped_character" + } + ] + }, + "raw_string_literal": { + "comment": "Raw double-quote string literal", + "name": "string.quoted.double.raw.rust", + "begin": "b?r(#*)\"", + "end": "\"\\1" + }, + "sigils": { + "comment": "Sigil", + "name": "keyword.operator.sigil.rust", + "match": "[&*](?=[a-zA-Z0-9_\\(\\[\\|\\\"]+)" + }, + "self": { + "comment": "Self variable", + "name": "variable.language.rust", + "match": "\\bself\\b" + }, + "mut": { + "comment": "Mutable storage modifier", + "name": "storage.modifier.mut.rust", + "match": "\\bmut\\b" + }, + "box": { + "comment": "Box storage modifier", + "name": "storage.modifier.box.rust", + "match": "\\bbox\\b" + }, + "const": { + "comment": "Const storage modifier", + "name": "storage.modifier.const.rust", + "match": "\\bconst\\b" + }, + "pub": { + "comment": "Visibility modifier", + "name": "storage.modifier.visibility.rust", + "match": "\\bpub\\b" + }, + "unsafe": { + "comment": "Unsafe code keyword", + "name": "keyword.other.unsafe.rust", + "match": "\\bunsafe\\b" + }, + "where": { + "comment": "Generic where clause", + "name": "keyword.other.where.rust", + "match": "\\bwhere\\b" + }, + "lifetime": { + "comment": "Named lifetime", + "name": "storage.modifier.lifetime.rust", + "match": "'([a-zA-Z_][a-zA-Z0-9_]*)\\b", + "captures": { + "1": { + "name": "entity.name.lifetime.rust" + } + } + }, + "ref_lifetime": { + "comment": "Reference with named lifetime", + "match": "&('([a-zA-Z_][a-zA-Z0-9_]*))\\b", + "captures": { + "1": { + "name": "storage.modifier.lifetime.rust" + }, + "2": { + "name": "entity.name.lifetime.rust" + } + } + }, + "core_types": { + "comment": "Built-in/core type", + "name": "storage.type.core.rust", + "match": "\\b(bool|char|usize|isize|u8|u16|u32|u64|u128|i8|i16|i32|i64|i128|f32|f64|str|Self|Option|Result)\\b" + }, + "core_vars": { + "comment": "Core type variant", + "name": "support.constant.core.rust", + "match": "\\b(Some|None|Ok|Err)\\b" + }, + "core_marker": { + "comment": "Core trait (marker)", + "name": "support.type.marker.rust", + "match": "\\b(Copy|Send|Sized|Sync)\\b" + }, + "core_traits": { + "comment": "Core trait", + "name": "support.type.core.rust", + "match": "\\b(Drop|Fn|FnMut|FnOnce|Clone|PartialEq|PartialOrd|Eq|Ord|AsRef|AsMut|Into|From|Default|Iterator|Extend|IntoIterator|DoubleEndedIterator|ExactSizeIterator)\\b" + }, + "std_types": { + "comment": "Standard library type", + "name": "storage.class.std.rust", + "match": "\\b(Box|String|Vec|Path|PathBuf)\\b" + }, + "std_traits": { + "comment": "Standard library trait", + "name": "support.type.std.rust", + "match": "\\b(ToOwned|ToString)\\b" + }, + "type": { + "comment": "A type", + "name": "entity.name.type.rust", + "match": "\\b([A-Za-z][_A-Za-z0-9]*|_[_A-Za-z0-9]+)\\b" + }, + "type_params": { + "comment": "Type parameters", + "name": "meta.type_params.rust", + "begin": "<(?![=<])", + "end": "(?", + "patterns": [ + { + "include": "#block_comment" + }, + { + "include": "#line_comment" + }, + { + "include": "#sigils" + }, + { + "include": "#mut" + }, + { + "include": "#lifetime" + }, + { + "include": "#core_types" + }, + { + "include": "#core_marker" + }, + { + "include": "#core_traits" + }, + { + "include": "#std_types" + }, + { + "include": "#std_traits" + }, + { + "include": "#type_params" + } + ] + } + } } \ No newline at end of file diff --git a/extensions/scss/syntaxes/scss.tmLanguage.json b/extensions/scss/syntaxes/scss.tmLanguage.json index 6e97f761713..80c0c3ad84f 100644 --- a/extensions/scss/syntaxes/scss.tmLanguage.json +++ b/extensions/scss/syntaxes/scss.tmLanguage.json @@ -5,15 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-sass/commit/a07688bd078f420f56df6221e9263d80e738869b", - "scopeName": "source.css.scss", "name": "SCSS", - "fileTypes": [ - "scss", - "css.scss", - "css.scss.erb", - "scss.erb", - "scss.liquid" - ], + "scopeName": "source.css.scss", "patterns": [ { "include": "#variable_setting" diff --git a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json b/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json index 2922a8a5ac3..6b7ad9d7fe2 100644 --- a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json +++ b/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json @@ -5,11 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/tgjones/shaders-tmLanguage/commit/c72c8b39380ba5a86c58ceed053b5d965ebf38b3", - "scopeName": "source.shaderlab", "name": "ShaderLab", - "fileTypes": [ - "shader" - ], + "scopeName": "source.shaderlab", "patterns": [ { "name": "comment.line.double-slash.shaderlab", diff --git a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json index 874d7d16a00..0089e5aa5c4 100644 --- a/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json +++ b/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json @@ -4,35 +4,9 @@ "If you want to provide a fix or improvement, please create a pull request against the original repository.", "Once accepted there, we are happy to receive an update request." ], - "version": "https://github.com/atom/language-shellscript/commit/5206d247e33bb4e7ebeb320f10814ecd4132f9eb", - "scopeName": "source.shell", + "version": "https://github.com/atom/language-shellscript/commit/4c3711edbe8eac6f501976893976b1ac6a043d50", "name": "Shell Script", - "fileTypes": [ - "sh", - "bash", - "ksh", - "zsh", - "zsh-theme", - "zshenv", - "zlogin", - "zlogout", - "zprofile", - "zshrc", - "bashrc", - "bash_aliases", - "bash_profile", - "bash_login", - "profile", - "bash_logout", - ".textmate_init", - "npmrc", - "PKGBUILD", - "install", - "cygport", - "bats", - "ebuild" - ], - "firstLineMatch": "(?x)\n# Hashbang\n^\\#!.*(?:\\s|\\/)\n (?:bash|zsh|sh|tcsh|ksh|dash|ash|csh|rc)\n(?:$|\\s)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n (?:shell-script|sh)\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s* set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n sh\n (?=\\s|:|$)\n)", + "scopeName": "source.shell", "patterns": [ { "include": "#comment" @@ -141,7 +115,7 @@ ] }, "comment": { - "begin": "(^\\s+)?(?<=^|\\W)(?=#)(?!#{)", + "begin": "(^\\s+)?(?<=^|\\W)(?\n)\n|\n# Modeline\n(?i:\n # Emacs\n -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n xml\n (?=[\\s;]|(?]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n xml\n (?=\\s|:|$)\n)", + "scopeName": "text.xml", "patterns": [ { "begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)", diff --git a/extensions/xml/syntaxes/xsl.tmLanguage.json b/extensions/xml/syntaxes/xsl.tmLanguage.json index 116fe42ea46..c89f50050fe 100644 --- a/extensions/xml/syntaxes/xsl.tmLanguage.json +++ b/extensions/xml/syntaxes/xsl.tmLanguage.json @@ -5,12 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280", - "scopeName": "text.xml.xsl", "name": "XSL", - "fileTypes": [ - "xsl", - "xslt" - ], + "scopeName": "text.xml.xsl", "patterns": [ { "begin": "(<)(xsl)((:))(template)", diff --git a/extensions/yaml/syntaxes/yaml.tmLanguage.json b/extensions/yaml/syntaxes/yaml.tmLanguage.json index 9d755531ed0..6f08b6e72c9 100644 --- a/extensions/yaml/syntaxes/yaml.tmLanguage.json +++ b/extensions/yaml/syntaxes/yaml.tmLanguage.json @@ -5,19 +5,8 @@ "Once accepted there, we are happy to receive an update request." ], "version": "https://github.com/textmate/yaml.tmbundle/commit/efc96efafe5e48480cf55a2ed124b388cbea4440", - "fileTypes": [ - "yaml", - "yml", - "rviz", - "reek", - "clang-format", - "yaml-tmlanguage", - "syntax", - "sublime-syntax" - ], - "firstLineMatch": "^%YAML( ?1.\\d+)?", - "keyEquivalent": "^~Y", "name": "YAML", + "scopeName": "source.yaml", "patterns": [ { "include": "#comment" @@ -628,7 +617,5 @@ } ] } - }, - "scopeName": "source.yaml", - "uuid": "686AD6AE-33F3-4493-9512-9E9FC1D5417F" + } } \ No newline at end of file