github-linguist 6.1.0 → 6.2.0

data/lib/linguist/strategy/modeline.rb

@@ -36,7 +36,7 @@ module Linguist
 
         # Start modeline. Could be `vim:`, `vi:` or `ex:`
         (?:
-          (?:\s|^)
+          (?:[ \t]|^)
           vi
           (?:m[<=>]?\d+|m)? # Version-specific modeline
           |
@@ -49,10 +49,10 @@ module Linguist
         # serves as a terminator for an option sequence, delimited by whitespace.
         (?=
           # So we have to ensure the modeline ends with a colon
-          : (?=\s* set? \s [^\n:]+ :) |
+          : (?=[ \t]* set? [ \t] [^\n:]+ :) |
 
           # Otherwise, it isn't valid syntax and should be ignored
-          : (?!\s* set? \s)
+          : (?![ \t]* set? [ \t])
         )
 
         # Possible (unrelated) `option=value` pairs to skip past
@@ -60,10 +60,10 @@ module Linguist
           # Option separator. Vim uses whitespace or colons to separate options (except if
           # the alternate "vim: set " form is used, where only whitespace is used)
           (?:
-            \s
+            [ \t]
             |
-            \s* : \s* # Note that whitespace around colons is accepted too:
-          )           # vim: noai :  ft=ruby:noexpandtab
+            [ \t]* : [ \t]* # Note that whitespace around colons is accepted too:
+          )                 # vim: noai :  ft=ruby:noexpandtab
 
           # Option's name. All recognised Vim options have an alphanumeric form.
           \w*
@@ -71,25 +71,25 @@ module Linguist
           # Possible value. Not every option takes an argument.
           (?:
             # Whitespace between name and value is allowed: `vim: ft   =ruby`
-            \s*=
+            [ \t]*=
 
             # Option's value. Might be blank; `vim: ft= ` says "use no filetype".
             (?:
-              [^\\\s] # Beware of escaped characters: titlestring=\ ft=ruby
-              |       # will be read by Vim as { titlestring: " ft=ruby" }.
+              [^\\[ \t]] # Beware of escaped characters: titlestring=\ ft=ruby
+              |          # will be read by Vim as { titlestring: " ft=ruby" }.
               \\.
             )*
           )?
         )*
 
         # The actual filetype declaration
-        [\s:] (?:filetype|ft|syntax) \s*=
+        [[ \t]:] (?:filetype|ft|syntax) [ \t]*=
 
         # Language's name
         (\w+)
 
         # Ensure it's followed by a legal separator
-        (?=\s|:|$)
+        (?=[ \t]|:|$)
       /xi
 
       MODELINES = [EMACS_MODELINE, VIM_MODELINE]

data/lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "6.1.0"
+  VERSION = "6.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-linguist
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
@@ -232,6 +232,8 @@ files:
 - grammars/hint.haskell.json
 - grammars/hint.message.haskell.json
 - grammars/hint.type.haskell.json
+- grammars/markdown.haxe.codeblock.json
+- grammars/markdown.hxml.codeblock.json
 - grammars/objdump.x86asm.json
 - grammars/source.LS.json
 - grammars/source.MCPOST.json
@@ -339,6 +341,7 @@ files:
 - grammars/source.factor.json
 - grammars/source.fan.json
 - grammars/source.fancy.json
+- grammars/source.firestore.json
 - grammars/source.fish.json
 - grammars/source.fontforge.json
 - grammars/source.forth.json
@@ -369,10 +372,12 @@ files:
 - grammars/source.harbour.json
 - grammars/source.haskell.json
 - grammars/source.hlsl.json
+- grammars/source.hql.json
 - grammars/source.hsc2hs.json
 - grammars/source.hsig.json
 - grammars/source.httpspec.json
 - grammars/source.hx.json
+- grammars/source.hx.type.json
 - grammars/source.hxml.json
 - grammars/source.ideal.json
 - grammars/source.idl-dlm.json
@@ -384,7 +389,6 @@ files:
 - grammars/source.ioke.json
 - grammars/source.isabelle.root.json
 - grammars/source.isabelle.theory.json
-- grammars/source.j.json
 - grammars/source.jasmin.json
 - grammars/source.java-properties.json
 - grammars/source.java.json
@@ -500,6 +504,8 @@ files:
 - grammars/source.python.django.json
 - grammars/source.python.json
 - grammars/source.python.salt.json
+- grammars/source.q.json
+- grammars/source.q_output.json
 - grammars/source.qmake.json
 - grammars/source.qml.json
 - grammars/source.quoting.perl6fe.json

data/grammars/source.j.json

@@ -1,46 +0,0 @@
-{
-  "name": "J",
-  "scopeName": "source.j",
-  "patterns": [
-    {
-      "name": "string.quoted.j",
-      "match": "('[^']*')"
-    },
-    {
-      "name": "comment.line.j",
-      "match": "(?:^|[ )])(NB\\..*$)"
-    },
-    {
-      "name": "constant.numeric.j",
-      "match": "(?\u003c![_a-zA-Z])([_0-9][_0-9a-zA-Z]*\\.?[0-9a-zA-Z]*)(?![\\.\\:])"
-    },
-    {
-      "name": "copula.global.j",
-      "match": "=\\:"
-    },
-    {
-      "name": "copula.local.j",
-      "match": "=\\."
-    },
-    {
-      "name": "keyword.control.j",
-      "match": "(?\u003c![_a-zA-Z0-9])((?:while\\.)|(?:whilst\\.)|(?:if\\.)|(?:elseif\\.)|(?:else\\.)|(?:do\\.)|(?:end\\.))"
-    },
-    {
-      "name": "keyword.other.noun.j",
-      "match": "((?\u003c![_a-zA-Z0-9])(_\\.|a\\.|a:)(?![\\.\\:]))"
-    },
-    {
-      "name": "keyword.operator.conjunction.j",
-      "match": "((?\u003c![_a-zA-Z0-9])(?:[dDHT]\\.)|(?\u003c![_a-zA-Z0-9])(?:[DLS]:)|(\u0026\\.:)|([\\;\\!\\@\u0026]\\.)|([\\^\\!\\`\\@\u0026]:)|([\\\"\\`\\@\u0026])|(\\s[\\.\\:][\\.\\:])|(\\s[\\.\\:]))(?![\\.\\:])"
-    },
-    {
-      "name": "keyword.operator.adverb.j",
-      "match": "(([\\/\\\\]\\.)|(?\u003c![_a-zA-Z0-9])(?:[bfMt]\\.)|(?\u003c![_a-zA-Z0-9])(?:t:)|([\\~\\/\\\\\\}]))(?![\\.\\:])"
-    },
-    {
-      "name": "keyword.operator.verb.j",
-      "match": "((?:_?[0-9]\\:)|(?\u003c![_a-zA-Z0-9])(?:p\\.\\.)|(?\u003c![_a-zA-Z0-9])(?:[AcCeEiIjLopr]\\.)|(?\u003c![_a-zA-Z0-9])(?:[ipqsux]:)|({::)|([\u003c\u003e\\+\\*\\-\\%\\^\\$\\~\\|\\,\\#\\{\\}\"\\?]\\.)|([\u003c\u003e\\_\\+\\*\\-\\%\\$\\~\\|\\,\\;\\#\\/\\\\\\[\\{\\}\"]:)|([\u003c\u003e\\=\\+\\*\\-\\%\\^\\$\\|\\,\\;\\#\\!\\[\\]\\{\\?]))(?![\\.\\:])"
-    }
-  ]
-}