Update including explicit steps to resolve conflicts.

Optimization of generated?

This gives us a consistent test framework across all Ruby versions which
should help avoid errors that are only found when CI runs the tests on
different Rubies. (And this fixes an immediate bug where there's no
`skip` method in the version of test-unit we're currently using only on
Ruby 2.2.)

This should speed up our builds by providing lower latency, better
caching, and more resources on the build machine. See
http://docs.travis-ci.com/user/workers/container-based-infrastructure/.

We tell apt-get to download it to vendor/apt and then install it into a
vendor/icu directory.

We should be able to just specify --with-icu-dir, but apparently Ruby
2.0 (but not 1.9 or 2.1 or 2.2) has a bug that requires us to use
--with-icu-include/--with-icu-lib instead. Otherwise it can't find the
ICU libraries.

This should allow us to skip installing gems in most builds, shaving off
~40 seconds.

Update Elm support by adding its own syntax highlighting

Code sample was taken from https://github.com/gravitystorm
/openstreetmap-carto/blob/ae990905790a26ae8af107441ce9e85b60ea1266
/amenity-points.mss

Added CartoCSS to languages.yml

Update languages.yml for Hack syntax-highlighting

…n segments.

…nsions

Fix for extensions with multiple segments

add support for Mono .dll.config XML files

www.mono-project.com/docs/advanced/pinvoke/dllmap/#example

Added support for Mono .dll.config XML files

Switch to Minitest::Test instead of Test::Unit::TestCase

Add .xml.dist as a XML file extension

Add Bluespec SystemVerilog grammar

Better C++ regex

…test

We were using a fork to get the fix for
textmate/c.tmbundle#24 before it was merged
upstream. Now it's been merged so we can go back to the upstream
repository.

Switch back to textmate/c.tmbundle

This was performed via `git submodule update --remote`.

* vendor/grammars/Agda.tmbundle 784f435...68a218c (1):
  > Merge pull request github-linguist#1 from aroben/patch-1

* vendor/grammars/IDL-Syntax 9473b7f...3baeaea (1):
  > Merge pull request github-linguist#3 from aroben/patch-1

* vendor/grammars/NimLime 7a2fb4e...9cef4b6 (4):
  > Updated command names
  > Updated generated documentation
  > renamed more from nimrod to nim
  > Renamed several files

* vendor/grammars/SCSS.tmbundle d6188e5...4147502 (1):
  > Merge pull request github-linguist#181 from redgluten/master

* vendor/grammars/Sublime-VimL 6ab7e19...366fdc6 (1):
  > Merge pull request github-linguist#2 from yous/fix-single-quoted-string

* vendor/grammars/factor 2dc5590...2453a78 (38):
  > json.writer: make sure we make hex values two digits zero padded.
  > json.writer: support escaping unicode > 0x10000.  Thanks @jonenst!
  > mason.git: fix status check.
  > compiler.cfg.*: new unit test vocabs
  > compiler.cfg.*: more docs
  > compiler.cfg.*: refactoring away the compute-global-sets word
  > compiler.cfg.*: docs and more tests
  > compiler.cfg.stacks.local: refactoring making stack-changes and height-changes take and return stuff instead of using variables and the make building
  > compiler.cfg.parallel-copy: docs
  > compiler.cfg.stacks.height: these words are unused
  > compiler.cfg.*: more compiler docs
  > compiler.cfg.stacks.finalize: initial docs
  > io.launcher: fix stack effects.
  > io.launcher: fix docs for with-process-reader and with-process-writer.
  > io.launcher: add versions of with-process that preserve process and status.
  > mason.git: fix use.
  > mason.git: fix for rename.
  > io.launcher: cleanup public interface, make some things private or internal.
  > gopher: set 1 minute timeout by default.
  > brainfuck: cleanup tests.
  > json.writer: don't escape spaces, thats weird.
  > unix: some using cleanups.
  > python: rename startup/shutdown hooks.
  > math.extras: adding the Möbius function.
  > alien.c-types: move definitions of stdint.h from unix.types.
  > gopher: use contents now that it works.
  > io.ports: Make buffered-port not have a length because of Linux virtual files and TCP sockets. Related to issues github-linguist#1256 and github-linguist#1259.
  > tools.deploy.backend: add word for deleting cached staging images.
  > command-line: save the executable in a variable so that people don't use (command-line) directly if possible.
  > bootstrap: fix this use of (command-line).
  > tools.deploy.shaker: set the rest of the args to preserve current behavior.
  > vm: store full command-line including executable first argument.
  > gopher: fix bug where empty lines weren't printed properly in menus.
  > gopher: simplify.
  > gopher: change gopher-text to use split1.
  > io.encodings.detect: simplify prolog-tag.
  > gopher: add way to get result without converting to objects.
  > tools.disassembler: allow disassemble of compose and curry.

