Merge branch 'master' into 2427-local

lib/linguist/grammars.rb

@@ -1,6 +1,3 @@
-# Note: This file is included in the github-linguist-grammars gem, not the
-# github-linguist gem.
-
 module Linguist
   module Grammars
     # Get the path to the directory containing the language grammar JSON files.

lib/linguist/heuristics.rb

@@ -322,9 +322,9 @@ module Linguist
     end
 
     disambiguate ".rpy" do |data|
-        if /(^(import|from|class|def)[\s\S])/m.match(data)
+      if /(^(import|from|class|def)[\s\S])/m.match(data)
         Language["Python"]
-    else
+      else
         Language["Ren'Py"]
       end
     end

lib/linguist/languages.yml

@@ -1336,9 +1336,9 @@ HCL:
 HLSL:
   type: programming
   extensions:
+    - .hlsl
     - .fx
     - .fxh
-    - .hlsl
     - .hlsli
   ace_mode: text
   tm_scope: none
@@ -3573,7 +3573,9 @@ Text:
   extensions:
   - .txt
   - .fr
+  - .nb
   - .ncl
+  - .no
   filenames:
   - COPYING
   - INSTALL
@@ -3975,6 +3977,7 @@ YAML:
   - .yml
   - .reek
   - .rviz
+  - .sublime-syntax
   - .syntax
   - .yaml
   - .yaml-tmlanguage