Garen Torikian
3aec4dd2ea
Adjust to ignore generated
2014-12-04 21:27:07 +02:00
Paul Chaignon
ed34caa565
Merge branch 'master' into saltstack-states
2014-12-04 14:14:05 -05:00
Garen Torikian
81b8c57bae
Add Loomscript exclusion
2014-12-04 21:10:28 +02:00
Garen Torikian
0780b7239a
Merge branch 'master' into add-missing-ace-modes-for-popular-languages
2014-12-04 21:09:46 +02:00
Arfon Smith
ff3438b810
v4.2.3
2014-12-03 13:52:45 -06:00
Arfon Smith
7aaf99c9b1
Merge branch 'FS-samples' of github.com:github/linguist into FS-samples
2014-12-03 13:09:00 -06:00
Arfon Smith
6ae4aa50e2
Merge pull request #1817 from pchaigno/fix-fs-heuristic
...
Fix .fs heuristic
2014-12-03 13:08:08 -06:00
Garen Torikian
1a3177409c
Merge master
2014-12-03 20:15:55 +02:00
Garen Torikian
de4b538d82
Update comment at the top of the file
2014-12-03 20:14:20 +02:00
Brandon Keepers
a97e328484
v4.2.2
2014-12-03 09:58:08 -08:00
Brandon Keepers
e446b86b90
Merge pull request #1813 from github/invalid-shebang
...
Fix detection for invalid shebang
2014-12-03 09:48:48 -08:00
Arfon Smith
e9036d675e
SCSS isnt SASS
2014-12-03 10:12:58 -06:00
Paul Chaignon
feea9bfd30
Fix heuristic for .fs
2014-12-03 09:48:54 -05:00
Brandon Keepers
a5673e7fb6
Fix detection for invalid shebang
2014-12-02 21:03:39 -06:00
Arfon Smith
a02f19f5a3
Bumping linguist version
2014-12-02 20:06:36 -06:00
Paul Chaignon
7625c92307
Remove .module extension for PHP
2014-12-02 20:37:09 -05:00
Paul Chaignon
37ffdb9020
Fix error when matching languages against heuristics: if no language, no heuristic rule should be used
2014-12-02 16:41:39 -05:00
Arfon Smith
31d882b07e
Merge branch 'master' into cut-release-v4.2.0
...
Conflicts:
grammars.yml
2014-12-02 10:57:53 -06:00
Arfon Smith
fd9275b213
Merge pull request #1702 from ellemenno/loomscript-support
...
add language declaration and samples for LoomScript
2014-12-02 10:54:36 -06:00
Arfon Smith
cfa63cff35
Merge pull request #900 from hoelzro/master
...
Update Perl 6 samples
2014-12-02 10:52:45 -06:00
Arfon Smith
62a8b52df4
Bumping to v4.2.0
2014-12-01 14:19:08 -06:00
Wout Mertens
23cfa86f93
Add grammar for Nix
2014-12-01 18:50:56 +01:00
Garen Torikian
dce00d01d9
Add missing ace_mode values
2014-12-01 15:54:33 +02:00
Garen Torikian
768ec76ff0
Merge master
2014-12-01 15:52:37 +02:00
ellemenno
72c00f869c
add textmate scope for loomscript
2014-12-01 01:30:14 -05:00
ellemenno
c76137efc0
improve regex for loomscript
2014-12-01 01:30:13 -05:00
ellemenno
88f196e4d4
add a heuristic to disambiguate LiveScript from LoomScript
...
Keying off of `package {`, since LoomScript code must be enclosed in a
package definition, whereas that would be invalid LiveScript
2014-12-01 01:28:33 -05:00
ellemenno
4fe5980065
add language declaration and samples for LoomScript
...
LoomScript is the scripting language for the Loom SDK.
It has an ActionScript3-like syntax with added C#-esque capabilities.
Loom SDK: https://github.com/LoomSDK/LoomSDK
2014-12-01 01:03:03 -05:00
Rob Hoelz
7c7b1fb9c4
Reorder extensions for Perl 6
2014-11-30 22:35:52 -06:00
Rob Hoelz
ed3d38cf05
Create Perl6 heuristic
2014-11-30 22:35:52 -06:00
Rob Hoelz
1364e9be51
Add .t as a valid Perl/Perl6 file extension
2014-11-30 22:28:06 -06:00
Arfon Smith
bf82caccfc
Merge branch 'master' into isabelle-grammar
...
Conflicts:
grammars.yml
2014-11-30 21:53:02 -06:00
Arfon Smith
325dbc8e16
Merge pull request #1698 from sebgod/add-mercury-interpreter
...
languages.yml: added an interpreter entry to Mercury section
2014-11-30 21:28:04 -06:00
Arfon Smith
bd2fb0af51
Merge pull request #1790 from pchaigno/gradle
...
Support for gradle files
2014-11-30 21:24:30 -06:00
Arfon Smith
9b22b2973f
Merge branch 'master' into google-apps
...
Conflicts:
lib/linguist/heuristics.rb
lib/linguist/samples.json
2014-11-30 21:11:59 -06:00
Arfon Smith
025bb35ac7
Merge pull request #1673 from blakeembrey/support-raml
...
Add spport for RAML language
2014-11-30 21:05:10 -06:00
Arfon Smith
7fb5d0cadd
Merge pull request #1782 from anpar/master
...
Add Oz to recognized languages
2014-11-30 20:57:55 -06:00
Arfon Smith
0154c21c3d
Adding Cool grammar
2014-11-30 20:45:24 -06:00
Arfon Smith
8c841903a5
Merge branch 'master' into cs-smalltalk
...
Conflicts:
lib/linguist/languages.yml
lib/linguist/samples.json
2014-11-30 15:35:16 -06:00
Arfon Smith
648596dbb2
Be explicit about tm_scope
2014-11-30 15:24:33 -06:00
Arfon Smith
212c74d8a3
Merge branch 'master' into cool
...
Conflicts:
lib/linguist/heuristics.rb
lib/linguist/languages.yml
lib/linguist/samples.json
2014-11-30 15:23:09 -06:00
Antoine Paris
b7a9843770
Corrections by @pchaigno
2014-11-30 21:18:23 +01:00
Arfon Smith
ca76802ee4
Removing Mercury directory from vendor.yml
2014-11-30 07:55:55 -06:00
Gerwin Klein
cec54837bc
add language grammar for Isabelle theorem prover
2014-11-30 17:17:13 +11:00
Arfon Smith
e0c35b0665
Merge pull request #1706 from pchaigno/mm-xml
...
Add .mm as an XML extension with heuristic rule
2014-11-29 23:07:58 -06:00
Paul Chaignon
4ed58c743d
Support for gradle files
2014-11-28 23:00:35 -05:00
Arfon Smith
cfd95360cb
Merge pull request #1627 from github/1036-local
...
Disambiguate C, C++, Objective-C
2014-11-28 18:05:16 -06:00
Brandon Keepers
22144e79d3
Merge pull request #1787 from github/move-shebang
...
Move shebang (updated)
2014-11-28 18:02:04 -06:00
Brandon Keepers
3acbf06beb
Merge pull request #1788 from github/refactor-heuristics
...
Refactor heuristics (updated)
2014-11-28 17:59:43 -06:00
Brandon Keepers
7b41346db8
Merge branch 'refactor-heuristics' into 1036-local
...
* refactor-heuristics: (43 commits)
update docs
Clean up heuristic logic
Allow disambiguate to return an Array
Rename .create to .disambiguate
docs
Remove inactive heuristics
Refactor heuristics
Not going back
docs
Move call method into existing Classifier class
Try strategies until one language is returned
Remove unneded empty blob check
Add F# and GLSL samples. Add Forth and GLSL extension .fs. Add heuristic to disambiguate between F#, Forth, and GLSL.
byebug requires ruby 2.0
Remove test for removed extension
Fix typo in test
add rake interpreter
add python3 interpreter
Remove old wrong_shebang.rb sample
Add byebug
...
Conflicts:
lib/linguist/heuristics.rb
test/test_heuristics.rb
2014-11-28 17:58:00 -06:00
