From 19a300a4ba214816f5047e9aed9821a04cb130b4 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Thu, 5 Mar 2015 20:14:15 +0100 Subject: [PATCH 1/4] Description of group attribute --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 52bbaa36..36b5adcd 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -18,6 +18,8 @@ # language. This should match one of the scopes listed in # the grammars.yml file. Use "none" if there is no grammar # for this language. +# group - Name of the parent language. Languages in a group are counted +# in the statistics as the parent language. # # Any additions or modifications (even trivial) should have corresponding # test change in `test/test_blob.rb`. From d263f0c91a2a43d5b9120ef20a8810628947c043 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sat, 14 Mar 2015 11:42:30 +0100 Subject: [PATCH 2/4] Remove submodule for Perl grammar --- .gitmodules | 3 --- grammars.yml | 2 -- vendor/grammars/perl.tmbundle | 1 - 3 files changed, 6 deletions(-) delete mode 160000 vendor/grammars/perl.tmbundle diff --git a/.gitmodules b/.gitmodules index 6990a425..b87f416b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -397,9 +397,6 @@ [submodule "vendor/grammars/pascal.tmbundle"] path = vendor/grammars/pascal.tmbundle url = https://github.com/textmate/pascal.tmbundle -[submodule "vendor/grammars/perl.tmbundle"] - path = vendor/grammars/perl.tmbundle - url = https://github.com/textmate/perl.tmbundle [submodule "vendor/grammars/php-smarty.tmbundle"] path = vendor/grammars/php-smarty.tmbundle url = https://github.com/textmate/php-smarty.tmbundle diff --git a/grammars.yml b/grammars.yml index 048f7da8..e2a0440d 100644 --- a/grammars.yml +++ b/grammars.yml @@ -393,8 +393,6 @@ vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage: - source.oz vendor/grammars/pascal.tmbundle: - source.pascal -vendor/grammars/perl.tmbundle: -- source.perl vendor/grammars/php-smarty.tmbundle: - source.smarty vendor/grammars/php.tmbundle: diff --git a/vendor/grammars/perl.tmbundle b/vendor/grammars/perl.tmbundle deleted file mode 160000 index 3396190b..00000000 --- a/vendor/grammars/perl.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3396190be167310600d00da6ff9af7807cea4b12 From e61be66d4faad041c32985df5778dc6e8a207fea Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Sat, 14 Mar 2015 11:47:44 +0100 Subject: [PATCH 3/4] Grammar for Perl and Perl6 from TextMate bundle --- .gitmodules | 3 +++ grammars.yml | 3 +++ lib/linguist/languages.yml | 3 ++- vendor/grammars/perl.tmbundle | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/perl.tmbundle diff --git a/.gitmodules b/.gitmodules index b87f416b..29240331 100644 --- a/.gitmodules +++ b/.gitmodules @@ -642,3 +642,6 @@ [submodule "vendor/grammars/xc.tmbundle"] path = vendor/grammars/xc.tmbundle url = https://github.com/graymalkin/xc.tmbundle +[submodule "vendor/grammars/perl.tmbundle"] + path = vendor/grammars/perl.tmbundle + url = https://github.com/textmate/perl.tmbundle diff --git a/grammars.yml b/grammars.yml index e2a0440d..97bacc4e 100644 --- a/grammars.yml +++ b/grammars.yml @@ -393,6 +393,9 @@ vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage: - source.oz vendor/grammars/pascal.tmbundle: - source.pascal +vendor/grammars/perl.tmbundle/: +- source.perl +- source.perl.6 vendor/grammars/php-smarty.tmbundle: - source.smarty vendor/grammars/php.tmbundle: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ada5149f..bf04dbb8 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2282,6 +2282,7 @@ Pascal: Perl: type: programming + tm_scope: source.perl ace_mode: perl color: "#0298c3" extensions: @@ -2317,7 +2318,7 @@ Perl6: - Rexfile interpreters: - perl6 - tm_scope: none + tm_scope: source.perl.6 ace_mode: perl PigLatin: diff --git a/vendor/grammars/perl.tmbundle b/vendor/grammars/perl.tmbundle new file mode 160000 index 00000000..907eff87 --- /dev/null +++ b/vendor/grammars/perl.tmbundle @@ -0,0 +1 @@ +Subproject commit 907eff8769f88e146609d60f9185de2b605e8968 From ad7e231f39fbeaa884952b8f5beb3910c23b40c0 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Sat, 14 Mar 2015 13:12:37 -0500 Subject: [PATCH 4/4] Updating grammars --- vendor/grammars/CLIPS-sublime | 2 +- vendor/grammars/NimLime | 2 +- vendor/grammars/Stylus | 2 +- vendor/grammars/Sublime-Logos | 2 +- vendor/grammars/SublimePapyrus | 2 +- vendor/grammars/dart-sublime-bundle | 2 +- vendor/grammars/factor | 2 +- vendor/grammars/haxe-sublime-bundle | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-shellscript | 2 +- vendor/grammars/oracle.tmbundle | 2 +- vendor/grammars/perl.tmbundle | 2 +- vendor/grammars/sublime_cobol | 2 +- vendor/grammars/xc.tmbundle | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/vendor/grammars/CLIPS-sublime b/vendor/grammars/CLIPS-sublime index f6904baa..7ded830d 160000 --- a/vendor/grammars/CLIPS-sublime +++ b/vendor/grammars/CLIPS-sublime @@ -1 +1 @@ -Subproject commit f6904baa78b8b918a7815f4f467fe0ab51c38972 +Subproject commit 7ded830d5ea79214aaecf07006db1eba394d3e2a diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime index ae0b75d9..e31e1f53 160000 --- a/vendor/grammars/NimLime +++ b/vendor/grammars/NimLime @@ -1 +1 @@ -Subproject commit ae0b75d99a60f555e1b5cbab53eaed2ca9ca9101 +Subproject commit e31e1f5329b420879c50f230118cc81972710c71 diff --git a/vendor/grammars/Stylus b/vendor/grammars/Stylus index c060554e..c4897b0f 160000 --- a/vendor/grammars/Stylus +++ b/vendor/grammars/Stylus @@ -1 +1 @@ -Subproject commit c060554eb82ed253969457b2609d9eb5c7739c6e +Subproject commit c4897b0f97e69e367b20971f9fd019b4c6e9d283 diff --git a/vendor/grammars/Sublime-Logos b/vendor/grammars/Sublime-Logos index 9a7aa2fb..5375dc53 160000 --- a/vendor/grammars/Sublime-Logos +++ b/vendor/grammars/Sublime-Logos @@ -1 +1 @@ -Subproject commit 9a7aa2fb92b52f0e422f50b60fd5608d935ef69b +Subproject commit 5375dc5394d72c36088d6eb1304f632bea232d83 diff --git a/vendor/grammars/SublimePapyrus b/vendor/grammars/SublimePapyrus index 6f4e954f..9ae03977 160000 --- a/vendor/grammars/SublimePapyrus +++ b/vendor/grammars/SublimePapyrus @@ -1 +1 @@ -Subproject commit 6f4e954f35976f72f2a620af68aa0ba73e48478b +Subproject commit 9ae03977b68314597cc585ffada1998b3b1ef3be diff --git a/vendor/grammars/dart-sublime-bundle b/vendor/grammars/dart-sublime-bundle index 65c9cd9a..d3162539 160000 --- a/vendor/grammars/dart-sublime-bundle +++ b/vendor/grammars/dart-sublime-bundle @@ -1 +1 @@ -Subproject commit 65c9cd9a6540f6e47e5770314e13de7df05b2d2b +Subproject commit d31625391fb6ff6bd805074b3bdea4f1c4d10979 diff --git a/vendor/grammars/factor b/vendor/grammars/factor index e237b49f..e164fcf4 160000 --- a/vendor/grammars/factor +++ b/vendor/grammars/factor @@ -1 +1 @@ -Subproject commit e237b49f83c12aff3070c570404ef6bb19d1cc95 +Subproject commit e164fcf431d7ba53c2ce1d0cd81a78021ea8cebe diff --git a/vendor/grammars/haxe-sublime-bundle b/vendor/grammars/haxe-sublime-bundle index 84a4fab1..78505393 160000 --- a/vendor/grammars/haxe-sublime-bundle +++ b/vendor/grammars/haxe-sublime-bundle @@ -1 +1 @@ -Subproject commit 84a4fab144c185f4430f68cf10de35a7dfc79cb7 +Subproject commit 78505393cb1cb03396b06c75788802a077b3a2ff diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index da1fdb69..15dd527d 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit da1fdb6949eea5d107c8f30063437d14a3c3a677 +Subproject commit 15dd527dae9807e9e69e3709f5025fcc830a09b8 diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript index 98397197..2163c458 160000 --- a/vendor/grammars/language-shellscript +++ b/vendor/grammars/language-shellscript @@ -1 +1 @@ -Subproject commit 9839719721e3fb67c2df8461b2b296e6ff027e7f +Subproject commit 2163c45828d825b6142d6d5785b9333965bea98d diff --git a/vendor/grammars/oracle.tmbundle b/vendor/grammars/oracle.tmbundle index b41e6d33..1da31563 160000 --- a/vendor/grammars/oracle.tmbundle +++ b/vendor/grammars/oracle.tmbundle @@ -1 +1 @@ -Subproject commit b41e6d33d6a71649d97e497fb1504aa01e7ceb41 +Subproject commit 1da315635f75d1af57056c5c13221d4a95264e6f diff --git a/vendor/grammars/perl.tmbundle b/vendor/grammars/perl.tmbundle index 3396190b..907eff87 160000 --- a/vendor/grammars/perl.tmbundle +++ b/vendor/grammars/perl.tmbundle @@ -1 +1 @@ -Subproject commit 3396190be167310600d00da6ff9af7807cea4b12 +Subproject commit 907eff8769f88e146609d60f9185de2b605e8968 diff --git a/vendor/grammars/sublime_cobol b/vendor/grammars/sublime_cobol index 4be198de..28bd2b27 160000 --- a/vendor/grammars/sublime_cobol +++ b/vendor/grammars/sublime_cobol @@ -1 +1 @@ -Subproject commit 4be198de811d856e3f67ea04d7626ce82aff3dcb +Subproject commit 28bd2b27fc1105efb926cabd8f20fb61b6eeed3b diff --git a/vendor/grammars/xc.tmbundle b/vendor/grammars/xc.tmbundle index 7239c92b..309d1f66 160000 --- a/vendor/grammars/xc.tmbundle +++ b/vendor/grammars/xc.tmbundle @@ -1 +1 @@ -Subproject commit 7239c92bd612b01fc5bfea36056d530db78d6c64 +Subproject commit 309d1f662ca32513d3eed19f44ce4ef1d6f5f611