Merge pull request #2 from github/master

Update from upstream repo github/linguist
2026-05-13 17:06:04 +00:00 · 2016-07-14 14:58:17 +03:00
parent fa817b6a1d 36ba378344
commit 6bf223e641
13 changed files with 7890 additions and 6 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -746,3 +746,9 @@ url = https://github.com/austinwagner/sublime-sourcepawn
 [submodule "vendor/grammars/atom-language-srt"]
 	path = vendor/grammars/atom-language-srt
 	url = https://github.com/314eter/atom-language-srt
+[submodule "vendor/grammars/language-agc"]
+	path = vendor/grammars/language-agc
+	url = https://github.com/Alhadis/language-agc
+[submodule "vendor/grammars/language-blade"]
+	path = vendor/grammars/language-blade
+	url = https://github.com/jawee/language-blade
--- a/grammars.yml
+++ b/grammars.yml
@@ -327,11 +327,15 @@ vendor/grammars/json.tmbundle:
 - source.json
 vendor/grammars/kotlin-sublime-package:
 - source.Kotlin
+vendor/grammars/language-agc:
+- source.agc
 vendor/grammars/language-apl:
 - source.apl
 vendor/grammars/language-babel/:
 - source.js.jsx
 - source.regexp.babel
+vendor/grammars/language-blade/:
+- text.html.php.blade
 vendor/grammars/language-click/:
 - source.click
 vendor/grammars/language-clojure:
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -239,6 +239,14 @@ module Linguist
      end
    end

+    disambiguate ".md" do |data|
+      if /^[-a-z0-9=#!\*\[|]/i.match(data)
+        Language["Markdown"]
+      elsif /^(;;|\(define_)/.match(data)
+        Language["GCC machine description"]
+      end
+    end
+
    disambiguate ".ml" do |data|
      if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
        Language["OCaml"]
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -188,6 +188,15 @@ Apex:
  tm_scope: source.java
  ace_mode: java

+Apollo Guidance Computer:
+  type: programming
+  color: "#0B3D91"
+  group: Assembly
+  extensions:
+  - .agc
+  tm_scope: source.agc
+  ace_mode: assembly_x86
+
 AppleScript:
  type: programming
  aliases:
@@ -330,6 +339,15 @@ BitBake:
  - .bb
  ace_mode: text

+Blade:
+  type: markup
+  group: HTML
+  extensions:
+    - .blade
+    - .blade.php
+  tm_scope: text.html.php.blade
+  ace_mode: text
+
 BlitzBasic:
  type: programming
  aliases:
@@ -1182,6 +1200,13 @@ GAS:
  tm_scope: source.assembly
  ace_mode: assembly_x86

+GCC Machine Description:
+  type: programming
+  extensions:
+  - .md
+  tm_scope: source.lisp
+  ace_mode: lisp
+
 GDScript:
  type: programming
  extensions:
@@ -1340,7 +1365,6 @@ GraphQL:
  type: data
  extensions:
    - .graphql
-  color: "#E535AB"
  tm_scope: source.graphql
  ace_mode: text

@@ -2207,7 +2231,6 @@ Markdown:
  - .mkdown
  - .ron
  tm_scope: source.gfm
-  color: "#083FA1"

 Mask:
  type: markup
@@ -3087,7 +3110,6 @@ RDoc:
  extensions:
  - .rdoc
  tm_scope: text.rdoc
-  color: "#8E84BF"

 REALbasic:
  type: programming
@@ -3978,7 +4000,6 @@ WebIDL:

 World of Warcraft Addon Data:
  type: data
-  color: "#e0b330"
  extensions:
  - .toc
  tm_scope: source.toc
@@ -4288,7 +4309,6 @@ reStructuredText:
  - .rest.txt
  - .rst.txt
  ace_mode: text
-  color: "#B3BCBC"

 wisp:
  type: programming
--- a/Computer/BURN_BABY_BURN--MASTER_IGNITION_ROUTINE.agc
+++ b/Computer/BURN_BABY_BURN--MASTER_IGNITION_ROUTINE.agc
--- a/samples/Blade/hello.blade
+++ b/samples/Blade/hello.blade
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>@yield('title', 'We love GitHub')</title>
+    @stack('scripts')
+    @stack('styles')
+</head>
+<body>
+    @include('partials.nav')
+
+    @yield('content')
+
+    <ul>
+        @foreach($foo as $bar)
+        <li>{{ $bar }}</li>
+        @endforeach
+    </ul>
+
+    {!! $raw_content !!}
+</body>
+</html>
--- a/samples/Blade/hello.blade.php
+++ b/samples/Blade/hello.blade.php
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>@yield('title', 'We love GitHub')</title>
+    @stack('scripts')
+    @stack('styles')
+</head>
+<body>
+    @include('partials.nav')
+
+    @yield('content')
+
+    <ul>
+        @foreach($foo as $bar)
+        <li>{{ $bar }}</li>
+        @endforeach
+    </ul>
+
+    {!! $raw_content !!}
+</body>
+</html>
--- a/Description/pdp10.md
+++ b/Description/pdp10.md
--- a/vendor/grammars/language-agc
+++ b/vendor/grammars/language-agc
--- a/vendor/grammars/language-babel
+++ b/vendor/grammars/language-babel
--- a/vendor/grammars/language-blade
+++ b/vendor/grammars/language-blade
--- a/vendor/licenses/grammar/language-agc.txt
+++ b/vendor/licenses/grammar/language-agc.txt
@@ -0,0 +1,18 @@
+---
+type: grammar
+name: language-agc
+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.
--- a/vendor/licenses/grammar/language-blade.txt
+++ b/vendor/licenses/grammar/language-blade.txt
@@ -0,0 +1,60 @@
+---
+type: grammar
+name: language-blade
+license: mit
+---
+Copyright (c) 2016 Andreas Olsson, Indrek Ardel
+
+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.
+
+--------------------------------------------------------------------
+
+This package uses parts from [Atom language-php package](https://github.com/atom/language-php).
+
+> Copyright (c) 2014 GitHub Inc.
+
+> 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.
+
+> --------------------------------------------------------------------
+
+> This package was derived from a TextMate bundle located at
+https://github.com/textmate/php.tmbundle and distributed under the following
+license, located in `README.mdown`:
+
+> Permission to copy, use, modify, sell and distribute this
+software is granted. This software is provided "as is" without
+express or implied warranty, and with no claim as to its
+suitability for any purpose.