Bumping Linguist to v4.8.3 (#2950)

* Add GraphQL to languages.yml

* Add graphql submodule

* Add graphql to grammars.yml

* Add GraphQL samples

* Updating licensed information

.gitmodules

@@ -479,9 +479,6 @@
 [submodule "vendor/grammars/Modelica"]
 	path = vendor/grammars/Modelica
 	url = https://github.com/BorisChumichev/modelicaSublimeTextPackage
-[submodule "vendor/grammars/sublime-apl"]
-	path = vendor/grammars/sublime-apl
-	url = https://github.com/StoneCypher/sublime-apl
 [submodule "vendor/grammars/sublime-golo"]
 	path = vendor/grammars/sublime-golo
 	url = https://github.com/TypeUnsafe/sublime-golo
@@ -698,3 +695,18 @@
 [submodule "vendor/grammars/grace"]
 	path = vendor/grammars/grace
 	url = https://github.com/zmthy/grace-tmbundle
+[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
+[submodule "vendor/grammars/language-apl"]
+	path = vendor/grammars/language-apl
+	url = https://github.com/Alhadis/language-apl.git
+[submodule "vendor/grammars/language-graphql"]
+	path = vendor/grammars/language-graphql
+	url = https://github.com/rmosolgo/language-graphql

grammars.yml

@@ -183,6 +183,9 @@ vendor/grammars/atom-language-stan/:
 vendor/grammars/atom-salt:
 - source.python.salt
 - source.yaml.salt
+vendor/grammars/atomic-dreams/:
+- source.dm
+- source.dmf
 vendor/grammars/ats:
 - source.ats
 vendor/grammars/awk-sublime:
@@ -290,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:
@@ -314,6 +319,8 @@ vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-apl:
+- source.apl
 vendor/grammars/language-babel/:
 - source.js.jsx
 - source.regexp.babel
@@ -333,6 +340,8 @@ vendor/grammars/language-csharp:
 - source.nant-build
 vendor/grammars/language-gfm:
 - source.gfm
+vendor/grammars/language-graphql:
+- source.graphql
 vendor/grammars/language-hy:
 - source.hy
 vendor/grammars/language-inform7:
@@ -414,6 +423,8 @@ vendor/grammars/nesC:
 - source.nesc
 vendor/grammars/ninja.tmbundle:
 - source.ninja
+vendor/grammars/nix:
+- source.nix
 vendor/grammars/objective-c.tmbundle:
 - source.objc
 - source.objc++
@@ -499,8 +510,6 @@ vendor/grammars/standard-ml.tmbundle:
 - source.ml
 vendor/grammars/sublime-MuPAD:
 - source.mupad
-vendor/grammars/sublime-apl/:
-- source.apl
 vendor/grammars/sublime-aspectj/:
 - source.aspectj
 vendor/grammars/sublime-befunge:

lib/linguist/heuristics.rb

@@ -127,6 +127,14 @@ module Linguist
         Language["ECL"]
       end
     end
+    
+    disambiguate ".es" do |data|
+      if /^\s*(?:%%|main\s*\(.*?\)\s*->)/.match(data)
+        Language["Erlang"]
+      elsif /(?:\/\/|("|')use strict\1|export\s+default\s|\/\*.*?\*\/)/m.match(data)
+        Language["JavaScript"]
+      end
+    end
 
     disambiguate ".for", ".f" do |data|
       if /^: /.match(data)

lib/linguist/languages.yml

@@ -772,7 +772,7 @@ DM:
   - .dm
   aliases:
   - byond
-  tm_scope: source.c++
+  tm_scope: source.dm
   ace_mode: c_cpp
 
 DNS Zone:
@@ -1262,6 +1262,14 @@ Graph Modeling Language:
   tm_scope: none
   ace_mode: text
 
+GraphQL:
+  type: data
+  extensions:
+    - .graphql
+  color: "#E535AB"
+  tm_scope: source.graphql
+  ace_mode: text
+
 Graphviz (DOT):
   type: data
   tm_scope: source.dot
@@ -1532,7 +1540,7 @@ Idris:
   - .idr
   - .lidr
   ace_mode: text
-  tm_scope: none
+  tm_scope: source.idris
 
 Inform 7:
   type: programming
@@ -1694,6 +1702,7 @@ JavaScript:
   - .js
   - ._js
   - .bones
+  - .es
   - .es6
   - .frag
   - .gs
@@ -2067,6 +2076,7 @@ Makefile:
   - .mak
   - .d
   - .mk
+  - .mkfile
   filenames:
   - GNUmakefile
   - Kbuild
@@ -2075,6 +2085,7 @@ Makefile:
   - Makefile.in
   - Makefile.inc
   - makefile
+  - mkfile
   interpreters:
   - make
   ace_mode: makefile
@@ -2373,7 +2384,7 @@ Nix:
   - .nix
   aliases:
   - nixos
-  tm_scope: none
+  tm_scope: source.nix
   ace_mode: nix
 
 Nu:

lib/linguist/version.rb

@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "4.8.1"
+  VERSION = "4.8.3"
 end

samples/Erlang/170-os-daemons.es

@@ -0,0 +1,26 @@
+#! /usr/bin/env escript
+
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+loop() ->
+	loop(io:read("")).
+
+loop({ok, _}) ->
+	loop(io:read(""));
+loop(eof) ->
+	stop;
+loop({error, Reason}) ->
+	throw({error, Reason}).
+
+main([]) ->
+	loop().

samples/Erlang/release

@@ -119,4 +119,3 @@ execute_overlay([{copy, In, Out} | Rest], Vars, BaseDir, TargetDir) ->
 
 exit_code(ExitCode) ->
     erlang:halt(ExitCode, [{flush, true}]).
-

samples/Erlang/single-context.es

@@ -0,0 +1,104 @@
+#! /usr/bin/env escript
+% This file is part of Emonk released under the MIT license. 
+% See the LICENSE file for more information.
+
+main([]) ->
+	start(64, 1000);
+main([N]) ->
+	start(list_to_integer(N), 1000);
+main([N, M]) ->
+	start(list_to_integer(N), list_to_integer(M)).
+
+
+start(N, M) ->
+	code:add_pathz("test"),
+	code:add_pathz("ebin"),
+	{ok, Ctx} = emonk:create_ctx(),
+	{ok, undefined} = emonk:eval(Ctx, js()),
+	run(Ctx, N, M),
+	wait(N).
+
+run(_, 0, _) ->
+	ok;
+run(Ctx, N, M) ->
+	Self = self(),
+	Pid = spawn(fun() -> do_js(Self, Ctx, M) end),
+	io:format("Spawned: ~p~n", [Pid]),
+	run(Ctx, N-1, M).
+
+wait(0) ->
+	ok;
+wait(N) ->
+	receive
+		{finished, Pid} -> ok
+	end,
+	io:format("Finished: ~p~n", [Pid]),
+	wait(N-1).
+
+do_js(Parent, _, 0) ->
+	Parent ! {finished, self()};
+do_js(Parent, Ctx, M) ->
+	io:format("Running: ~p~n", [M]),
+	Test = random_test(),
+	{ok, [Resp]} = emonk:call(Ctx, <<"f">>, [Test]),
+	Sorted = sort(Resp),
+	true = Test == Sorted,
+	do_js(Parent, Ctx, M-1).
+
+js() -> 
+	<<"var f = function(x) {return [x];};">>.
+
+random_test() ->
+	Tests = [
+		null,
+		true,
+		false,
+		1,
+		-1,
+		3.1416,
+		-3.1416,
+		12.0e10,
+		1.234E+10,
+		-1.234E-10,
+		10.0,
+		123.456,
+		10.0,
+		<<"foo">>,
+		<<"foo", 5, "bar">>,
+		<<"">>,
+		<<"\n\n\n">>,
+		<<"\" \b\f\r\n\t\"">>,
+		{[]},
+		{[{<<"foo">>, <<"bar">>}]},
+		{[{<<"foo">>, <<"bar">>}, {<<"baz">>, 123}]},
+		[],
+		[[]],
+		[1, <<"foo">>],
+		{[{<<"foo">>, [123]}]},
+		{[{<<"foo">>, [1, 2, 3]}]},
+		{[{<<"foo">>, {[{<<"bar">>, true}]}}]},
+		{[
+			{<<"foo">>, []},
+			{<<"bar">>, {[{<<"baz">>, true}]}}, {<<"alice">>, <<"bob">>}
+		]},
+		[-123, <<"foo">>, {[{<<"bar">>, []}]}, null]
+	],
+	{_, [Test | _]} = lists:split(random:uniform(length(Tests)) - 1, Tests),
+	sort(Test).
+
+sort({Props}) ->
+	objsort(Props, []);
+sort(List) when is_list(List) ->
+	lstsort(List, []);
+sort(Other) ->
+	Other.
+
+objsort([], Acc) ->
+	{lists:sort(Acc)};
+objsort([{K,V} | Rest], Acc) ->
+	objsort(Rest, [{K, sort(V)} | Acc]).
+
+lstsort([], Acc) ->
+	lists:reverse(Acc);
+lstsort([Val | Rest], Acc) ->
+	lstsort(Rest, [sort(Val) | Acc]).

samples/GraphQL/kitchen-sink.graphql

@@ -0,0 +1,57 @@
+# Copyright (c) 2015, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+query queryName($foo: ComplexType, $site: Site = MOBILE) {
+  whoever123is: node(id: [123, 456]) {
+    id ,
+    ... on User @defer {
+      field2 {
+        id ,
+        alias: field1(first:10, after:$foo,) @include(if: $foo) {
+          id,
+          ...frag
+        }
+      }
+    }
+    ... @skip(unless: $foo) {
+      id
+    }
+    ... {
+      id
+    }
+  }
+}
+
+mutation likeStory {
+  like(story: 123) @defer {
+    story {
+      id
+    }
+  }
+}
+
+subscription StoryLikeSubscription($input: StoryLikeSubscribeInput) {
+  storyLikeSubscribe(input: $input) {
+    story {
+      likers {
+        count
+      }
+      likeSentence {
+        text
+      }
+    }
+  }
+}
+
+fragment frag on Friend {
+  foo(size: $size, bar: $b, obj: {key: "value"})
+}
+
+{
+  unnamed(truthy: true, falsey: false),
+  query
+}

samples/GraphQL/schema-kitchen-sink.graphql

@@ -0,0 +1,50 @@
+# Copyright (c) 2015, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+
+schema {
+  query: QueryType
+  mutation: MutationType
+}
+
+type Foo implements Bar {
+  one: Type
+  two(argument: InputType!): Type
+  three(argument: InputType, other: String): Int
+  four(argument: String = "string"): String
+  five(argument: [String] = ["string", "string"]): String
+  six(argument: InputType = {key: "value"}): Type
+}
+
+interface Bar {
+  one: Type
+  four(argument: String = "string"): String
+}
+
+union Feed = Story | Article | Advert
+
+scalar CustomScalar
+
+enum Site {
+  DESKTOP
+  MOBILE
+}
+
+input InputType {
+  key: String!
+  answer: Int = 42
+}
+
+extend type Foo {
+  seven(argument: [String]): Type
+}
+
+directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+
+directive @include(if: Boolean!)
+  on FIELD
+   | FRAGMENT_SPREAD
+   | INLINE_FRAGMENT

samples/JavaScript/axios.es

@@ -0,0 +1,13 @@
+import axios from "axios";
+
+export default {
+	async getIndex(prefix) {
+		const {data} = await axios.get((prefix || "") + "/index.json");
+		return data;
+	},
+	
+	async getContent(path, prefix) {
+		const {data} = await axios.get((prefix || "") + "/" + path + ".json");
+		return data;
+	}
+}

samples/JavaScript/index.es

@@ -0,0 +1,35 @@
+import config from "../webpack.config";
+import webpackDevMiddleware from "webpack-dev-middleware";
+import webpackHot from "webpack-hot-middleware";
+import webpack from "webpack";
+import express from "express";
+
+app.use(webpackDevMiddleware(compiler, {
+	noInfo: false,
+	quiet: false,
+	publicPath: config.output.publicPath,
+	hot: true,
+	historyApiFallback: true
+}));
+	
+app.get("/(:root).json", (req, resp) => {
+	resp.send(indexer.index(req.params.root));
+});
+
+export default function(){
+	const server = http.createServer(app);
+	
+	server.listen(3000);
+	
+	const wss = new WebSocketServer({server});
+	
+	let id = 1;
+	wss.on("connection", (ws) => {
+		console.log("Hello", " world");
+		let wsId = id++;
+		sessions[wsId] = ws;
+		ws.on("close", () => {
+			delete sessions[wsId]
+		});
+	});
+};

samples/Makefile/filenames/mkfile

@@ -0,0 +1,9 @@
+GREETINGS=hello gday bonjour hola ola kaixo tag hoi konnichiwa nihao dobredan namaste salaam
+
+all:V:
+	mk greet.^($GREETINGS)
+	for(i in $GREETINGS)
+		mk $i
+
+greet.%: text-folder
+	/n/$printer $stem >[2=1]

test/test_grammars.rb

@@ -15,6 +15,7 @@ class TestGrammars < Minitest::Test
     apache-2.0
     bsd-2-clause
     bsd-3-clause
+    isc
     mit
     mpl-2.0
     public

test/test_heuristics.rb

@@ -83,6 +83,13 @@ class TestHeuristcs < Minitest::Test
       "ECLiPSe" => all_fixtures("ECLiPSe", "*.ecl")
     })
   end
+  
+  def test_es_by_heuristics
+    assert_heuristics({
+      "Erlang" => all_fixtures("Erlang", "*.es"),
+      "JavaScript" => all_fixtures("JavaScript", "*.es")
+    })
+  end
 
   def test_f_by_heuristics
     assert_heuristics({

vendor/licenses/config.yml

@@ -4,6 +4,7 @@ whitelist:
   - bsd-3-clause
   - permissive
   - mit
+  - isc
   - mpl-2.0
   - unlicense
   - wtfpl

vendor/licenses/grammar/atomic-dreams.txt

@@ -0,0 +1,14 @@
+---
+type: grammar
+name: atomic-dreams
+license: mit
+curated: true
+---
+
+Copyright (c) 2016 Pieter-Jan Briers, Kyle J. Kemp
+
+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/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/grammar/language-apl.txt

@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-apl
+license: isc
+---
+Copyright (c) 2016, John Gardner
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

vendor/licenses/grammar/language-graphql.txt

@@ -0,0 +1,27 @@
+---
+type: grammar
+name: language-graphql
+license: mit
+curated: true
+---
+
+The MIT License (MIT)
+
+Copyright (c) Robert Mosolgo
+
+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/grammar/nix.txt

@@ -0,0 +1,13 @@
+---
+type: grammar
+name: nix
+license: mit
+---
+The MIT License (MIT)
+Copyright (c) 2016 Wout Mertens
+
+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