Merge branch 'master' of github.com:rubychan/coderay

korny · korny · commit 5070b636a0be · 2019-02-23T15:33:07.000+01:00
diff --git a/lib/coderay/encoders/html/output.rb b/lib/coderay/encoders/html/output.rb
@@ -76,8 +76,6 @@ def wrap! element, *args
             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
@@ -20,7 +20,7 @@ class Java < Scanner
     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