* vendor/grammars/fsharpbinding af755c8...d097476 (24):
  > Merge pull request github-linguist#909 from cbowdon/issue877-vim-73-support
  > Merge pull request github-linguist#913 from 7sharp9/Move_GetColourizations_toBg
  > Merge pull request github-linguist#912 from 7sharp9/TryFind_opt
  > Merge pull request github-linguist#911 from 7sharp9/FoldingParser
  > Merge pull request github-linguist#908 from 7sharp9/TooltipOverhaul_AutoParamFix
  > Merge pull request github-linguist#907 from 7sharp9/Movegetdefinestomodule
  > Merge pull request github-linguist#906 from 7sharp9/tooltipfixforclosures
  > Merge pull request github-linguist#905 from 7sharp9/ResolverProvider_singletimeout
  > Merge pull request github-linguist#904 from fsharp/revert-903-ResolverProvider_singletimeout
  > Merge pull request github-linguist#903 from 7sharp9/ResolverProvider_singletimeout
  > Merge pull request github-linguist#902 from 7sharp9/ParameterCompletion_gatherTimeout
  > Merge pull request github-linguist#901 from 7sharp9/Changed_invalidate_project
  > Merge pull request github-linguist#900 from 7sharp9/Syntaxmode_removeextraoperation
  > Merge pull request github-linguist#899 from 7sharp9/tooltips_ensureTimout
  > Merge pull request github-linguist#898 from 7sharp9/pathextension_useAddRange
  > Merge pull request github-linguist#897 from 7sharp9/resolverprovider_ensuretimout
  > Merge pull request github-linguist#896 from 7sharp9/completion_ensuretimout
  > Merge pull request github-linguist#895 from cbowdon/894-Vim-fix-for-no-completions-stacktrace
  > Merge pull request github-linguist#890 from wangzq/gotodecl
  > Merge pull request github-linguist#893 from 7sharp9/fixfortooltipvaltypes
  > Merge pull request github-linguist#892 from 7sharp9/fixforprojecttypechecking
  > Added correct indentation
  > Merge pull request github-linguist#891 from 7sharp9/ImproveImplementInterface
  > Merge pull request github-linguist#888 from VincentDondain/master

* vendor/grammars/haxe-sublime-bundle 58cad47...e2613bb (4):
  > fixed goto definition / find type
  > clean
  > adaptations for toplevel completion
  > first test

* vendor/grammars/language-gfm c6df027...7b62290 (7):
  > Prepare 0.59.0 release
  > scoped-properties -> settings
  > Prepare 0.58.0 release
  > Merge pull request github-linguist#67 from davidcelis/master
  > Prepare 0.57.0 release
  > Prepare 0.56.0 release
  > Merge pull request github-linguist#64 from atom/mb-new-cpp-scope-name

* vendor/grammars/language-javascript 15dc5d1...6690feb (5):
  > Prepare 0.52.0 release
  > Merge pull request github-linguist#82 from Hurtak/feature/snippets-for
  > Merge pull request github-linguist#80 from Hurtak/feature/snippets-querySelector
  > Merge pull request github-linguist#79 from Hurtak/feature/snippets-switch-indentation-fix
  > Merge pull request github-linguist#81 from Hurtak/feature/snippets-iife

* vendor/grammars/language-python 476a353...f518e49 (5):
  > Prepare 0.28.0 release
  > Use trailing scope name
  > Merge pull request github-linguist#48 from msabramo/patch-1
  > Prepare 0.27.0 release
  > Add pattern for nonlocal keyword

* vendor/grammars/language-sass 064a8b5...33efa33 (2):
  > Prepare 0.29.0 release
  > Allow + and - in selector argument

* vendor/grammars/language-shellscript e2d62af...cbec163 (2):
  > Prepare 0.11.0 release
  > Merge pull request github-linguist#4 from hd-deman/patch-1

