From 6226a46988523123e3ec2437a4ae668b7820a202 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Thu, 13 Aug 2015 17:35:01 +0200 Subject: [PATCH 1/7] Recognize the Mozilla Public License for grammars --- test/test_grammars.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/test_grammars.rb b/test/test_grammars.rb index 88624ae8..dc64c6e6 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -132,6 +132,12 @@ class TestGrammars < Minitest::Test "BSD" elsif content.include?("Permission is hereby granted") || content =~ /\bMIT\b/ "MIT" + elsif content.include?("Mozilla Public License") + if content.include?("version 2.0") + "MPLv2.0" + elsif content.include?("version 1.1") + "MPLv1.1" + end elsif content.include?("unlicense.org") "unlicense" elsif content.include?("http://www.wtfpl.net/txt/copying/") From 55aafa416dfd75b47083d6a0400ce6136338ba02 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 14 Aug 2015 13:56:28 +0200 Subject: [PATCH 2/7] Highlight LabVIEW files as XML --- lib/linguist/languages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 3ff88a03..352542b0 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1718,8 +1718,8 @@ LabVIEW: type: programming extensions: - .lvproj - tm_scope: none - ace_mode: text + tm_scope: source.xml + ace_mode: xml Lasso: type: programming From 06997f0da240a482f5f2f70912f36c6446b02b2c Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Fri, 14 Aug 2015 14:17:32 +0200 Subject: [PATCH 3/7] Fix scope of grammar for LabVIEW --- 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 352542b0..a0ede441 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1718,7 +1718,7 @@ LabVIEW: type: programming extensions: - .lvproj - tm_scope: source.xml + tm_scope: text.xml ace_mode: xml Lasso: From 82410e07b272661149415eefc28cd72166fa35c1 Mon Sep 17 00:00:00 2001 From: Lars Brinkhoff Date: Fri, 14 Aug 2015 13:02:55 +0200 Subject: [PATCH 4/7] Add .sexp to Common Lisp. config.sexp by Jeremie Dimino; Apache License 2.0. rss.sexp by Dan Lentz; LGPL 2.1. --- lib/linguist/languages.yml | 1 + samples/Common Lisp/config.sexp | 2 + samples/Common Lisp/rss.sexp | 103 ++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 samples/Common Lisp/config.sexp create mode 100644 samples/Common Lisp/rss.sexp diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index a0ede441..ed414121 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -616,6 +616,7 @@ Common Lisp: - .lsp - .ny - .podsl + - .sexp interpreters: - lisp - sbcl diff --git a/samples/Common Lisp/config.sexp b/samples/Common Lisp/config.sexp new file mode 100644 index 00000000..125892e5 --- /dev/null +++ b/samples/Common Lisp/config.sexp @@ -0,0 +1,2 @@ +((exe_name hello) + (link_order (world hello))) diff --git a/samples/Common Lisp/rss.sexp b/samples/Common Lisp/rss.sexp new file mode 100644 index 00000000..4898fb55 --- /dev/null +++ b/samples/Common Lisp/rss.sexp @@ -0,0 +1,103 @@ + +(:TURTLE + + (:@PREFIX "rdf:" "") + (:@PREFIX "owl:" "") + (:@PREFIX "dc:" "") + (:@PREFIX "xsd:" "") + (:@PREFIX "rdfs:" "") + + (:TRIPLES (:URIREF "") + + (:PREDICATE-OBJECT-LIST + (:URIREF #1="") + (:OBJECTS + (:QNAME "rdfs:Class"))) + + (:PREDICATE-OBJECT-LIST + (:QNAME "rdfs:comment") + (:OBJECTS + (:STRING "An RSS information channel."))) + + (:PREDICATE-OBJECT-LIST + (:QNAME "rdfs:isDefinedBy") + (:OBJECTS + (:URIREF ""))) + + (:PREDICATE-OBJECT-LIST + (:QNAME "rdfs:label") + (:OBJECTS + (:STRING "Channel")))) + + (:TRIPLES (:URIREF "") + + (:PREDICATE-OBJECT-LIST + (:URIREF #1#) + (:OBJECTS + (:QNAME "rdf:Property"))) + + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS (:STRING "A short text description of the subject."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Description"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:description")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS image."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Image")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS item."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Item")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS + (:STRING "Points to a list of rss:item elements that are members of the subject channel."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Items")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS (:STRING "The URL to which an HTML rendering of the subject will link."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Link"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:identifier")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS (:STRING "The text input field's (variable) name."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Name")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdfs:Class"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") (:OBJECTS (:STRING "An RSS text input."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Text Input")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS (:STRING "A descriptive title for the channel."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "Title"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:title")))) + (:TRIPLES (:URIREF "") + (:PREDICATE-OBJECT-LIST (:URIREF #1#) (:OBJECTS (:QNAME "rdf:Property"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:comment") + (:OBJECTS + (:STRING + "The URL of the image to used in the 'src' attribute of the channel's image tag when rendered as HTML."))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:isDefinedBy") + (:OBJECTS (:URIREF ""))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:label") (:OBJECTS (:STRING "URL"))) + (:PREDICATE-OBJECT-LIST (:QNAME "rdfs:subPropertyOf") (:OBJECTS (:QNAME "dc:identifier"))))) From 152d49513f74ab4bd0b5368bb36a38effcfd6fe4 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Wed, 19 Aug 2015 00:11:34 +0200 Subject: [PATCH 5/7] Grammar for AspectJ from Sublime Text package --- .gitmodules | 3 +++ grammars.yml | 2 ++ lib/linguist/languages.yml | 2 +- vendor/grammars/sublime-aspectj | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/sublime-aspectj diff --git a/.gitmodules b/.gitmodules index f4238e8b..47cf934f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -671,3 +671,6 @@ [submodule "vendor/grammars/st2-zonefile"] path = vendor/grammars/st2-zonefile url = https://github.com/sixty4k/st2-zonefile +[submodule "vendor/grammars/sublime-aspectj"] + path = vendor/grammars/sublime-aspectj + url = https://github.com/pchaigno/sublime-aspectj diff --git a/grammars.yml b/grammars.yml index 4da6c0e2..449030af 100644 --- a/grammars.yml +++ b/grammars.yml @@ -479,6 +479,8 @@ vendor/grammars/sublime-MuPAD: - source.mupad vendor/grammars/sublime-apl/: - source.apl +vendor/grammars/sublime-aspectj/: +- source.aspectj vendor/grammars/sublime-befunge: - source.befunge vendor/grammars/sublime-better-typescript: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ed414121..ef3b0968 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -214,7 +214,7 @@ AspectJ: color: "#a957b0" extensions: - .aj - tm_scope: none + tm_scope: source.aspectj ace_mode: text Assembly: diff --git a/vendor/grammars/sublime-aspectj b/vendor/grammars/sublime-aspectj new file mode 160000 index 00000000..888fefdd --- /dev/null +++ b/vendor/grammars/sublime-aspectj @@ -0,0 +1 @@ +Subproject commit 888fefdd2f8db57628d7bd36e2388f1f534c00a7 From 102f14d0e9cf26ace4e076396a21bdd3fe967e2a Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Wed, 19 Aug 2015 06:59:39 +0100 Subject: [PATCH 6/7] Grammars update --- grammars.yml | 1 + vendor/grammars/Elm.tmLanguage | 2 +- vendor/grammars/Lean.tmbundle | 2 +- vendor/grammars/NimLime | 2 +- vendor/grammars/SublimePapyrus | 2 +- vendor/grammars/abap.tmbundle | 2 +- vendor/grammars/atom-fsharp | 2 +- vendor/grammars/factor | 2 +- vendor/grammars/language-crystal | 2 +- vendor/grammars/language-gfm | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-xbase | 2 +- vendor/grammars/latex.tmbundle | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/grammars.yml b/grammars.yml index 449030af..88d21d39 100644 --- a/grammars.yml +++ b/grammars.yml @@ -331,6 +331,7 @@ vendor/grammars/language-hy: vendor/grammars/language-javascript: - source.js - source.js.regexp +- source.js.regexp.replacement vendor/grammars/language-jsoniq/: - source.jq - source.xq diff --git a/vendor/grammars/Elm.tmLanguage b/vendor/grammars/Elm.tmLanguage index e9fda7c7..f17b1914 160000 --- a/vendor/grammars/Elm.tmLanguage +++ b/vendor/grammars/Elm.tmLanguage @@ -1 +1 @@ -Subproject commit e9fda7c70f1bb8da8275b108420d8c492114b342 +Subproject commit f17b1914dd6447bb5f3168080d3aa8e95d051efb diff --git a/vendor/grammars/Lean.tmbundle b/vendor/grammars/Lean.tmbundle index fb115154..dd3e30f0 160000 --- a/vendor/grammars/Lean.tmbundle +++ b/vendor/grammars/Lean.tmbundle @@ -1 +1 @@ -Subproject commit fb1151547aebacdb474c2e14ad74d2aa6548e2f0 +Subproject commit dd3e30f0581b14b8a4830d6b46eaa86bf62058e8 diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime index b0c92d3f..50d7344f 160000 --- a/vendor/grammars/NimLime +++ b/vendor/grammars/NimLime @@ -1 +1 @@ -Subproject commit b0c92d3faedeefcfe76c560f28980450811e2f5b +Subproject commit 50d7344f9b4f50823ac64d14c162982edf8b8056 diff --git a/vendor/grammars/SublimePapyrus b/vendor/grammars/SublimePapyrus index 51807687..2451bac8 160000 --- a/vendor/grammars/SublimePapyrus +++ b/vendor/grammars/SublimePapyrus @@ -1 +1 @@ -Subproject commit 51807687119bab674996669a6f589bf94b911522 +Subproject commit 2451bac8ef1c06b8d4c514d5a417dd6fd295dda4 diff --git a/vendor/grammars/abap.tmbundle b/vendor/grammars/abap.tmbundle index 5973e78c..08d6db92 160000 --- a/vendor/grammars/abap.tmbundle +++ b/vendor/grammars/abap.tmbundle @@ -1 +1 @@ -Subproject commit 5973e78c60d3d7f11fb264b5581bbe492486e771 +Subproject commit 08d6db92d0fddbf7a854584d1f568ca069e7d594 diff --git a/vendor/grammars/atom-fsharp b/vendor/grammars/atom-fsharp index 121ff71b..e7a4159f 160000 --- a/vendor/grammars/atom-fsharp +++ b/vendor/grammars/atom-fsharp @@ -1 +1 @@ -Subproject commit 121ff71b30b4d78978fb52b331ef05600575c019 +Subproject commit e7a4159fbf680ba4cafa9115ea7264a9cdba0fd0 diff --git a/vendor/grammars/factor b/vendor/grammars/factor index 49621511..ac5da311 160000 --- a/vendor/grammars/factor +++ b/vendor/grammars/factor @@ -1 +1 @@ -Subproject commit 496215111189a942cd5310635d71d00d1dc1d2c9 +Subproject commit ac5da311f73401db4adc28936c6aaae587a713ee diff --git a/vendor/grammars/language-crystal b/vendor/grammars/language-crystal index 75462302..93264691 160000 --- a/vendor/grammars/language-crystal +++ b/vendor/grammars/language-crystal @@ -1 +1 @@ -Subproject commit 754623023bd556b2bcb927dd8c1fd1ae4153e386 +Subproject commit 932646913b9ceabe96dd0c6dc5f3ef9a894902c2 diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm index c8158a6d..9b95c2ad 160000 --- a/vendor/grammars/language-gfm +++ b/vendor/grammars/language-gfm @@ -1 +1 @@ -Subproject commit c8158a6d4b779842b5f3d95d023f96748904d551 +Subproject commit 9b95c2ad7c3c1261e54b11919f71ec3ad473aad9 diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index 1aaf2ff8..39fd6989 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit 1aaf2ff8eff25073dad9e81dde48ed05537f2a97 +Subproject commit 39fd6989f78e1be265dc6ce9ba7a0ac450525864 diff --git a/vendor/grammars/language-xbase b/vendor/grammars/language-xbase index 3f77776e..ae860b3b 160000 --- a/vendor/grammars/language-xbase +++ b/vendor/grammars/language-xbase @@ -1 +1 @@ -Subproject commit 3f77776e98054b5ae53f13b14b4da1656497ce41 +Subproject commit ae860b3b02d08bd65827c0a5f0029e65e4df30b4 diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle index 2cae8202..23e62234 160000 --- a/vendor/grammars/latex.tmbundle +++ b/vendor/grammars/latex.tmbundle @@ -1 +1 @@ -Subproject commit 2cae820272e4b88141fe3f06adfab620951952fb +Subproject commit 23e622349857b2e2181201e510c84fcec8e909d6 From 6995fc28b65d543342991d3ca5fd11c330f0f283 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Wed, 19 Aug 2015 07:01:07 +0100 Subject: [PATCH 7/7] v4.5.14 version bump --- lib/linguist/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb index f46a86f2..1ba6a51b 100644 --- a/lib/linguist/version.rb +++ b/lib/linguist/version.rb @@ -1,3 +1,3 @@ module Linguist - VERSION = "4.5.13" + VERSION = "4.5.14" end