From 4b46bcf64929c6d43d7b635232392b7670d582cb Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Mon, 13 Oct 2014 15:07:42 -0400 Subject: [PATCH 1/7] Add TextMate scopes for Sass/SCSS files --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 20c98a49..b538bef2 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2084,6 +2084,7 @@ SAS: SCSS: type: markup + tm_scope: source.scss group: CSS ace_mode: scss extensions: @@ -2124,6 +2125,7 @@ Sage: Sass: type: markup + tm_scope: source.sass group: CSS extensions: - .sass From 7cb8357f73f8569680deac539b6c19fa407853f7 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 14 Oct 2014 10:21:08 -0400 Subject: [PATCH 2/7] Add a TextMate scope for YAML --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b538bef2..b8ea883d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2600,6 +2600,7 @@ Xtend: YAML: type: data + tm_scope: source.yaml aliases: - yml extensions: From 43cc701ac33ae934a5faf2b280f4e96d5b512de6 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 14 Oct 2014 10:34:01 -0400 Subject: [PATCH 3/7] Add a TextMate scope for JSON --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index b8ea883d..8402ce3d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1102,6 +1102,7 @@ J: JSON: type: data + tm_scope: source.json group: JavaScript ace_mode: json searchable: false From 15ec37d4bcb1378c42b8d03baf8a367322ada768 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 14 Oct 2014 10:34:08 -0400 Subject: [PATCH 4/7] Add a TextMate scope for Objective-C++ --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 8402ce3d..aef43fd0 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1588,6 +1588,7 @@ Objective-C: Objective-C++: type: programming + tm_scope: source.objc++ color: "#4886FC" aliases: - obj-c++ From d7fe0cc5c71947da4284c47af422e17d02e68fdf Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 14 Oct 2014 10:40:08 -0400 Subject: [PATCH 5/7] Add TextMate scopes for HTML variants --- lib/linguist/languages.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index aef43fd0..4de0081d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -949,6 +949,7 @@ HTML: HTML+Django: type: markup + tm_scope: text.html.django group: HTML lexer: HTML+Django/Jinja extensions: @@ -957,6 +958,7 @@ HTML+Django: HTML+ERB: type: markup + tm_scope: text.html.erb group: HTML lexer: RHTML aliases: @@ -967,6 +969,7 @@ HTML+ERB: HTML+PHP: type: markup + tm_scope: text.html.php group: HTML extensions: - .phtml From 9092dfdc7fa94695d06cc2fe9453426b1d5e24da Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Tue, 14 Oct 2014 10:50:39 -0400 Subject: [PATCH 6/7] Add a TextMate scope for Literate CoffeeScript --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 4de0081d..de1f5229 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1297,6 +1297,7 @@ Literate Agda: Literate CoffeeScript: type: programming + tm_scope: source.litcoffee group: CoffeeScript lexer: Text only ace_mode: markdown From 848a1cc1e5e08c27670a3781139ae265ce537804 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 14 Oct 2014 10:06:38 -0500 Subject: [PATCH 7/7] Minor 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 bafcd96e..2edc3c5a 100644 --- a/lib/linguist/version.rb +++ b/lib/linguist/version.rb @@ -1,3 +1,3 @@ module Linguist - VERSION = "3.3.0" + VERSION = "3.3.1" end