From 7ef9368d139a17707172fa461887662b67ea4dde Mon Sep 17 00:00:00 2001 From: Sophie Dankel <47993817+sdankel@users.noreply.github.com> Date: Tue, 5 Dec 2023 00:04:18 -0800 Subject: [PATCH 1/8] Update color for Sway (#6498) * Update color for Sway * Update lib/linguist/languages.yml --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 88c425287f..4b118d2542 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -6819,7 +6819,7 @@ Svelte: language_id: 928734530 Sway: type: programming - color: "#dea584" + color: "#00F58C" extensions: - ".sw" tm_scope: source.sway From 9e11555c4253261839b5432f6b864b7fb6d8b3b5 Mon Sep 17 00:00:00 2001 From: Martin Leduc <31558169+DecimalTurn@users.noreply.github.com> Date: Tue, 5 Dec 2023 03:04:40 -0500 Subject: [PATCH 2/8] Ungroup Git Attributes and Ignore List from INI (#6552) Ungroup Git Attributes and Ignore List --- lib/linguist/languages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 4b118d2542..704c51e325 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2371,7 +2371,6 @@ Gherkin: Git Attributes: type: data color: "#F44D27" - group: INI aliases: - gitattributes filenames: @@ -2976,7 +2975,6 @@ Idris: Ignore List: type: data color: "#000000" - group: INI aliases: - ignore - gitignore From e9a966c85125c8cb81d0ba59a5e0e32341545689 Mon Sep 17 00:00:00 2001 From: BobDotCom <71356958+BobDotCom@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:04:57 -0600 Subject: [PATCH 3/8] Add ace_mode for Nasal (#6563) --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 704c51e325..2af50bcfa0 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -4439,7 +4439,7 @@ Nasal: extensions: - ".nas" tm_scope: source.nasal - ace_mode: text + ace_mode: nasal language_id: 178322513 Nearley: type: programming From c65338079e8ccd36868d4867c6abd1d15f2a3db8 Mon Sep 17 00:00:00 2001 From: Ashutosh Narkar Date: Tue, 5 Dec 2023 00:05:20 -0800 Subject: [PATCH 4/8] Replace Open Policy Agent grammar (#6575) * Replace Open Policy Agent grammar Signed-off-by: Ashutosh Narkar * Update grammar * Update license --------- Signed-off-by: Ashutosh Narkar Co-authored-by: Colin Seymour --- .gitmodules | 2 +- vendor/README.md | 2 +- vendor/grammars/vscode-opa | 2 +- vendor/licenses/git_submodule/vscode-opa.dep.yml | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e14f0bf03f..1b76e7a669 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1256,7 +1256,7 @@ url = https://github.com/damirka/vscode-move-syntax.git [submodule "vendor/grammars/vscode-opa"] path = vendor/grammars/vscode-opa - url = https://github.com/tsandall/vscode-opa + url = https://github.com/open-policy-agent/vscode-opa.git [submodule "vendor/grammars/vscode-pddl"] path = vendor/grammars/vscode-pddl url = https://github.com/jan-dolejsi/vscode-pddl.git diff --git a/vendor/README.md b/vendor/README.md index 67f1d452b0..6fb412dba9 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -386,7 +386,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Odin:** [odin-lang/sublime-odin](https://github.com/odin-lang/sublime-odin) - **Opa:** [mads379/opa.tmbundle](https://github.com/mads379/opa.tmbundle) - **Opal:** [artifactz/sublime-opal](https://github.com/artifactz/sublime-opal) -- **Open Policy Agent:** [tsandall/vscode-opa](https://github.com/tsandall/vscode-opa) +- **Open Policy Agent:** [open-policy-agent/vscode-opa](https://github.com/open-policy-agent/vscode-opa) - **OpenCL:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **OpenEdge ABL:** [chriscamicas/abl-tmlanguage](https://github.com/chriscamicas/abl-tmlanguage) - **OpenQASM:** [tareqdandachi/language-qasm](https://github.com/tareqdandachi/language-qasm) diff --git a/vendor/grammars/vscode-opa b/vendor/grammars/vscode-opa index 0282a611d1..d3ed1f25c3 160000 --- a/vendor/grammars/vscode-opa +++ b/vendor/grammars/vscode-opa @@ -1 +1 @@ -Subproject commit 0282a611d1c3e70ffc353fd2003f0027a1c9ccfe +Subproject commit d3ed1f25c39ed03460cf230783184aa6f9deef55 diff --git a/vendor/licenses/git_submodule/vscode-opa.dep.yml b/vendor/licenses/git_submodule/vscode-opa.dep.yml index 08b4658e22..9bf7601ee6 100644 --- a/vendor/licenses/git_submodule/vscode-opa.dep.yml +++ b/vendor/licenses/git_submodule/vscode-opa.dep.yml @@ -1,8 +1,8 @@ --- name: vscode-opa -version: '0282a611d1c3e70ffc353fd2003f0027a1c9ccfe' +version: d3ed1f25c39ed03460cf230783184aa6f9deef55 type: git_submodule -homepage: https://github.com/tsandall/vscode-opa +homepage: https://github.com/open-policy-agent/vscode-opa.git license: apache-2.0 licenses: - sources: LICENSE @@ -210,3 +210,4 @@ licenses: limitations under the License. notices: [] +... From f905c58cfa36284bb2a1eaa09d9e25f83aaa8daa Mon Sep 17 00:00:00 2001 From: Spenser Black Date: Tue, 5 Dec 2023 03:05:36 -0500 Subject: [PATCH 5/8] Register `deno.lock` as JSON (#6590) --- lib/linguist/languages.yml | 1 + samples/JSON/filenames/deno.lock | 96 ++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 samples/JSON/filenames/deno.lock diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 2af50bcfa0..9baebd57cb 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3168,6 +3168,7 @@ JSON: - ".watchmanconfig" - Pipfile.lock - composer.lock + - deno.lock - flake.lock - mcmod.info language_id: 174 diff --git a/samples/JSON/filenames/deno.lock b/samples/JSON/filenames/deno.lock new file mode 100644 index 0000000000..54e0176f2e --- /dev/null +++ b/samples/JSON/filenames/deno.lock @@ -0,0 +1,96 @@ +{ + "version": "2", + "remote": { + "https://deno.land/std@0.142.0/hash/sha1.ts": "679d476b80466c73a1ad6c9ade4a44c188b91bc6bf3f97644209c280c9ec076b", + "https://deno.land/std@0.198.0/_util/diff.ts": "1a3c044aedf77647d6cac86b798c6417603361b66b54c53331b312caeb447aea", + "https://deno.land/std@0.198.0/_util/os.ts": "d932f56d41e4f6a6093d56044e29ce637f8dcc43c5a90af43504a889cf1775e3", + "https://deno.land/std@0.198.0/archive/_common.ts": "3fc6974d41f1d2e55edf839a4574db0b5e6f4f62abb6cc3d2c3ca13eb6d08b07", + "https://deno.land/std@0.198.0/archive/untar.ts": "b7bd29929ebc819cb5b7265d1e491e4061e31828b6235e8ff5ad17ddfb77d09e", + "https://deno.land/std@0.198.0/assert/_constants.ts": "8a9da298c26750b28b326b297316cdde860bc237533b07e1337c021379e6b2a9", + "https://deno.land/std@0.198.0/assert/_format.ts": "a69126e8a469009adf4cf2a50af889aca364c349797e63174884a52ff75cf4c7", + "https://deno.land/std@0.198.0/assert/assert.ts": "9a97dad6d98c238938e7540736b826440ad8c1c1e54430ca4c4e623e585607ee", + "https://deno.land/std@0.198.0/assert/assert_equals.ts": "a0ee60574e437bcab2dcb79af9d48dc88845f8fd559468d9c21b15fd638ef943", + "https://deno.land/std@0.198.0/assert/assertion_error.ts": "4d0bde9b374dfbcbe8ac23f54f567b77024fb67dbb1906a852d67fe050d42f56", + "https://deno.land/std@0.198.0/assert/equal.ts": "9f1a46d5993966d2596c44e5858eec821859b45f783a5ee2f7a695dfc12d8ece", + "https://deno.land/std@0.198.0/bytes/bytes_list.ts": "31d664f4d42fa922066405d0e421c56da89d751886ee77bbe25a88bf0310c9d0", + "https://deno.land/std@0.198.0/bytes/concat.ts": "d26d6f3d7922e6d663dacfcd357563b7bf4a380ce5b9c2bbe0c8586662f25ce2", + "https://deno.land/std@0.198.0/bytes/copy.ts": "939d89e302a9761dcf1d9c937c7711174ed74c59eef40a1e4569a05c9de88219", + "https://deno.land/std@0.198.0/encoding/base64.ts": "144ae6234c1fbe5b68666c711dc15b1e9ee2aef6d42b3b4345bf9a6c91d70d0d", + "https://deno.land/std@0.198.0/flags/mod.ts": "a5ac18af6583404f21ea03771f8816669d901e0ff4374020870334d6f61d73d5", + "https://deno.land/std@0.198.0/fmt/colors.ts": "a7eecffdf3d1d54db890723b303847b6e0a1ab4b528ba6958b8f2e754cf1b3bc", + "https://deno.land/std@0.198.0/fs/_util.ts": "fbf57dcdc9f7bc8128d60301eece608246971a7836a3bb1e78da75314f08b978", + "https://deno.land/std@0.198.0/fs/copy.ts": "b4f7fe87190d7b310c88a2d9ff845210c0a2b7b0a094ec509747359023beb7d6", + "https://deno.land/std@0.198.0/fs/empty_dir.ts": "c3d2da4c7352fab1cf144a1ecfef58090769e8af633678e0f3fabaef98594688", + "https://deno.land/std@0.198.0/fs/ensure_dir.ts": "dc64c4c75c64721d4e3fb681f1382f803ff3d2868f08563ff923fdd20d071c40", + "https://deno.land/std@0.198.0/fs/ensure_file.ts": "c38602670bfaf259d86ca824a94e6cb9e5eb73757fefa4ebf43a90dd017d53d9", + "https://deno.land/std@0.198.0/fs/ensure_link.ts": "c0f5b2f0ec094ed52b9128eccb1ee23362a617457aa0f699b145d4883f5b2fb4", + "https://deno.land/std@0.198.0/fs/ensure_symlink.ts": "5006ab2f458159c56d689b53b1e48d57e05eeb1eaf64e677f7f76a30bc4fdba1", + "https://deno.land/std@0.198.0/fs/eol.ts": "f1f2eb348a750c34500741987b21d65607f352cf7205f48f4319d417fff42842", + "https://deno.land/std@0.198.0/fs/exists.ts": "29c26bca8584a22876be7cb8844f1b6c8fc35e9af514576b78f5c6884d7ed02d", + "https://deno.land/std@0.198.0/fs/expand_glob.ts": "3e427436f4b3768727bd7de84169f10db75fe50b32e6dde567b8ae558a8d857a", + "https://deno.land/std@0.198.0/fs/mod.ts": "bc3d0acd488cc7b42627044caf47d72019846d459279544e1934418955ba4898", + "https://deno.land/std@0.198.0/fs/move.ts": "b4f8f46730b40c32ea3c0bc8eb0fd0e8139249a698883c7b3756424cf19785c9", + "https://deno.land/std@0.198.0/fs/walk.ts": "21a3cc5ff39c38acc93575213f54d5f1d44c5c6614ed97603d171eb0bf56a565", + "https://deno.land/std@0.198.0/io/buf_reader.ts": "2bccff0878537ef201c5051fc0db0ce8196388c5ea69d2be6be1900fe48c5f4b", + "https://deno.land/std@0.198.0/io/buf_writer.ts": "48c33c8f00b61dcbc7958706741cec8e59810bd307bc6a326cbd474fe8346dfd", + "https://deno.land/std@0.198.0/io/buffer.ts": "4d6883daeb2e698579c4064170515683d69f40f3de019bfe46c5cf31e74ae793", + "https://deno.land/std@0.198.0/io/copy_n.ts": "c055296297b9d4897d90d1ac056b072dc02614e60c67f438e23fbce052ea4c69", + "https://deno.land/std@0.198.0/io/limited_reader.ts": "6c9a216f8eef39c1ee2a6b37a29372c8fc63455b2eeb91f06d9646f8f759fc8b", + "https://deno.land/std@0.198.0/io/mod.ts": "2665bcccc1fd6e8627cca167c3e92aaecbd9897556b6f69e6d258070ef63fd9b", + "https://deno.land/std@0.198.0/io/multi_reader.ts": "9c2a0a31686c44b277e16da1d97b4686a986edcee48409b84be25eedbc39b271", + "https://deno.land/std@0.198.0/io/read_delim.ts": "c02b93cc546ae8caad8682ae270863e7ace6daec24c1eddd6faabc95a9d876a3", + "https://deno.land/std@0.198.0/io/read_int.ts": "7cb8bcdfaf1107586c3bacc583d11c64c060196cb070bb13ae8c2061404f911f", + "https://deno.land/std@0.198.0/io/read_lines.ts": "c526c12a20a9386dc910d500f9cdea43cba974e853397790bd146817a7eef8cc", + "https://deno.land/std@0.198.0/io/read_long.ts": "f0aaa420e3da1261c5d33c5e729f09922f3d9fa49f046258d4ff7a00d800c71e", + "https://deno.land/std@0.198.0/io/read_range.ts": "46a2263d0f8369b6d9abb0b25d99ceb65ff08d621fc57bcc53832e6979295043", + "https://deno.land/std@0.198.0/io/read_short.ts": "805cb329574b850b84bf14a92c052c59b5977a492cd780c41df8ad40826c1a20", + "https://deno.land/std@0.198.0/io/read_string_delim.ts": "5dc9f53bdf78e7d4ee1e56b9b60352238ab236a71c3e3b2a713c3d78472a53ce", + "https://deno.land/std@0.198.0/io/slice_long_to_bytes.ts": "48d9bace92684e880e46aa4a2520fc3867f9d7ce212055f76ecc11b22f9644b7", + "https://deno.land/std@0.198.0/io/string_reader.ts": "da0f68251b3d5b5112485dfd4d1b1936135c9b4d921182a7edaf47f74c25cc8f", + "https://deno.land/std@0.198.0/io/string_writer.ts": "8a03c5858c24965a54c6538bed15f32a7c72f5704a12bda56f83a40e28e5433e", + "https://deno.land/std@0.198.0/path/_basename.ts": "057d420c9049821f983f784fd87fa73ac471901fb628920b67972b0f44319343", + "https://deno.land/std@0.198.0/path/_constants.ts": "e49961f6f4f48039c0dfed3c3f93e963ca3d92791c9d478ac5b43183413136e0", + "https://deno.land/std@0.198.0/path/_dirname.ts": "355e297236b2218600aee7a5301b937204c62e12da9db4b0b044993d9e658395", + "https://deno.land/std@0.198.0/path/_extname.ts": "eaaa5aae1acf1f03254d681bd6a8ce42a9cb5b7ff2213a9d4740e8ab31283664", + "https://deno.land/std@0.198.0/path/_format.ts": "4a99270d6810f082e614309164fad75d6f1a483b68eed97c830a506cc589f8b4", + "https://deno.land/std@0.198.0/path/_from_file_url.ts": "7e4e5626089785adddb061f1b9f4932d6b21c7df778e7449531a11e32048245c", + "https://deno.land/std@0.198.0/path/_interface.ts": "6471159dfbbc357e03882c2266d21ef9afdb1e4aa771b0545e90db58a0ba314b", + "https://deno.land/std@0.198.0/path/_is_absolute.ts": "05dac10b5e93c63198b92e3687baa2be178df5321c527dc555266c0f4f51558c", + "https://deno.land/std@0.198.0/path/_join.ts": "fd78555bc34d5f188918fc7018dfe8fe2df5bbad94a3b30a433666c03934d77f", + "https://deno.land/std@0.198.0/path/_normalize.ts": "a19ec8706b2707f9dd974662a5cd89fad438e62ab1857e08b314a8eb49a34d81", + "https://deno.land/std@0.198.0/path/_parse.ts": "0f9b0ff43682dd9964eb1c4398610c4e165d8db9d3ac9d594220217adf480cfa", + "https://deno.land/std@0.198.0/path/_relative.ts": "27bdeffb5311a47d85be26d37ad1969979359f7636c5cd9fcf05dcd0d5099dc5", + "https://deno.land/std@0.198.0/path/_resolve.ts": "3bf0287d62488cad08c3c219a9708c4a4c658c65d7b4400fd99afdc3ba10a64d", + "https://deno.land/std@0.198.0/path/_to_file_url.ts": "739bfda583598790b2e77ce227f2bb618f6ebdb939788cea47555b43970ec58c", + "https://deno.land/std@0.198.0/path/_to_namespaced_path.ts": "0d5f4caa2ed98ef7a8786286df6af804b50e38859ae897b5b5b4c8c5930a75c8", + "https://deno.land/std@0.198.0/path/_util.ts": "4e191b1bac6b3bf0c31aab42e5ca2e01a86ab5a0d2e08b75acf8585047a86221", + "https://deno.land/std@0.198.0/path/basename.ts": "6f08fbb90dbfcf320765b3abb01f995b1723f75e2534acfd5380e202c802a3aa", + "https://deno.land/std@0.198.0/path/common.ts": "ee7505ab01fd22de3963b64e46cff31f40de34f9f8de1fff6a1bd2fe79380000", + "https://deno.land/std@0.198.0/path/dirname.ts": "098996822a31b4c46e1eb52a19540d3c6f9f54b772fc8a197939eeabc29fca2f", + "https://deno.land/std@0.198.0/path/extname.ts": "9b83c62fd16505739541f7a3ab447d8972da39dbf668d47af2f93206c2480893", + "https://deno.land/std@0.198.0/path/format.ts": "cb22f95cc7853d590b87708cc9441785e760d711188facff3d225305a8213aca", + "https://deno.land/std@0.198.0/path/from_file_url.ts": "a6221cfc928928ec4d9786d767dfac98fa2ab746af0786446c9834a07b98817e", + "https://deno.land/std@0.198.0/path/glob.ts": "d479e0a695621c94d3fd7fe7abd4f9499caf32a8de13f25073451c6ef420a4e1", + "https://deno.land/std@0.198.0/path/is_absolute.ts": "6b3d36352eb7fa29edb53f9e7b09b1aeb022a3c5465764f6cc5b8c41f9736197", + "https://deno.land/std@0.198.0/path/join.ts": "4a2867ff2f3c81ffc9eb3d56dade16db6f8bd3854f269306d23dad4115089c84", + "https://deno.land/std@0.198.0/path/mod.ts": "7765507696cb321994cdacfc19ee3ba61e8e3ebf4bd98fa75a276cf5dc18ce2a", + "https://deno.land/std@0.198.0/path/normalize.ts": "7d992cd262b2deefa842d93a8ba2ed51f3949ba595b1d07f627ac2cddbc74808", + "https://deno.land/std@0.198.0/path/parse.ts": "031fe488b3497fb8312fc1dc3c3d6c2d80707edd9c661e18ee9fd20f95edf322", + "https://deno.land/std@0.198.0/path/posix.ts": "0a1c1952d132323a88736d03e92bd236f3ed5f9f079e5823fae07c8d978ee61b", + "https://deno.land/std@0.198.0/path/relative.ts": "7db80c5035016174267da16321a742d76e875215c317859a383b12f413c6f5d6", + "https://deno.land/std@0.198.0/path/resolve.ts": "103b62207726a27f28177f397008545804ecb20aaf00623af1f622b18cd80b9f", + "https://deno.land/std@0.198.0/path/separator.ts": "0fb679739d0d1d7bf45b68dacfb4ec7563597a902edbaf3c59b50d5bcadd93b1", + "https://deno.land/std@0.198.0/path/to_file_url.ts": "dd32f7a01bbf3b15b5df46796659984b372973d9b2d7d59bcf0eb990763a0cb5", + "https://deno.land/std@0.198.0/path/to_namespaced_path.ts": "4e643ab729bf49ccdc166ad48d2de262ff462938fcf2a44a4425588f4a0bd690", + "https://deno.land/std@0.198.0/path/win32.ts": "8b3f80ef7a462511d5e8020ff490edcaa0a0d118f1b1e9da50e2916bdd73f9dd", + "https://deno.land/std@0.198.0/streams/_common.ts": "f45cba84f0d813de3326466095539602364a9ba521f804cc758f7a475cda692d", + "https://deno.land/std@0.198.0/streams/copy.ts": "75cbc795ff89291df22ddca5252de88b2e16d40c85d02840593386a8a1454f71", + "https://deno.land/std@0.198.0/streams/read_all.ts": "ee319772fb0fd28302f97343cc48dfcf948f154fd0d755d8efe65814b70533be", + "https://deno.land/std@0.198.0/streams/write_all.ts": "aec90152978581ea62d56bb53a5cbf487e6a89c902f87c5969681ffbdf32b998", + "https://deno.land/x/denoflate@1.2.1/mod.ts": "f5628e44b80b3d80ed525afa2ba0f12408e3849db817d47a883b801f9ce69dd6", + "https://deno.land/x/denoflate@1.2.1/pkg/denoflate.js": "b9f9ad9457d3f12f28b1fb35c555f57443427f74decb403113d67364e4f2caf4", + "https://deno.land/x/denoflate@1.2.1/pkg/denoflate_bg.wasm.js": "d581956245407a2115a3d7e8d85a9641c032940a8e810acbd59ca86afd34d44d", + "https://deno.land/x/dir@1.4.0/cache_dir/mod.ts": "8a82889db79c547fbbd3536c9c964047657b19fb59365c5fa59afc46082f9fe5", + "https://deno.land/x/dir@1.5.1/data_local_dir/mod.ts": "91eb1c4bfadfbeda30171007bac6d85aadacd43224a5ed721bbe56bc64e9eb66" + } +} From f4c35bf84a85db8600a12da4f1cc6d62ab3d63d4 Mon Sep 17 00:00:00 2001 From: Jacob Bandes-Storch Date: Tue, 5 Dec 2023 00:05:55 -0800 Subject: [PATCH 6/8] Replace Swift grammar (#6603) * Replace Swift grammar * update grammar for bug fix * update license file --- .gitmodules | 6 +++--- grammars.yml | 2 +- vendor/README.md | 2 +- vendor/grammars/swift-tmlanguage | 1 + vendor/grammars/swift.tmbundle | 1 - .../git_submodule/swift-tmlanguage.dep.yml | 19 +++++++++++++++++++ .../git_submodule/swift.tmbundle.dep.yml | 17 ----------------- 7 files changed, 25 insertions(+), 23 deletions(-) create mode 160000 vendor/grammars/swift-tmlanguage delete mode 160000 vendor/grammars/swift.tmbundle create mode 100644 vendor/licenses/git_submodule/swift-tmlanguage.dep.yml delete mode 100644 vendor/licenses/git_submodule/swift.tmbundle.dep.yml diff --git a/.gitmodules b/.gitmodules index 1b76e7a669..2c79f51e22 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1148,9 +1148,9 @@ [submodule "vendor/grammars/sweave.tmbundle"] path = vendor/grammars/sweave.tmbundle url = https://github.com/textmate/sweave.tmbundle.git -[submodule "vendor/grammars/swift.tmbundle"] - path = vendor/grammars/swift.tmbundle - url = https://github.com/textmate/swift.tmbundle +[submodule "vendor/grammars/swift-tmlanguage"] + path = vendor/grammars/swift-tmlanguage + url = https://github.com/jtbandes/swift-tmlanguage.git [submodule "vendor/grammars/tcl.tmbundle"] path = vendor/grammars/tcl.tmbundle url = https://github.com/textmate/tcl.tmbundle diff --git a/grammars.yml b/grammars.yml index cf9da731c7..e6f66a084c 100644 --- a/grammars.yml +++ b/grammars.yml @@ -1030,7 +1030,7 @@ vendor/grammars/sway-vscode-plugin: - source.sway vendor/grammars/sweave.tmbundle: - text.tex.latex.sweave -vendor/grammars/swift.tmbundle: +vendor/grammars/swift-tmlanguage: - source.swift vendor/grammars/tcl.tmbundle: - source.tcl diff --git a/vendor/README.md b/vendor/README.md index 6fb412dba9..f3f175c5fd 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -535,7 +535,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Svelte:** [sebastinez/svelte-atom](https://github.com/sebastinez/svelte-atom) - **Sway:** [FuelLabs/sway-vscode-plugin](https://github.com/FuelLabs/sway-vscode-plugin) - **Sweave:** [textmate/sweave.tmbundle](https://github.com/textmate/sweave.tmbundle) -- **Swift:** [textmate/swift.tmbundle](https://github.com/textmate/swift.tmbundle) +- **Swift:** [jtbandes/swift-tmlanguage](https://github.com/jtbandes/swift-tmlanguage) - **SystemVerilog:** [TheClams/SystemVerilog](https://github.com/TheClams/SystemVerilog) - **TL-Verilog:** [adamint/tlv-vscode](https://github.com/adamint/tlv-vscode) - **TLA:** [tlaplus-community/tree-sitter-tlaplus](https://github.com/tlaplus-community/tree-sitter-tlaplus) 🐌 diff --git a/vendor/grammars/swift-tmlanguage b/vendor/grammars/swift-tmlanguage new file mode 160000 index 0000000000..62239f3ff2 --- /dev/null +++ b/vendor/grammars/swift-tmlanguage @@ -0,0 +1 @@ +Subproject commit 62239f3ff29224c7317ab2fbcc769e3c61beb2a8 diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle deleted file mode 160000 index aa73c3410d..0000000000 --- a/vendor/grammars/swift.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aa73c3410d26dea8d39c834fd8e9bec4319dad2c diff --git a/vendor/licenses/git_submodule/swift-tmlanguage.dep.yml b/vendor/licenses/git_submodule/swift-tmlanguage.dep.yml new file mode 100644 index 0000000000..1d94b38a1f --- /dev/null +++ b/vendor/licenses/git_submodule/swift-tmlanguage.dep.yml @@ -0,0 +1,19 @@ +--- +name: swift-tmlanguage +version: 62239f3ff29224c7317ab2fbcc769e3c61beb2a8 +type: git_submodule +homepage: https://github.com/jtbandes/swift-tmlanguage.git +license: mit +licenses: +- sources: LICENSE.md + text: | + Copyright 2023 Jacob Bandes-Storch + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +- sources: README.md + text: This project is licensed under the terms of the [MIT license](LICENSE.md). +notices: [] diff --git a/vendor/licenses/git_submodule/swift.tmbundle.dep.yml b/vendor/licenses/git_submodule/swift.tmbundle.dep.yml deleted file mode 100644 index e233c79f99..0000000000 --- a/vendor/licenses/git_submodule/swift.tmbundle.dep.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: swift.tmbundle -version: aa73c3410d26dea8d39c834fd8e9bec4319dad2c -type: git_submodule -homepage: https://github.com/textmate/swift.tmbundle -license: permissive -licenses: -- sources: README.md - text: "If not otherwise specified (see below), files in this repository fall under - the following license:\n\n\tPermission to copy, use, modify, sell and distribute - this\n\tsoftware is granted. This software is provided \"as is\" without\n\texpress - or implied warranty, and with no claim as to its\n\tsuitability for any purpose.\n\nAn - exception is made for files in readable text which contain their own license information, - or files where an accompanying file exists (in the same directory) with a “-license” - suffix added to the base-name name of the original file, and an extension of txt, - html, or similar. For example “tidy” is accompanied by “tidy-license.txt”." -notices: [] From 09d9842ef03da75b4a27a898349846580ae625f4 Mon Sep 17 00:00:00 2001 From: vvvv-vvvv <136390975+vvvv-vvvv@users.noreply.github.com> Date: Tue, 5 Dec 2023 08:06:13 +0000 Subject: [PATCH 7/8] Change DM grammar source (#6605) Change DM grammar --- .gitmodules | 6 +++--- grammars.yml | 5 ++--- vendor/README.md | 2 +- vendor/grammars/atomic-dreams | 1 - vendor/grammars/dm-syntax | 1 + .../{atomic-dreams.dep.yml => dm-syntax.dep.yml} | 6 +++--- 6 files changed, 10 insertions(+), 11 deletions(-) delete mode 160000 vendor/grammars/atomic-dreams create mode 160000 vendor/grammars/dm-syntax rename vendor/licenses/git_submodule/{atomic-dreams.dep.yml => dm-syntax.dep.yml} (90%) diff --git a/.gitmodules b/.gitmodules index 2c79f51e22..060872af89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -323,9 +323,6 @@ [submodule "vendor/grammars/atom-salt"] path = vendor/grammars/atom-salt url = https://github.com/saltstack/atom-salt -[submodule "vendor/grammars/atomic-dreams"] - path = vendor/grammars/atomic-dreams - url = https://github.com/PJB3005/atomic-dreams [submodule "vendor/grammars/ats"] path = vendor/grammars/ats url = https://github.com/steinwaywhw/ats-mode-sublimetext @@ -425,6 +422,9 @@ [submodule "vendor/grammars/diff.tmbundle"] path = vendor/grammars/diff.tmbundle url = https://github.com/textmate/diff.tmbundle +[submodule "vendor/grammars/dm-syntax"] + path = vendor/grammars/dm-syntax + url = https://github.com/spacestation13/dm-syntax.git [submodule "vendor/grammars/dylan.tmbundle"] path = vendor/grammars/dylan.tmbundle url = https://github.com/textmate/dylan.tmbundle diff --git a/grammars.yml b/grammars.yml index e6f66a084c..d47f999fbc 100644 --- a/grammars.yml +++ b/grammars.yml @@ -267,9 +267,6 @@ vendor/grammars/atom-miniyaml: vendor/grammars/atom-salt: - source.python.salt - source.yaml.salt -vendor/grammars/atomic-dreams: -- source.dm -- source.dmf vendor/grammars/ats: - source.ats vendor/grammars/avro.tmLanguage: @@ -345,6 +342,8 @@ vendor/grammars/desktop.tmbundle: - source.desktop vendor/grammars/diff.tmbundle: - source.diff +vendor/grammars/dm-syntax: +- source.dm vendor/grammars/dylan.tmbundle: - source.dylan - source.lid diff --git a/vendor/README.md b/vendor/README.md index f3f175c5fd..9355b9ff5b 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -128,7 +128,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **D:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle) - **D-ObjDump:** [nanoant/assembly.tmbundle](https://github.com/nanoant/assembly.tmbundle) - **D2:** [terrastruct/d2-vscode](https://github.com/terrastruct/d2-vscode) -- **DM:** [PJB3005/atomic-dreams](https://github.com/PJB3005/atomic-dreams) +- **DM:** [spacestation13/dm-syntax](https://github.com/spacestation13/dm-syntax) - **DNS Zone:** [sixty4k/st2-zonefile](https://github.com/sixty4k/st2-zonefile) - **DTrace:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **Dafny:** [DafnyVSCode/Dafny-VSCode](https://github.com/DafnyVSCode/Dafny-VSCode) diff --git a/vendor/grammars/atomic-dreams b/vendor/grammars/atomic-dreams deleted file mode 160000 index 14891385ac..0000000000 --- a/vendor/grammars/atomic-dreams +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14891385ac0110cdcdb22f2dc1a8930cdf501c91 diff --git a/vendor/grammars/dm-syntax b/vendor/grammars/dm-syntax new file mode 160000 index 0000000000..a63b4388d0 --- /dev/null +++ b/vendor/grammars/dm-syntax @@ -0,0 +1 @@ +Subproject commit a63b4388d0df050d40f2c6c6afd85637174abbb5 diff --git a/vendor/licenses/git_submodule/atomic-dreams.dep.yml b/vendor/licenses/git_submodule/dm-syntax.dep.yml similarity index 90% rename from vendor/licenses/git_submodule/atomic-dreams.dep.yml rename to vendor/licenses/git_submodule/dm-syntax.dep.yml index a721e091d2..4964706fcd 100644 --- a/vendor/licenses/git_submodule/atomic-dreams.dep.yml +++ b/vendor/licenses/git_submodule/dm-syntax.dep.yml @@ -1,8 +1,8 @@ --- -name: atomic-dreams -version: 14891385ac0110cdcdb22f2dc1a8930cdf501c91 +name: dm-syntax +version: a63b4388d0df050d40f2c6c6afd85637174abbb5 type: git_submodule -homepage: https://github.com/PJB3005/atomic-dreams +homepage: https://github.com/spacestation13/dm-syntax.git license: mit licenses: - sources: LICENSE From 77d7f83dd3b6e7e039e0ab80a7c6db745508b422 Mon Sep 17 00:00:00 2001 From: Varun Gandhi Date: Tue, 5 Dec 2023 09:06:35 +0100 Subject: [PATCH 8/8] Fix group name casing: prolog -> Prolog (#6615) --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 9baebd57cb..bb0b648e7f 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1661,7 +1661,7 @@ ECL: ECLiPSe: type: programming color: "#001d9d" - group: prolog + group: Prolog extensions: - ".ecl" tm_scope: source.prolog.eclipse