From bb0822ab4f775ba7f47d26c5abbf626bb9af4e73 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Thu, 17 Nov 2022 17:24:44 -0800 Subject: [PATCH 1/5] Amend just language entry - Remove `Justfile` alias. `just` is the name of the tool and the language. - Just looks for files called `justfile` in any case, so add the three most common cases: `JUSTFILE`, `Justfile`, and `justfile`. - Add the `.just` extension, which is in common use --- lib/linguist/languages.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 2356b44850..39b5e57608 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -7829,12 +7829,14 @@ jq: language_id: 905371884 just: type: programming - aliases: - - Justfile color: "#384d54" tm_scope: source.just filenames: + - JUSTFILE - Justfile + - justfile + extensions: + - ".just" ace_mode: text language_id: 128447695 kvlang: From efda4bb9d66bbbfe1fd0a3daadecb6c549d8418e Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 18 Nov 2022 20:14:40 -0800 Subject: [PATCH 2/5] Change language name to `Just` --- 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 39b5e57608..8f799d8ee1 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -7827,7 +7827,7 @@ jq: - ".jq" tm_scope: source.jq language_id: 905371884 -just: +Just: type: programming color: "#384d54" tm_scope: source.just From a6f495239a27a66ae6dbf9b4dae32ccac38ea2f3 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 18 Nov 2022 20:19:35 -0800 Subject: [PATCH 3/5] Remove `.just` extension --- lib/linguist/languages.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 8f799d8ee1..5e95d493b7 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -7835,8 +7835,6 @@ Just: - JUSTFILE - Justfile - justfile - extensions: - - ".just" ace_mode: text language_id: 128447695 kvlang: From 06654e56b05ad4bac9dcf423908a977467f86e1b Mon Sep 17 00:00:00 2001 From: Alhadis Date: Sat, 19 Nov 2022 16:12:25 +1100 Subject: [PATCH 4/5] Fix alphabetisation and casing discrepancies --- lib/linguist/languages.yml | 20 ++++++++++---------- samples/{just => Just}/filenames/Justfile | 0 vendor/README.md | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) rename samples/{just => Just}/filenames/Justfile (100%) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 5e95d493b7..0bdb2ad876 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3331,6 +3331,16 @@ Jupyter Notebook: aliases: - IPython Notebook language_id: 185 +Just: + type: programming + color: "#384d54" + tm_scope: source.just + filenames: + - JUSTFILE + - Justfile + - justfile + ace_mode: text + language_id: 128447695 KRL: type: programming color: "#28430A" @@ -7827,16 +7837,6 @@ jq: - ".jq" tm_scope: source.jq language_id: 905371884 -Just: - type: programming - color: "#384d54" - tm_scope: source.just - filenames: - - JUSTFILE - - Justfile - - justfile - ace_mode: text - language_id: 128447695 kvlang: type: markup ace_mode: text diff --git a/samples/just/filenames/Justfile b/samples/Just/filenames/Justfile similarity index 100% rename from samples/just/filenames/Justfile rename to samples/Just/filenames/Justfile diff --git a/vendor/README.md b/vendor/README.md index 734611f6cc..aaa14ff2ae 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -269,6 +269,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Jsonnet:** [google/language-jsonnet](https://github.com/google/language-jsonnet) - **Julia:** [JuliaEditorSupport/atom-language-julia](https://github.com/JuliaEditorSupport/atom-language-julia) - **Jupyter Notebook:** [Nixinova/NovaGrammars](https://github.com/Nixinova/NovaGrammars) +- **Just:** [skellock/vscode-just](https://github.com/skellock/vscode-just) - **Kaitai Struct:** [atom/language-yaml](https://github.com/atom/language-yaml) - **KakouneScript:** [kakoune-editor/language-kak](https://github.com/kakoune-editor/language-kak) - **KiCad Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb) @@ -607,7 +608,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **fish:** [l15n/fish-tmbundle](https://github.com/l15n/fish-tmbundle) - **hoon:** [pkova/hoon-grammar](https://github.com/pkova/hoon-grammar) - **jq:** [wader/language-jq](https://github.com/wader/language-jq) -- **just:** [skellock/vscode-just](https://github.com/skellock/vscode-just) - **kvlang:** [p0lygun/kivy-language-grammer](https://github.com/p0lygun/kivy-language-grammer) - **mIRC Script:** [gen-angry/language-msl](https://github.com/gen-angry/language-msl) - **mcfunction:** [Arcensoth/language-mcfunction](https://github.com/Arcensoth/language-mcfunction) From 0daf179c7013e88549cfe8ba7b079fa170e3a287 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Fri, 18 Nov 2022 21:27:43 -0800 Subject: [PATCH 5/5] Re-add alias back --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 0bdb2ad876..feb42955f2 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3333,6 +3333,8 @@ Jupyter Notebook: language_id: 185 Just: type: programming + aliases: + - Justfile color: "#384d54" tm_scope: source.just filenames: