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
9f103abfb5
Merge pull request #1750 from github/interpreters-in-samples
...
Fix for interpreters from samples
2014-11-26 16:51:08 -05: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
Brandon Keepers
d91a451fc7
Merge pull request #1776 from github/fix-failures
...
Fix failure from #1731
2014-11-26 16:24:25 -05:00
Brandon Keepers
1ae4672230
byebug requires ruby 2.0
2014-11-26 16:12:43 -05:00
Brandon Keepers
3edf5fd770
Remove test for removed extension
...
This existed when the test was written, but was removed in https://github.com/github/linguist/pull/1734 and the test got lost in a merge somewhere.
2014-11-26 15:59:16 -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
5b41ab4774
Fix typo in test
2014-11-26 15:40:51 -05: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
0651568bfb
Remove old wrong_shebang.rb sample
...
This was added in a69118bd17
2014-11-26 15:34:03 -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
7ccd8caf71
Merge pull request #1774 from github/byebug
...
Add byebug
2014-11-26 15:16:06 -05:00
Brandon Keepers
598a7028ea
Add byebug
2014-11-26 15:12:55 -05:00
Brandon Keepers
4ed1efe9ce
Merge pull request #1741 from github/test-helper
...
Add test helper to make test env consistent
2014-11-26 15:10:24 -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
Brandon Keepers
5b2b3a2b53
Merge remote-tracking branch 'origin/master' into test-helper
...
* origin/master: (31 commits)
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
change component name
...
Conflicts:
test/test_language.rb
2014-11-26 15:07:27 -05:00
Adam Roben
596cd9368f
Merge pull request #1773 from github/introduce-lightshow
...
Link to Lightshow in CONTRIBUTING.md
2014-11-26 11:44:05 -05:00
Adam Roben
f8d50faedb
Link to Lightshow in CONTRIBUTING.md
...
This is a tool for testing grammars with GitHub's syntax highlighter.
2014-11-26 11:21:05 -05:00
Adam Roben
ccc9c197ae
Merge pull request #1771 from github/better-fsharp-grammar
...
Switch to a better F# grammar
2014-11-26 09:35:55 -05:00
Adam Roben
ed2dcc35e8
Switch to a better F# grammar
...
This fixes many bugs with F# highlighting, and the grammar is being
actively developed and maintained by the fsharp organization on GitHub.
2014-11-26 08:56:02 -05:00
Arfon Smith
208a3ff480
Merge branch 'master' into 1233-local
...
Conflicts:
lib/linguist/language.rb
2014-11-25 17:04:43 -06: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
Vicent Marti
d239e71826
Merge pull request #1765 from github/vmg/rugged-22b3
...
Rugged 0.22.0b3
2014-11-24 13:37:09 +01:00
Vicent Marti
ecaa2a41c9
Bump Rugged again
2014-11-24 13:32:37 +01:00
Vicent Marti
fc71805489
Checkout the master for testing
2014-11-24 13:25:49 +01:00
Vicent Marti
74d94781cb
Rugged 0.22.0b3
2014-11-24 13:05:42 +01: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
875b3157bf
Merge pull request #1757 from github/cut-release-v4.0.3
...
Bump version to 4.0.3
2014-11-21 12:06:38 -05: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
Arfon Smith
05a88b5b7e
Merge pull request #1754 from github/chart-js
...
Chart js
2014-11-21 09:30:20 -06:00
Arfon Smith
b6b2cf04a7
Checking other case for Chart.jS
2014-11-21 09:29:28 -06:00
Adam Roben
49247e9ec2
Test that all languages have grammars
...
This will make CI fail if someone adds a new language but neglects to
add a new grammar for it. This should make it easier for people to
review PRs, as CI will help them to make sure a new grammar gets added.
However, we currently support some languages that have no grammars, and
we may support more in the future. So you can explicitly mark the
language as having no grammar by setting `tm_scope: NONE` in
languages.yml.
2014-11-21 09:48:52 -05:00
Adam Roben
6629b75aa6
Merge pull request #1755 from github/fix-rhtml-scope
...
Fix RHTML's tm_scope
2014-11-21 09:31:07 -05:00
Adam Roben
e702b453ec
Fix RHTML's tm_scope
...
I missed this back in 9595e2ba7e
2014-11-21 09:29:06 -05:00
Arfon Smith
38190d92fc
Chart JS is vendored
2014-11-21 08:24:33 -06:00
Adam Roben
109ca5735b
Merge pull request #1753 from github/better-bro-grammar
...
Switch to a better grammar for Bro
2014-11-21 09:23:28 -05:00
Adam Roben
4dde499f51
Switch to a better grammar for Bro
...
This grammar seems to be replacing the other ones out there and is
maintained by the Bro organization.
2014-11-21 09:17:19 -05:00
Vicent Marti
5fd18a215e
Merge pull request #1752 from github/sqf-grammar
...
Use a SQF grammar for SQF files
2014-11-21 11:31:50 +01:00
Dimitri Kennedy
b283548c0f
reorder again…
2014-11-20 18:36:08 -05:00
Dimitri Kennedy
2352ce77c9
put cjsx at the top
2014-11-20 17:38:38 -05:00
Adam Roben
2054afc741
Use a SQF grammar for SQF files
...
This produces better highlighting than using the C++ grammar.
The grammar is licensed under the Apache 2.0 license.
2014-11-20 17:22:55 -05:00
Dimitri Kennedy
9d3b9964b5
move cjsx before iced
2014-11-20 17:08:21 -05:00
Dimitri Kennedy
79c1d21a0f
move cjsx before iced
2014-11-20 17:08:10 -05:00
Dimitri Kennedy
1d69228872
change component name
2014-11-20 16:49:48 -05:00
Dimitri Kennedy
f5953a09da
add example cjsx file
2014-11-20 16:48:22 -05:00
