79fd12eb75
Merge branch 'master' into path-for-fileblob
2015-01-09 11:56:11 -06:00
05a98be1e5
Merge pull request #1977 from github/auto
...
Auto
2015-01-09 11:50:01 -06:00
24eb1d3fe2
Updating file regex to support unlicense.txt
2015-01-09 11:43:34 -06:00
75d1bcdc69
Merge pull request #1912 from 0a-/master
...
vendor.yml: improved & added more regex for auto-generated stylesheets
2015-01-09 08:09:57 -08:00
7549eff9c1
Merge branch 'master' into auto
...
Conflicts:
.gitmodules
2015-01-08 17:00:45 -06:00
6e2b4f7514
Updating ref to include license
2015-01-08 16:59:43 -06:00
846cff5721
Remove pry
2015-01-08 15:10:05 -06:00
efd25ec4d2
Start using path with LazyBlob
2015-01-08 15:08:28 -06:00
5c94b50386
Merge pull request #1975 from github/http
...
Http
2015-01-08 14:19:38 -06:00
c0fbc9ef8c
Updating Sublime-HTTP reference
2015-01-08 14:11:04 -06:00
1f429fb488
Whitespace
2015-01-08 14:06:00 -06:00
ec28ea299f
Use path for Generated?
2015-01-08 14:03:35 -06:00
08558aa118
Merge branch 'master' into http
...
Conflicts:
.gitmodules
2015-01-08 13:13:07 -06:00
7e319b797f
Merge pull request #1970 from larsbrinkhoff/fr
...
Add missing ^ in regexp for Frege heuristic
2015-01-08 13:43:14 -05:00
3957a11f25
Add to sample to show that a false positive goes away.
2015-01-08 19:35:02 +01:00
743922d45a
Merge pull request #1974 from github/hy-grammar
...
Update Hy support by adding a reference to an Atom grammar.
2015-01-08 11:13:59 -05:00
5f70776cf3
Update Hy support by adding a reference to an Atom grammar.
2015-01-08 11:09:28 -05:00
289f91997c
Merge pull request #1973 from github/nit-grammar
...
Add a language grammar for Nit
2015-01-08 11:01:05 -05:00
163ea9ecdd
Added a few samples for the Nit language
...
Signed-off-by: Lucas Bajolet <r4pass@hotmail.com >
2015-01-08 10:52:45 -05:00
9be941acc8
Added support for the nit language in grammars.yml, updated languages.yml for .nit source files highlighting
...
Signed-off-by: Lucas Bajolet <r4pass@hotmail.com >
2015-01-08 10:51:51 -05:00
e95314f072
Recognize WTFPL-licensed grammars
2015-01-08 10:49:54 -05:00
6fef6b578a
Fix script/convert-grammars --add
2015-01-08 10:49:01 -05:00
dd59814563
Merge pull request #1905 from joaquincasares/cql_support
...
Add support for cql and ddl files
2015-01-08 10:45:15 -05:00
b704b20695
Merge pull request #1888 from MattDMo/master
...
reorganized Sublime Text extensions, added some
2015-01-08 10:42:56 -05:00
71885b8a79
Add missing ^ in Frege heuristic regexp.
2015-01-08 13:02:04 +01:00
470419d732
Merge pull request #1962 from github/bump-4.2.6
...
Bump to v4.2.6
2015-01-07 10:57:29 -05:00
5b05653881
Bump to v4.2.6
2015-01-07 10:30:51 -05:00
899dc07883
Merge pull request #1938 from floscher/carto-grammar
...
Add grammar for CartoCSS
2015-01-07 09:31:34 -05:00
83dfd408e9
Update carto-grammar to current version (2ec5a89)
2015-01-07 15:27:40 +01:00
417171cfe1
Don't pass JSON-files through csonc
2015-01-07 15:27:40 +01:00
e8e82a1ca3
Add grammar for CartoCSS
2015-01-07 15:27:40 +01:00
6843aa7cc8
Enable file extension .json for grammar files
2015-01-07 15:27:40 +01:00
952acc983d
Merge pull request #1958 from floscher/fix-convert-script
...
Fixes script/convert-grammars: require thread-gem and solve problem with visibility of variable p
2015-01-07 08:58:34 -05:00
650f267be7
Merge pull request #1959 from floscher/licence
...
Allow British-English spelled LICENCE-files
2015-01-07 08:56:20 -05:00
3ace4c57f7
Allow British-English LICENCE-files
2015-01-06 22:51:08 +01:00
ab1b603c78
Require thread-gem and solve problem with visibility of variable p in convert-grammars
...
* The `thread`-gem is required for the script, because otherwise Ruby throws an error that `Queue` in line 259 is an uninitialized constant
* The variable `p` was previously in the same method with the status message saying `OK ‹path› ‹converted scopes›`. But `p` is now defined in load_grammars() and thus not visible when showing the OK-message in install_grammars(). This was solved by adding a path-parameter to install_grammars().
2015-01-06 22:06:55 +01:00
8430f694e5
Merge pull request #1954 from github/test-grammar-licenses
...
Test that all grammar submodules have an appropriate license
2015-01-06 13:59:52 -05:00
71f0cafc78
Update all submodules
...
This was done via `git submodule update --remote`.
Since Scalate.tmbundle now has a license we can remove it from the
whitelist.
* vendor/grammars/NimLime 9cef4b6...a7067c6 (1):
> Added 'nim' to tmpl sublimetext highlighting
* vendor/grammars/Scalate.tmbundle 4f85314...0307535 (1):
> Merge pull request #3 from aroben/patch-1
* vendor/grammars/fsharpbinding d097476...99d2e9a (2):
> Merge pull request #917 from 7sharp9/CleanMacProjects
> Merge pull request #916 from 7sharp9/ToolTipsLessBlocky
* vendor/grammars/language-clojure d649d9f...bae6eee (2):
> Prepare 0.10.0 release
> Rename scoped-properties/ to settings/
* vendor/grammars/language-coffee-script c6e8d33...d86c896 (2):
> Prepare 0.39.0 release
> Rename scoped-properties/ to settings/
* vendor/grammars/language-gfm 7b62290...6af44a0 (2):
> Remove unneeded newline
> Merge pull request #65 from braver/line-break
* vendor/grammars/language-javascript 6690feb...5157519 (2):
> Prepare 0.53.0 release
> Rename scoped-properties/ to settings/
* vendor/grammars/language-python f518e49...46072e3 (2):
> Prepare 0.29.0 release
> Rename scoped-properties/ to settings/
* vendor/grammars/language-shellscript cbec163...9839719 (2):
> Prepare 0.12.0 release
> Rename scoped-properties/ to settings/
* vendor/grammars/language-yaml eddd079...ce8b441 (2):
> Prepare 0.22.0 release
> Rename scoped-properties/ to settings/
2015-01-06 13:46:04 -05:00
4614287a55
Test that all grammar submodules have an appropriate license
...
We require all grammars to have a license that permits redistribution. A
few existing grammars have been grandfathered in without a license (and
we're working to remedy that), but no new grammars should be added
without a license.
2015-01-06 13:44:11 -05:00
f477f811df
Extract TestGrammars#submodule_paths method
2015-01-06 13:43:50 -05:00
95bb5a1ae4
Switch to the master branch of tenbits/sublime-mask
...
The master branch contains a license while the release branch does not.
Other than that they're nearly identical.
2015-01-06 13:43:37 -05:00
70699037ae
Merge pull request #1909 from github/scopes-test
...
Test that grammars.yml lists the right scopes for each submodule
2015-01-06 13:41:44 -05:00
7edddec920
Make convert-grammars a little quieter
...
No need to say "Done" at the end. We're obviously done; the script is
exiting.
2015-01-06 13:39:18 -05:00
8f3779c94c
Update grammars.yml to match submodules
...
I should have done this in 2c2c4740a8
2015-01-06 13:36:51 -05:00
917bc48348
Use File.directory? to test for local directories
...
Some of our submodules end in ".tmLanguage", which we used to think
meant it was a file rather than a directory.
2015-01-06 13:31:26 -05:00
581dc36c47
Ruby 1.9 compatibility for convert-grammars
2015-01-06 13:28:26 -05:00
a4286ba950
Show stderr output when running convert-grammars
...
This will let us see why it's failing.
2015-01-06 13:28:26 -05:00
5fa85f268f
Ruby 1.9 compatibility
2015-01-06 13:28:26 -05:00
ada6f6882a
Test that grammars.yml lists the right scopes for each submodule
...
convert-grammars now supports a few flags that we can use to make it
dump out the YAML just for the local grammar submodules. We can then
compare this to the YAML that's actually in grammars.yml to check that
they're the same. If they aren't, grammars.yml needs to be updated.
This will help catch mistakes like using the wrong scope name.
2015-01-06 13:28:25 -05:00
78a0030d46
download-grammars -> convert-grammars
...
Downloading is only a small part of what this script does. The main
thing it does is convert grammars to JSON.
2015-01-06 13:28:25 -05:00
Arfon Smith
Arfon Smith
Brandon Keepers
Adam Roben
Lars Brinkhoff
Bob Tolbert
Lucas Bajolet
Florian M. Schäfer