summaryrefslogtreecommitdiff
path: root/lib/coderay/scanners
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into upstreamKornelius Kalnbach2013-06-239-42/+600
|\
| * some more code cleanups before mergelua-scannerKornelius Kalnbach2013-06-231-11/+11
| * cleanup Lua scanner, fix end_group(:map) issueKornelius Kalnbach2013-06-231-257/+267
| * Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-222-14/+13
| |\
| | * use different key/value heuristic in JSON scannerKornelius Kalnbach2013-06-191-12/+11
| | * add python binary stringKornelius Kalnbach2013-06-121-2/+2
| * | Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-1212-36/+320
| |\ \ | | |/
| | * tweak Taskpaper scanner, cleanup doc_string kindKornelius Kalnbach2013-06-121-8/+10
| | * Merge remote-tracking branch 'shimomura1004/taskpaper' into taskpaper-scannerKornelius Kalnbach2013-06-121-0/+34
| | |\
| | | * TaskPaper scanner for CodeRaySHIMOMURA Sho2012-10-221-0/+34
| | * | tweak Sass scanner: comments, includes, functionsKornelius Kalnbach2013-06-111-10/+30
| | * | tweak CSS tag/id token kind patch from nopromptKornelius Kalnbach2013-06-112-5/+5
| | * | Merge remote-tracking branch 'noprompt/master' into css-token-kindsKornelius Kalnbach2013-06-111-5/+5
| | |\ \
| | | * | use :tag instead of :type for identifiersJoel Holdbrooks2012-07-241-3/+3
| | | * | use "id" instead of "constant" for css idsJoel Holdbrooks2012-07-031-2/+2
| | * | | reset string_delimiter when detecting open stringKornelius Kalnbach2013-06-101-0/+1
| | * | | Merge branch 'master' into javascript-keep-stateKornelius Kalnbach2013-06-1011-27/+231
| | |\ \ \
| | | * | | accept all idents as Ruby 1.9 hash keys (#126)Kornelius Kalnbach2013-06-101-1/+1
| | | * | | don't nest :string recursively in :sass_inlineKornelius Kalnbach2013-06-091-1/+8
| | | * | | fix Sass highlighting in diffKornelius Kalnbach2013-06-091-3/+0
| | | * | | Merge branch 'master' into sass-scannerKornelius Kalnbach2013-06-091-1/+1
| | | |\ \ \
| | | | * | | don't allow \x00 in diff filenamesKornelius Kalnbach2013-06-091-1/+1
| | | | * | | avoid empty tokens in Diff output, fix split_into_partsKornelius Kalnbach2013-06-091-1/+1
| | | | * | | two fixes for CSS scannerKornelius Kalnbach2013-06-091-2/+2
| | | * | | | fix order of SASS_FUNCTIONsKornelius Kalnbach2013-04-111-1/+1
| | | * | | | Merge branch 'master' into sass-scannerKornelius Kalnbach2013-03-117-8/+8
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | added Sass scanner (work in progress)Kornelius Kalnbach2013-03-112-17/+217
| | * | | | | support multi-line comments in JavaScript diffKornelius Kalnbach2013-03-101-4/+27
| | |/ / / /
| * | | | | Merge branch 'master' into lua-scannerKornelius Kalnbach2013-03-105-63/+93
| |\ \ \ \ \ | | |/ / / /
| * | | | | :map token kindNathan Youngman2012-10-271-7/+7
| * | | | | Merge branch 'master' into lua-scannerKornelius Kalnbach2012-10-071-1/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | escape = in regex (my editor gets confused:-)Nathan Youngman2012-09-111-10/+10
| * | | | | use case+when instead of send and methodsKornelius Kalnbach2012-06-191-33/+31
| * | | | | Merge remote-tracking branch 'Quintus/luascanner-onecommit' into lua-scannerKornelius Kalnbach2012-06-191-0/+267
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Lua scanner for CodeRay. Meta-commit.Quintus2012-04-221-0/+267
* | | | | | Support CDATA blocks in HTML/XMLGavin Kistner2013-06-061-1/+11
| |_|_|_|/ |/| | | |
* | | | | minor tweaks to generator and scanner edge casesKornelius Kalnbach2013-03-117-8/+8
| |_|_|/ |/| | |
* | | | cleanupKornelius Kalnbach2013-03-101-1/+1
* | | | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2013-03-104-34/+42
|\ \ \ \
| * | | | fix PHP scanner for Ruby 1.8Kornelius Kalnbach2013-02-171-1/+1
| * | | | fix #40 (PHP unicode)Kornelius Kalnbach2013-02-171-3/+2
| * | | | fix #83 (XML DTD)Kornelius Kalnbach2013-02-171-1/+1
| * | | | match Ruby 1.9 hash syntax even without space after colonKornelius Kalnbach2013-02-171-2/+2
| * | | | Merge branch 'fix-ruby-unicode' into fix-ruby-new-hash-syntaxKornelius Kalnbach2013-02-171-3/+3
| |\ \ \ \
| | * | | | improve support for Unicode non-alphanumeric characters in Ruby namesKornelius Kalnbach2013-02-171-3/+3
| | | |_|/ | | |/| |
| * | | | cleanup: value_expected should be booleanKornelius Kalnbach2013-02-171-2/+2
| * | | | Merge branch 'master' into fix-ruby-new-hash-syntaxKornelius Kalnbach2013-02-171-15/+15
| |\ \ \ \
| | * | | | whitespaceKornelius Kalnbach2013-02-171-15/+15
| | |/ / /
| * | | | fix #106: re-introduce highlightinging of { key: value } in Ruby 1.9 hashesKornelius Kalnbach2013-02-171-11/+20
| |/ / /
* | | | Merge branch 'master' into multiline-inline-diffKornelius Kalnbach2012-10-111-1/+4
|\ \ \ \ | |/ / /
View Lorry Controller Status