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
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
Jorge Bucaran
d4888098e5
Add source.fish scope reference.
2014-11-29 07:39:19 +09: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
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
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
Brandon Keepers
bc66f558b9
Remove inactive heuristics
...
We can add these back when we’re ready to enable them.
2014-11-28 12:17:52 -06:00
Antoine Paris
d725e8e385
Add Oz to languages.yml
2014-11-28 17:16:32 +01:00
Brandon Keepers
034cb25099
Refactor heuristics
2014-11-28 09:43:59 -06:00
Brandon Keepers
fbc0947420
Not going back
2014-11-28 08:14:30 -06:00
Brandon Keepers
9020d7c044
Deprecate find_by_shebang
...
This class doesn’t need to know about shebangs.
2014-11-27 13:18:51 -05:00
Brandon Keepers
ffe2ccf1f6
Don't bother creating an instance
2014-11-27 13:17:28 -05:00
Brandon Keepers
cd3defda42
Simplify shebang detection
2014-11-27 12:44:55 -05:00
Brandon Keepers
fd85f7f112
consolidate shebang logic
2014-11-27 12:18:23 -05:00
Brandon Keepers
e42ccf0d82
docs
2014-11-27 11:40:48 -05:00
Brandon Keepers
bf4baff363
Move call method into existing Classifier class
2014-11-27 11:29:38 -05:00
Brandon Keepers
c1a9737313
Try strategies until one language is returned
2014-11-27 11:12:47 -05:00
Brandon Keepers
a4081498f8
Remove unneded empty blob check
2014-11-27 10:55:03 -05:00
Brandon Keepers
9efd923382
Merge remote-tracking branch 'origin/master' into strategies
...
* origin/master: (165 commits)
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
Link to Lightshow in CONTRIBUTING.md
Switch to a better F# grammar
Bump Rugged again
Checkout the master for testing
Rugged 0.22.0b3
Reordering
Bump version to 4.0.3
Add some docs for tm_scope
Change NONE to none
Checking other case for Chart.jS
Test that all languages have grammars
Fix RHTML's tm_scope
...
Conflicts:
lib/linguist/language.rb
2014-11-27 10:52:44 -05:00
Lars Brinkhoff
2d940e72c2
Add F# and GLSL samples. Add Forth and GLSL extension .fs.
...
Add heuristic to disambiguate between F#, Forth, and GLSL.
2014-11-27 06:56:26 +01:00
Brandon Keepers
689a209ed9
Merge remote-tracking branch 'origin/master' into interpreters-in-samples
...
* origin/master:
byebug requires ruby 2.0
Remove test for removed extension
Merge branch 'master' into 1233-local
Removing pry runtime dependency
Moving to fixtures
Language detection test for non-sample files
Refactoring of Language.detect
Try shebang detection if the extension is unknown
Change unknown extension of PHP sample file
2014-11-26 16:25:15 -05:00
Arfon Smith
412af86cb8
Merge pull request #1538 from github/1233-local
...
Detection based on the shebang (updated)
2014-11-26 14:47:12 -06:00
Brandon Keepers
06c0cb916b
add rake interpreter
2014-11-26 15:40:40 -05:00
Brandon Keepers
b3a49ce627
add python3 interpreter
2014-11-26 15:40:33 -05:00
Brandon Keepers
ce31e23006
Merge remote-tracking branch 'origin/master' into interpreters-in-samples
...
* origin/master: (30 commits)
Add byebug
Link to Lightshow in CONTRIBUTING.md
Switch to a better F# grammar
Bump Rugged again
Checkout the master for testing
Rugged 0.22.0b3
Reordering
Bump version to 4.0.3
Add some docs for tm_scope
Change NONE to none
Checking other case for Chart.jS
Test that all languages have grammars
Fix RHTML's tm_scope
Chart JS is vendored
Switch to a better grammar for Bro
reorder again…
put cjsx at the top
Use a SQF grammar for SQF files
move cjsx before iced
move cjsx before iced
...
Conflicts:
lib/linguist/languages.yml
2014-11-26 15:17:08 -05:00
Brandon Keepers
6a4bf3fa65
Merge pull request #1731 from github/multiple-ext-segments
...
Support for multiple file extension segments
2014-11-26 15:09:15 -05:00
Paul Chaignon
3ac69ed4e0
Merge branch 'master' into pythonmultiline
2014-11-25 19:53:40 -05:00
Arfon Smith
208a3ff480
Merge branch 'master' into 1233-local
...
Conflicts:
lib/linguist/language.rb
2014-11-25 17:04:43 -06:00
Paul Chaignon
6739a1471b
Remove samples.json following merge with master
2014-11-25 15:46:51 -05:00
Paul Chaignon
230d91ecd8
Merge branch 'master' into saltstack-states
2014-11-25 15:41:25 -05:00
Arfon Smith
8de2cd15ed
Merge branch 'master' into 1036-local
...
Conflicts:
lib/linguist/heuristics.rb
lib/linguist/languages.yml
test/test_heuristics.rb
2014-11-25 13:06:11 -06:00
Garen Torikian
4603f3b2e7
Update languages.yml to always include ace_mode
2014-11-24 11:38:51 -08:00
Brandon Keepers
7cbc4bc144
Merge pull request #1751 from roodboi/master
...
add .cjsx extension for Facebook’s JSX in coffescript
2014-11-24 11:30:04 -05:00
Garen Torikian
897c2c5ab6
Add missing ace_mode values wherever necessary
2014-11-23 21:16:21 -08:00
Arfon Smith
b556425037
Reordering
2014-11-21 13:10:45 -06:00
Arfon Smith
6131d17c02
Merge pull request #1748 from mrego/xht-extension
...
Add support for .xht extension which is used in some XHTML files
2014-11-21 12:48:58 -06:00
Adam Roben
4ce9048f8d
Bump version to 4.0.3
2014-11-21 11:56:17 -05:00
Adam Roben
04f1b1df48
Merge pull request #1756 from github/test-for-grammars
...
Test that all languages have grammars
2014-11-21 11:54:46 -05:00
Adam Roben
f9c36345c3
Add some docs for tm_scope
2014-11-21 11:53:52 -05:00
Adam Roben
ec3967d080
Change NONE to none
...
NONE is a little shouty.
2014-11-21 11:52:29 -05:00
