Arfon Smith
208a3ff480
Merge branch 'master' into 1233-local
...
Conflicts:
lib/linguist/language.rb
2014-11-25 17:04:43 -06: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
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
Dimitri Kennedy
a17f6c8ae1
add .cjsx extension for Facebook’s JSX in coffescript
2014-11-20 14:56:09 -05:00
Brandon Keepers
9823af0cb4
Fix for shebang with relative bin
...
`#!/usr/bin/env bin/linguist` is a valid shebang
2014-11-20 12:50:35 -05:00
Brandon Keepers
45384bd498
More missing interpreters
2014-11-20 12:29:16 -05:00
Brandon Keepers
56bfde998b
Only strip minor version off of interpreters
...
This used to turn `python2.4` into `python`, which causes trouble with
`perl6`, which is a different language definition.
2014-11-20 12:28:30 -05:00
Brandon Keepers
870feb8592
Add missing interpreters
2014-11-20 11:27:54 -05:00
Brandon Keepers
2670e2b035
Test that interpreters are defined in languages.yml
2014-11-20 11:21:52 -05:00
Brandon Keepers
eccea65641
Fix for interpreters not getting add to samples.json
2014-11-20 11:14:05 -05:00
Brandon Keepers
231ad86176
sync cached gems
2014-11-20 08:51:56 -05:00
Florian Kaiser
9658b02502
add Chart.js as vendor
...
http://www.chartjs.org
2014-11-20 10:02:45 +01:00
Manuel Rego Casasnovas
30c6b6e5a1
Add XHTML example file
2014-11-20 00:30:21 +01:00
Manuel Rego Casasnovas
b44e58dd7f
Add support for .xht extension which is used in some XHTML files
2014-11-19 23:08:51 +01:00
Vicent Marti
bce31e8b51
Merge pull request #1747 from github/cut-release-v4.0.2
...
Cut release v4.0.2
2014-11-19 18:12:07 +01:00
Adam Roben
011c654c2a
Bump version to v4.0.2
2014-11-19 12:08:49 -05:00
Adam Roben
2457b52658
Update grammars.yml
2014-11-19 12:08:43 -05:00
Arfon Smith
a3adaa6a7b
Merge pull request #1745 from github/f-case
...
Fix failures on case-insensitive filesystem
2014-11-19 07:04:58 -06:00
Brandon Keepers
a6f168d1ac
Rename file to avoid case-insensitive collision
2014-11-18 23:22:10 -05:00
Arfon Smith
f792029a20
Merge pull request #1743 from github/codemirror
...
Codemirror should be considered vendored
2014-11-18 20:02:12 -06:00
Arfon Smith
2a5dd5b224
Adding test for codemirror
2014-11-18 19:34:41 -06:00
Martín Gaitán
fb7dcfd62d
Exclude codemirror
...
An example of a wrong detection due to codemirror is my project. https://github.com/mgaitan/waliki
2014-11-18 20:17:15 -03:00
Brandon Keepers
245a1a92cf
Merge remote-tracking branch 'origin/master' into test-helper
...
* origin/master:
Add Gemfile.lock sample
Remove deprecated method
#all_extensions already includes primary extension
typo
remove unused assertion
Symlink ant.xml to build.xml
Avoid shadowing variable name
Update comment
Make missing sample failure message similar
Remove blank extensions property
Fix sample tests
Add Forth extensions .f and .for; add heuristics for Forth and FORTRAN.
Add FORTRAN and Forth samples.
Extensions aren't actually required
Fix errors from pedantic test
Make pedantic test actually pedantic
Removing extensions when they should be filenames
Adding sample pom.xml files
Link to contributing docs
require samples if filename matches multiple languages
Conflicts:
test/test_pedantic.rb
2014-11-18 16:48:26 -05:00
