diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2019-02-23 15:33:07 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2019-02-23 15:33:07 +0100 |
| commit | 5070b636a0befc9cd84fd9c22b33d5c6fa10110a (patch) | |
| tree | 64e35cde3309a198e157ae70257a3ad259403d60 | |
| parent | cd7f90f4f7360c231b24e06193ea3138de5a7b84 (diff) | |
| parent | ca961f89f6224a923d9f5a5357d63c1e0160a4b3 (diff) | |
| download | coderay-5070b636a0befc9cd84fd9c22b33d5c6fa10110a.tar.gz | |
Merge branch 'master' of github.com:rubychan/coderay
| -rw-r--r-- | lib/coderay/encoders/html/output.rb | 2 | ||||
| -rw-r--r-- | lib/coderay/scanners/java.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb index de6f6ea..ee87fea 100644 --- a/lib/coderay/encoders/html/output.rb +++ b/lib/coderay/encoders/html/output.rb @@ -76,8 +76,6 @@ module Encoders apply_title! title end self - when nil - return self else raise "Unknown value %p for :wrap" % element end diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb index 982a796..a490ec6 100644 --- a/lib/coderay/scanners/java.rb +++ b/lib/coderay/scanners/java.rb @@ -20,7 +20,7 @@ module Scanners MAGIC_VARIABLES = %w[ this super ] # :nodoc: TYPES = %w[ boolean byte char class double enum float int interface long - short void + short void var ] << '[]' # :nodoc: because int[] should be highlighted as a type DIRECTIVES = %w[ abstract extends final implements native private protected public |