* vendor/grammars/latex.tmbundle 682c4b7...52b2251 (42):
  > Replaced `python` with `python2.7` in shebangs
  > Make the preferences compatible with Python 3
  > Handle manual spacing in “Reformat” (Table)
  > Fix: Reformatting of table containing empty cells
  > Use more descriptive variable names in `format`
  > Add documentation to `reformat`
  > Fix doctest in `refresh_viewer`
  > Add tests for `reformat`
  > Ignore “exit discard” status in `cramtests`
  > Remove print statements from `reformat` function
  > Fix: Close log window option ignored
  > Automatically scroll to bottom in “HTML Output”
  > Handle “\” signs in the notification window
  > Fix missing logname in default error message
  > Extend list of auxiliary files
  > Remove unused code from `latex_watch`
  > Display default message in notification window
  > Sort error messages by line number
  > Do not store duplicate error messages anymore
  > Close notification window on cleanup
  > Improve reopening of closed notification windows
  > Improve rewrap code in `texparser`
  > Improve readability of verbose log output
  > Only parse log file if there were changes
  > Remove unnecessary function call in “LaTeX Watch”
  > Properly close file in `guess_tex_engine`
  > Handle log messages containing double quotes
  > Left justify severity in notification window
  > Handle manual closing of notification window
  > Add additional information to notification window
  > Remove unused code from `texparser`
  > Close notification when typesetting succeeds
  > Add support for notifications to “LaTeX Watch”
  > Update bundle preference values instantly
  > Make “Reformat” (Table) compatible with Ruby 2
  > Ignore escaped ampersand `\&` in “Format” (Table)
  > Remove warnings reported by `RuboCop`
  > Format code for “Reformat” (Table)
  > Move code for “Reformat” into separate script
  > Save “Reformat” command with TextMate 2
  > Remove unused import
  > Use explicit import in “Itemize Lines In Selection”

* vendor/grammars/mercury-tmlanguage b5a4fd6...eaef0b0 (8):
  > Add require_* and some, all keywords
  > Highlight %f format specifiers, `` as op
  > Correct implementation of '''', """" and 0'<char>
  > README.md: Mention GitHub grammar compatability
  > README.md: add resources and demonstration
  > reformatted whitespace; added foreign mods; missing keywords
  > Highlight variables, determ decls, more pragmas
  > no highlighting of variables, function names, type names, inst's, etc.

* vendor/grammars/sublime-mask 2f59519...632ff3c (4):
  > v0.8.7
  > v0.8.7
  > + expression in component nodes
  < v0.8.6

* vendor/grammars/swift.tmbundle 81a0164...3c7eac5 (9):
  > Use constant scope for booleans
  > Use storage scope instead of keyword
  > Correct typo in include
  > Revamp string literal matching
  > Improve punctuation scopes
  > Allow for functions without a body
  > Add simple folding markers for swift
  > Improved matching of capture specifiers
  > Add Support for UInt, Int[8|16|32|64] & Float80

Update all grammar submodules

--with-icu-dir is broken on Ruby 2.0 due to
https://bugs.ruby-lang.org/issues/8074. Specifying
--with-icu-include/--with-icu-lib is broken on Ruby 2.1 and newer due to
rubygems/bundler#3338. So now we use
--with-icu-dir everywhere but Ruby 2.0.

Opt in to container-based Travis CI builds

This provides better highlighting in many cases than the previous
grammar. See github-linguist#1852.

Switch Sass grammar to nathos/sass-textmate-bundle

Downloading is only a small part of what this script does. The main
thing it does is convert grammars to JSON.

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.

This will let us see why it's failing.

Some of our submodules end in ".tmLanguage", which we used to think
meant it was a file rather than a directory.

I should have done this in 2c2c474.

No need to say "Done" at the end. We're obviously done; the script is
exiting.

Test that grammars.yml lists the right scopes for each submodule

The master branch contains a license while the release branch does not.
Other than that they're nearly identical.

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.

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 github-linguist#3 from aroben/patch-1

* vendor/grammars/fsharpbinding d097476...99d2e9a (2):
  > Merge pull request github-linguist#917 from 7sharp9/CleanMacProjects
  > Merge pull request github-linguist#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 github-linguist#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/

…nses

Test that all grammar submodules have an appropriate license

… 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().

Allow British-English spelled LICENCE-files

Fixes script/convert-grammars: require thread-gem and solve problem with visibility of variable p

Add grammar for CartoCSS

Bump to v4.2.6

This will help ensure we keep pulling in fixes from the grammar repos.

reorganized Sublime Text extensions, added some

Add support for cql and ddl files

….yml for .nit source files highlighting

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>

Signed-off-by: Lucas Bajolet <r4pass@hotmail.com>

Add a language grammar for Nit

Update Hy support by adding a reference to an Atom grammar.

Add missing ^ in regexp for Frege heuristic

Conflicts:
	.gitmodules

Http