mirror of
https://github.com/KevinMidboe/linguist.git
synced 2026-05-14 01:16:04 +00:00
Merge pull request #2 from github/master
Update from upstream repo github/linguist
This commit is contained in:
osorgin
GitHub
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -746,3 +746,9 @@ url = https://github.com/austinwagner/sublime-sourcepawn
|
|||||||
[submodule "vendor/grammars/atom-language-srt"]
|
[submodule "vendor/grammars/atom-language-srt"]
|
||||||
path = vendor/grammars/atom-language-srt
|
path = vendor/grammars/atom-language-srt
|
||||||
url = https://github.com/314eter/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
|
||||||
|
|||||||
@@ -327,11 +327,15 @@ vendor/grammars/json.tmbundle:
|
|||||||
- source.json
|
- source.json
|
||||||
vendor/grammars/kotlin-sublime-package:
|
vendor/grammars/kotlin-sublime-package:
|
||||||
- source.Kotlin
|
- source.Kotlin
|
||||||
|
vendor/grammars/language-agc:
|
||||||
|
- source.agc
|
||||||
vendor/grammars/language-apl:
|
vendor/grammars/language-apl:
|
||||||
- source.apl
|
- source.apl
|
||||||
vendor/grammars/language-babel/:
|
vendor/grammars/language-babel/:
|
||||||
- source.js.jsx
|
- source.js.jsx
|
||||||
- source.regexp.babel
|
- source.regexp.babel
|
||||||
|
vendor/grammars/language-blade/:
|
||||||
|
- text.html.php.blade
|
||||||
vendor/grammars/language-click/:
|
vendor/grammars/language-click/:
|
||||||
- source.click
|
- source.click
|
||||||
vendor/grammars/language-clojure:
|
vendor/grammars/language-clojure:
|
||||||
|
|||||||
@@ -239,6 +239,14 @@ module Linguist
|
|||||||
end
|
end
|
||||||
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|
|
disambiguate ".ml" do |data|
|
||||||
if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
|
if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
|
||||||
Language["OCaml"]
|
Language["OCaml"]
|
||||||
|
|||||||
@@ -188,6 +188,15 @@ Apex:
|
|||||||
tm_scope: source.java
|
tm_scope: source.java
|
||||||
ace_mode: java
|
ace_mode: java
|
||||||
|
|
||||||
|
Apollo Guidance Computer:
|
||||||
|
type: programming
|
||||||
|
color: "#0B3D91"
|
||||||
|
group: Assembly
|
||||||
|
extensions:
|
||||||
|
- .agc
|
||||||
|
tm_scope: source.agc
|
||||||
|
ace_mode: assembly_x86
|
||||||
|
|
||||||
AppleScript:
|
AppleScript:
|
||||||
type: programming
|
type: programming
|
||||||
aliases:
|
aliases:
|
||||||
@@ -330,6 +339,15 @@ BitBake:
|
|||||||
- .bb
|
- .bb
|
||||||
ace_mode: text
|
ace_mode: text
|
||||||
|
|
||||||
|
Blade:
|
||||||
|
type: markup
|
||||||
|
group: HTML
|
||||||
|
extensions:
|
||||||
|
- .blade
|
||||||
|
- .blade.php
|
||||||
|
tm_scope: text.html.php.blade
|
||||||
|
ace_mode: text
|
||||||
|
|
||||||
BlitzBasic:
|
BlitzBasic:
|
||||||
type: programming
|
type: programming
|
||||||
aliases:
|
aliases:
|
||||||
@@ -1182,6 +1200,13 @@ GAS:
|
|||||||
tm_scope: source.assembly
|
tm_scope: source.assembly
|
||||||
ace_mode: assembly_x86
|
ace_mode: assembly_x86
|
||||||
|
|
||||||
|
GCC Machine Description:
|
||||||
|
type: programming
|
||||||
|
extensions:
|
||||||
|
- .md
|
||||||
|
tm_scope: source.lisp
|
||||||
|
ace_mode: lisp
|
||||||
|
|
||||||
GDScript:
|
GDScript:
|
||||||
type: programming
|
type: programming
|
||||||
extensions:
|
extensions:
|
||||||
@@ -1340,7 +1365,6 @@ GraphQL:
|
|||||||
type: data
|
type: data
|
||||||
extensions:
|
extensions:
|
||||||
- .graphql
|
- .graphql
|
||||||
color: "#E535AB"
|
|
||||||
tm_scope: source.graphql
|
tm_scope: source.graphql
|
||||||
ace_mode: text
|
ace_mode: text
|
||||||
|
|
||||||
@@ -2207,7 +2231,6 @@ Markdown:
|
|||||||
- .mkdown
|
- .mkdown
|
||||||
- .ron
|
- .ron
|
||||||
tm_scope: source.gfm
|
tm_scope: source.gfm
|
||||||
color: "#083FA1"
|
|
||||||
|
|
||||||
Mask:
|
Mask:
|
||||||
type: markup
|
type: markup
|
||||||
@@ -3087,7 +3110,6 @@ RDoc:
|
|||||||
extensions:
|
extensions:
|
||||||
- .rdoc
|
- .rdoc
|
||||||
tm_scope: text.rdoc
|
tm_scope: text.rdoc
|
||||||
color: "#8E84BF"
|
|
||||||
|
|
||||||
REALbasic:
|
REALbasic:
|
||||||
type: programming
|
type: programming
|
||||||
@@ -3978,7 +4000,6 @@ WebIDL:
|
|||||||
|
|
||||||
World of Warcraft Addon Data:
|
World of Warcraft Addon Data:
|
||||||
type: data
|
type: data
|
||||||
color: "#e0b330"
|
|
||||||
extensions:
|
extensions:
|
||||||
- .toc
|
- .toc
|
||||||
tm_scope: source.toc
|
tm_scope: source.toc
|
||||||
@@ -4288,7 +4309,6 @@ reStructuredText:
|
|||||||
- .rest.txt
|
- .rest.txt
|
||||||
- .rst.txt
|
- .rst.txt
|
||||||
ace_mode: text
|
ace_mode: text
|
||||||
color: "#B3BCBC"
|
|
||||||
|
|
||||||
wisp:
|
wisp:
|
||||||
type: programming
|
type: programming
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
21
samples/Blade/hello.blade
Normal file
21
samples/Blade/hello.blade
Normal file
@@ -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>
|
||||||
21
samples/Blade/hello.blade.php
Normal file
21
samples/Blade/hello.blade.php
Normal file
@@ -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>
|
||||||
6665
samples/GCC Machine Description/pdp10.md
Normal file
6665
samples/GCC Machine Description/pdp10.md
Normal file
File diff suppressed because it is too large
Load Diff
1
vendor/grammars/language-agc
vendored
Submodule
1
vendor/grammars/language-agc
vendored
Submodule
Submodule vendor/grammars/language-agc added at 645d332f50
2
vendor/grammars/language-babel
vendored
2
vendor/grammars/language-babel
vendored
Submodule vendor/grammars/language-babel updated: 265937e465...0d093e8ffe
1
vendor/grammars/language-blade
vendored
Submodule
1
vendor/grammars/language-blade
vendored
Submodule
Submodule vendor/grammars/language-blade added at 50dcfb72af
18
vendor/licenses/grammar/language-agc.txt
vendored
Normal file
18
vendor/licenses/grammar/language-agc.txt
vendored
Normal file
@@ -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.
|
||||||
60
vendor/licenses/grammar/language-blade.txt
vendored
Normal file
60
vendor/licenses/grammar/language-blade.txt
vendored
Normal file
@@ -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.
|
||||||
Reference in New Issue
Block a user