summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into upstreamKornelius Kalnbach2013-06-2398-3133/+1536
|\
| * Merge pull request #141 from rubychan/lua-scannerKornelius Kalnbach2013-06-226-2/+284
| |\ | | | | | | Lua scanner, tweaked (finally!)
| | * some more code cleanups before mergelua-scannerKornelius Kalnbach2013-06-231-11/+11
| | |
| | * changelogKornelius Kalnbach2013-06-231-0/+2
| | |
| | * Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-231-10/+9
| | |\ | | |/ | |/|
| * | fix Tokens documentationKornelius Kalnbach2013-06-231-10/+9
| | |
| | * cleanup Lua scanner, fix end_group(:map) issueKornelius Kalnbach2013-06-231-257/+267
| | | | | | | | | | | | - use local instead of instance variables
| | * move .map styles before .stringKornelius Kalnbach2013-06-231-3/+3
| | |
| | * more helpful error messages from DebugLintKornelius Kalnbach2013-06-231-2/+2
| | |
| | * add lua file typeKornelius Kalnbach2013-06-231-0/+1
| | |
| | * whitespaceKornelius Kalnbach2013-06-222-4/+4
| | |
| | * Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-2280-2922/+723
| | |\ | | |/ | |/| | | | | | | | | | Conflicts: lib/coderay/styles/alpha.rb lib/coderay/token_kinds.rb
| * | use JSON to highlight .template files (AWS CF)remove-dumpKornelius Kalnbach2013-06-221-0/+1
| | |
| * | tags should be boldKornelius Kalnbach2013-06-221-1/+1
| | |
| * | remove Ruby 2.0 workaroundKornelius Kalnbach2013-06-221-1/+1
| | |
| * | use different key/value heuristic in JSON scannerKornelius Kalnbach2013-06-191-12/+11
| | |
| * | changelogKornelius Kalnbach2013-06-161-0/+1
| | |
| * | Merge pull request #138 from rubychan/remove-dumpKornelius Kalnbach2013-06-155-136/+14
| |\ \ | | | | | | | | Remove dump/undump functionality from Tokens
| | * \ Merge branch 'master' into remove-dumpKornelius Kalnbach2013-06-166-29/+20
| | |\ \ | | |/ / | |/| | | | | | | | | | Conflicts: lib/coderay/tokens.rb
| * | | speedup HTML encoder numbering for Ruby 1.8.7+Kornelius Kalnbach2013-06-161-1/+1
| | | |
| * | | cleanup Tokens documentationKornelius Kalnbach2013-06-161-23/+14
| | | |
| * | | cleanup TODOs, FIXMEsKornelius Kalnbach2013-06-165-6/+5
| | | |
| | * | remove dump/undump functionalityKornelius Kalnbach2013-06-135-138/+15
| |/ /
| * | cleanup rake tasksKornelius Kalnbach2013-06-134-118/+0
| | |
| * | cleanup rake_helpers, samplesKornelius Kalnbach2013-06-1357-2388/+373
| | |
| * | refactor check functionality to DebugLint encoderKornelius Kalnbach2013-06-133-15/+56
| | |
| * | speedup/tweak debug encoderKornelius Kalnbach2013-06-131-11/+14
| | |
| * | fix examples testKornelius Kalnbach2013-06-131-1/+1
| | |
| * | tweak Terminal encoder, cleanup token kindsKornelius Kalnbach2013-06-133-163/+181
| | |
| * | add taskpaper file extensionKornelius Kalnbach2013-06-131-48/+49
| | |
| * | add python binary stringKornelius Kalnbach2013-06-122-3/+5
| | |
| | * Merge branch 'master' into lua-scannerKornelius Kalnbach2013-06-1233-309/+618
| | |\ | | |/ | |/| | | | | | | Conflicts: lib/coderay/token_kinds.rb
| * | cleanup changelogKornelius Kalnbach2013-06-121-6/+6
| | |
| * | changelogKornelius Kalnbach2013-06-121-0/+3
| | |
| * | tweak Taskpaper scanner, cleanup doc_string kindKornelius Kalnbach2013-06-124-17/+14
| | |
| * | Merge remote-tracking branch 'shimomura1004/taskpaper' into taskpaper-scannerKornelius Kalnbach2013-06-123-0/+40
| |\ \
| | * | TaskPaper scanner for CodeRaySHIMOMURA Sho2012-10-223-0/+40
| | | |
| * | | tweak Sass scanner: comments, includes, functionsKornelius Kalnbach2013-06-111-10/+30
| | | |
| * | | tweak CSS tag/id token kind patch from nopromptKornelius Kalnbach2013-06-114-5/+8
| | | |
| * | | Merge remote-tracking branch 'noprompt/master' into css-token-kindsKornelius Kalnbach2013-06-112-5/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: etc/todo/scanners/css.rb
| | * | | use :tag instead of :type for identifiersJoel Holdbrooks2012-07-241-3/+3
| | | | |
| | * | | use "id" instead of "constant" for css idsJoel Holdbrooks2012-07-032-3/+3
| | | | |
| | * | | add "id" token kindJoel Holdbrooks2012-07-031-0/+1
| | | | |
| * | | | changelogKornelius Kalnbach2013-06-111-0/+1
| | | | |
| * | | | set line numbers to word-break: normal to fix #102Kornelius Kalnbach2013-06-112-0/+4
| | | | |
| * | | | Merge pull request #117 from rubychan/javascript-keep-stateKornelius Kalnbach2013-06-102-4/+29
| |\ \ \ \ | | | | | | | | | | | | JavaScript scanner: Highlight multi-line comments in diff correctly
| | * | | | reset string_delimiter when detecting open stringKornelius Kalnbach2013-06-101-0/+1
| | | | | |
| | * | | | Merge branch 'master' into javascript-keep-stateKornelius Kalnbach2013-06-1032-297/+512
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | accept all idents as Ruby 1.9 hash keys (#126)Kornelius Kalnbach2013-06-101-1/+1
| | | | | |
| * | | | | trying to reduce "complexity" of #raise_inspect (#135)Kornelius Kalnbach2013-06-101-10/+20
| | | | | |