Merge pull request #2936 from github/idris

Idris

.gitmodules

@@ -701,6 +701,9 @@
 [submodule "vendor/grammars/nix"]
 	path = vendor/grammars/nix
 	url = https://github.com/wmertens/sublime-nix
+[submodule "vendor/grammars/idris"]
+	path = vendor/grammars/idris
+	url = https://github.com/idris-hackers/idris-sublime.git
 [submodule "vendor/grammars/atomic-dreams"]
 	path = vendor/grammars/atomic-dreams
 	url = https://github.com/PJB3005/atomic-dreams

grammars.yml

@@ -293,6 +293,8 @@ vendor/grammars/idl.tmbundle:
 - source.idl
 - source.idl-dlm
 - text.idl-idldoc
+vendor/grammars/idris/:
+- source.idris
 vendor/grammars/ini.tmbundle:
 - source.ini
 vendor/grammars/io.tmbundle:

lib/linguist/languages.yml

@@ -1532,7 +1532,7 @@ Idris:
   - .idr
   - .lidr
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.idris
 
 Inform 7:
   type: programming

vendor/licenses/grammar/idris.txt

@@ -0,0 +1,26 @@
+---
+type: grammar
+name: idris
+license: mit
+---
+The MIT License
+
+Copyright (c) 2013-2015 Alexey Alekhin, Niklas Larsson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

vendor/licenses/rubygem/github-linguist.txt

@@ -1,7 +1,7 @@
 ---
 type: rubygem
 name: github-linguist
-version: 4.8.1
+version: 4.8.2
 summary: GitHub Language detection
 homepage: https://github.com/github/linguist
 license: mit