From 542cf9c52baa7d0cfce9a69308794f9049e34b5b Mon Sep 17 00:00:00 2001 From: archy Date: Fri, 26 Dec 2014 04:14:18 +0800 Subject: [PATCH 01/10] vendor.yml: added custom bootstrap --- lib/linguist/vendor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 4b8299f4..0728264e 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -42,6 +42,7 @@ # Bootstrap css and js - (^|/)bootstrap([^.]*)\.(js|css)$ +- (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|)$ # Font Awesome - font-awesome.css From 64f83eee07a67ad4b658bcaba88b8fdb7d458afc Mon Sep 17 00:00:00 2001 From: archy Date: Fri, 26 Dec 2014 04:28:34 +0800 Subject: [PATCH 02/10] vendor.yml: added styl --- lib/linguist/vendor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 0728264e..3fb5ffa8 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -42,7 +42,7 @@ # Bootstrap css and js - (^|/)bootstrap([^.]*)\.(js|css)$ -- (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|)$ +- (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$ # Font Awesome - font-awesome.css From 2c5d720146c5f6212b8d6d2ddf4803b1d4f336aa Mon Sep 17 00:00:00 2001 From: archy Date: Fri, 26 Dec 2014 04:30:33 +0800 Subject: [PATCH 03/10] vendor.yml: added imported bootstrap files --- lib/linguist/vendor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 3fb5ffa8..3b667371 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -43,6 +43,7 @@ # Bootstrap css and js - (^|/)bootstrap([^.]*)\.(js|css)$ - (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$ +- (^|/)bootstrap/([^\s]*)import\.(css|less|scss|styl)$ # Font Awesome - font-awesome.css From 356b94211459594091b060fac50cdf99358228af Mon Sep 17 00:00:00 2001 From: archy Date: Fri, 26 Dec 2014 04:35:37 +0800 Subject: [PATCH 04/10] vendor.yml: added less, scss, styl suffixes for popular stylesheets --- lib/linguist/vendor.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 3b667371..57db0dcc 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -41,25 +41,24 @@ - (\.|-)min\.(js|css)$ # Bootstrap css and js -- (^|/)bootstrap([^.]*)\.(js|css)$ +- (^|/)bootstrap([^.]*)\.(js|css|less|scss|styl)$ - (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$ - (^|/)bootstrap/([^\s]*)import\.(css|less|scss|styl)$ # Font Awesome -- font-awesome.css +- (^|/)font-awesome\.(css|less|scss|styl)$ # Foundation css -- foundation.css +- (^|/)foundation\.(css|less|scss|styl)$ # Normalize.css -- normalize.css +- (^|/)normalize\.(css|less|scss|styl)$ # Bourbon SCSS -- (^|/)[Bb]ourbon/.*\.css$ -- (^|/)[Bb]ourbon/.*\.scss$ +- (^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$ # Animate.css -- animate.css +- (^|/)animate\.(css|less|scss|styl)$ # Vendored dependencies - third[-_]?party/ From 084a9ab97639fcd8aa422dc7aefcf491914f85a4 Mon Sep 17 00:00:00 2001 From: archy Date: Fri, 26 Dec 2014 04:43:04 +0800 Subject: [PATCH 05/10] vendor.yml: added stylesheets imported from packages --- lib/linguist/vendor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/linguist/vendor.yml b/lib/linguist/vendor.yml index 57db0dcc..4ba241ca 100644 --- a/lib/linguist/vendor.yml +++ b/lib/linguist/vendor.yml @@ -40,10 +40,12 @@ # Minified JavaScript and CSS - (\.|-)min\.(js|css)$ +#Stylesheets imported from packages +- ([^\s]*)import\.(css|less|scss|styl)$ + # Bootstrap css and js - (^|/)bootstrap([^.]*)\.(js|css|less|scss|styl)$ - (^|/)custom\.bootstrap([^\s]*)(js|css|less|scss|styl)$ -- (^|/)bootstrap/([^\s]*)import\.(css|less|scss|styl)$ # Font Awesome - (^|/)font-awesome\.(css|less|scss|styl)$ @@ -54,7 +56,7 @@ # Normalize.css - (^|/)normalize\.(css|less|scss|styl)$ -# Bourbon SCSS +# Bourbon css - (^|/)[Bb]ourbon/.*\.(css|less|scss|styl)$ # Animate.css From b357257f4dafe59944f75bec57eb157e3cef588c Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Tue, 6 Jan 2015 09:51:51 +0100 Subject: [PATCH 06/10] Grammar for AutoHotkey --- .gitmodules | 3 +++ grammars.yml | 2 ++ lib/linguist/languages.yml | 2 +- vendor/grammars/AutoHotkey | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/AutoHotkey diff --git a/.gitmodules b/.gitmodules index a4ef61fa..0e127f7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -532,3 +532,6 @@ [submodule "vendor/grammars/sublime-bsv"] path = vendor/grammars/sublime-bsv url = https://github.com/thotypous/sublime-bsv +[submodule "vendor/grammars/AutoHotkey"] + path = vendor/grammars/AutoHotkey + url = https://github.com/robertcollier4/AutoHotkey diff --git a/grammars.yml b/grammars.yml index ebbea52c..1c11db3d 100644 --- a/grammars.yml +++ b/grammars.yml @@ -24,6 +24,8 @@ vendor/grammars/Agda.tmbundle: - source.agda vendor/grammars/Alloy.tmbundle: - source.alloy +vendor/grammars/AutoHotkey: +- source.ahk vendor/grammars/ColdFusion: - source.cfscript - source.cfscript.cfc diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 7890be55..f10b2f30 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -224,7 +224,7 @@ AutoHotkey: extensions: - .ahk - .ahkl - tm_scope: none + tm_scope: source.ahk ace_mode: autohotkey AutoIt: diff --git a/vendor/grammars/AutoHotkey b/vendor/grammars/AutoHotkey new file mode 160000 index 00000000..82a64672 --- /dev/null +++ b/vendor/grammars/AutoHotkey @@ -0,0 +1 @@ +Subproject commit 82a646722c78cff47fae9673cb628f222b032988 From 14740e8a89ef13f8fbf6ee9689518ec23fe1023f Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Tue, 6 Jan 2015 11:57:28 +0100 Subject: [PATCH 07/10] Grammar for HTTP --- .gitmodules | 3 +++ grammars.yml | 2 ++ lib/linguist/languages.yml | 2 +- vendor/grammars/Sublime-HTTP | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/Sublime-HTTP diff --git a/.gitmodules b/.gitmodules index a4ef61fa..eb5b0c01 100644 --- a/.gitmodules +++ b/.gitmodules @@ -532,3 +532,6 @@ [submodule "vendor/grammars/sublime-bsv"] path = vendor/grammars/sublime-bsv url = https://github.com/thotypous/sublime-bsv +[submodule "vendor/grammars/Sublime-HTTP"] + path = vendor/grammars/Sublime-HTTP + url = https://github.com/httpspec/sublime-highlighting diff --git a/grammars.yml b/grammars.yml index ebbea52c..a8305007 100644 --- a/grammars.yml +++ b/grammars.yml @@ -66,6 +66,8 @@ vendor/grammars/Stata.tmbundle: - source.stata vendor/grammars/Sublime-Coq: - source.coq +vendor/grammars/Sublime-HTTP: +- source.httpspec vendor/grammars/Sublime-Inform: - source.Inform7 vendor/grammars/Sublime-Lasso: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 7890be55..e2c6df86 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1211,7 +1211,7 @@ HTTP: type: data extensions: - .http - tm_scope: none + tm_scope: source.httpspec ace_mode: text Hack: diff --git a/vendor/grammars/Sublime-HTTP b/vendor/grammars/Sublime-HTTP new file mode 160000 index 00000000..f5a4c381 --- /dev/null +++ b/vendor/grammars/Sublime-HTTP @@ -0,0 +1 @@ +Subproject commit f5a4c3819d2b1d7bb9376c255ac78f94b6564b54 From c0fbc9ef8c3ae649d80f4c9215d5e80f14ab2d0e Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Thu, 8 Jan 2015 14:11:04 -0600 Subject: [PATCH 08/10] Updating Sublime-HTTP reference --- vendor/grammars/Sublime-HTTP | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/grammars/Sublime-HTTP b/vendor/grammars/Sublime-HTTP index f5a4c381..00999986 160000 --- a/vendor/grammars/Sublime-HTTP +++ b/vendor/grammars/Sublime-HTTP @@ -1 +1 @@ -Subproject commit f5a4c3819d2b1d7bb9376c255ac78f94b6564b54 +Subproject commit 0099998617eb784fa27d8a47e289058d9a6307ab From 6e2b4f7514c2eadd80e6e2f2791e5f6e5752da5c Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Thu, 8 Jan 2015 16:59:43 -0600 Subject: [PATCH 09/10] Updating ref to include license --- vendor/grammars/AutoHotkey | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/grammars/AutoHotkey b/vendor/grammars/AutoHotkey index 82a64672..a2207359 160000 --- a/vendor/grammars/AutoHotkey +++ b/vendor/grammars/AutoHotkey @@ -1 +1 @@ -Subproject commit 82a646722c78cff47fae9673cb628f222b032988 +Subproject commit a2207359782c564a9a3bfe5142d7b5a250d9b18b From 24eb1d3fe2539a139545f13c9bb01b4a008c1711 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Fri, 9 Jan 2015 11:43:34 -0600 Subject: [PATCH 10/10] Updating file regex to support unlicense.txt --- test/test_grammars.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_grammars.rb b/test/test_grammars.rb index f010b79b..188bc187 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -60,7 +60,7 @@ class TestGrammars < Minitest::Test def test_submodules_have_licenses categories = submodule_paths.group_by do |submodule| files = Dir[File.join(ROOT, submodule, "*")] - license = files.find { |path| File.basename(path) =~ /\blicen[cs]e\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i } + license = files.find { |path| File.basename(path) =~ /\b(un)?licen[cs]e\b/i } || files.find { |path| File.basename(path) =~ /\bcopying\b/i } if license.nil? if readme = files.find { |path| File.basename(path) =~ /\Areadme\b/i } license = readme if File.read(readme) =~ /\blicen[cs]e\b/i