Commit Graph

3256 Commits

Author SHA1 Message Date
Garen Torikian de4b538d82 Update comment at the top of the file 2014-12-03 20:14:20 +02: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
Arfon Smith 2fbfaf448d Merge pull request #1800 from github/isabelle-grammar
Isabelle grammar
2014-11-30 21:58:08 -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 3c904dff61 Merge pull request #1798 from github/google-apps
Google apps
2014-11-30 21:16:50 -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 8157c6f56b Merge pull request #1796 from github/cool
Cool
2014-11-30 20:49:26 -06:00
Arfon Smith 0154c21c3d Adding Cool grammar 2014-11-30 20:45:24 -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 4495e15fa7 Misspelling correction 2014-11-30 22:07:55 +01:00
Antoine Paris da96e11b37 Add grammar for Oz 2014-11-30 22:01:39 +01:00
Antoine Paris b7a9843770 Corrections by @pchaigno 2014-11-30 21:18:23 +01:00
Arfon Smith 55432774c7 Merge pull request #1795 from github/mercury-vendor
Removing Mercury directory from vendor.yml
2014-11-30 08:00:36 -06: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
Brandon Keepers 865980b8f7 Merge pull request #1791 from pchaigno/remove-old-heuristic
Remove old test forgotten in #1788
2014-11-29 12:32:28 -06:00
Paul Chaignon 9367a4797f Remove old test forgotten in #1788 2014-11-28 23:14:17 -05: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
Brandon Keepers 878b321b89 Merge remote-tracking branch 'origin/master' into move-shebang
* origin/master:
  Tweak docs
2014-11-28 17:41:10 -06:00
Brandon Keepers a903123cb8 Merge pull request #1663 from github/strategies
Refactor detection into strategies
2014-11-28 17:40:12 -06:00
Brandon Keepers 577fb95384 Tweak docs 2014-11-28 17:36:14 -06:00
Brandon Keepers 770a1d4553 update docs 2014-11-28 17:07:15 -06:00
Brandon Keepers c038b51941 Clean up heuristic logic 2014-11-28 17:03:01 -06:00
Brandon Keepers 4bebcef6ef Allow disambiguate to return an Array 2014-11-28 16:55:00 -06:00
Brandon Keepers b8685103d0 Rename .create to .disambiguate 2014-11-28 14:41:52 -06:00
Brandon Keepers 26d789612b docs 2014-11-28 14:40:02 -06:00
Garen Torikian 7a57a0b594 What is this, Lisp? 2014-11-28 12:35:42 -08:00
Garen Torikian 66eabd8bdc Prefer Yajl.load 2014-11-28 12:34:02 -08:00
Garen Torikian be82b55408 Simplify rescue catching 2014-11-28 12:33:43 -08:00
Garen Torikian 526ca1761a This require is no longer used 2014-11-28 12:33:37 -08:00
Brandon Keepers 10de952ed6 Remove Linguist.interpreter_from_shebang 2014-11-28 14:14:40 -06:00
Brandon Keepers 2517650ecb Fix shebang without path 2014-11-28 14:14:10 -06:00
Brandon Keepers 47b739527a Treat lines as enumerator and not array 2014-11-28 13:55:55 -06:00
Garen Torikian 8655d966ad Make corrections from a bade merge resolution 2014-11-28 11:50:46 -08:00
Garen Torikian 3fb4973aab Add missing ace_modes (introduced from master) 2014-11-28 11:48:39 -08:00
Garen Torikian 1d4149168d Add Rake task to fetch ace_modes, and skip test if there's no internet 2014-11-28 11:48:26 -08:00
Garen Torikian 26ab33754f Merge master 2014-11-28 11:04:53 -08:00
Brandon Keepers 88f08803ee require shebang when building samples 2014-11-28 12:34:41 -06:00
Brandon Keepers c05717d15c docs 2014-11-28 12:27:48 -06:00