Decompile chars, bytes and shorts correctly

java/java-tests/testData/psi/cls/mirror/Booleans.txt

@@ -1,18 +0,0 @@
-
-  // IntelliJ API Decompiler stub source generated from a class file
-  // Implementation of methods is not available
-
-package pkg;
-
-class Booleans {
-    public static final boolean TRUE = true;
-    public static final boolean FALSE = false;
-
-    Booleans() { /* compiled code */ }
-
-    @pkg.BooleanAnno(true)
-    public static boolean TRUE() { /* compiled code */ }
-
-    @pkg.BooleanAnno(false)
-    public static boolean FALSE() { /* compiled code */ }
-}

java/java-tests/testData/psi/cls/mirror/Primitives.txt

@@ -0,0 +1,30 @@
+
+  // IntelliJ API Decompiler stub source generated from a class file
+  // Implementation of methods is not available
+
+package pkg;
+
+class Primitives {
+    public static final boolean TRUE = true;
+    public static final boolean FALSE = false;
+    public static final byte BYTE = 1;
+    public static final char CHAR = 'c';
+    public static final short SHORT = 42;
+    public static final int INT = 42;
+    public static final long LONG = 42L;
+
+    Primitives() { /* compiled code */ }
+
+    @pkg.BooleanAnno(true)
+    public static boolean TRUE() { /* compiled code */ }
+
+    @pkg.BooleanAnno(false)
+    public static boolean FALSE() { /* compiled code */ }
+
+    @pkg.ByteAnno(1)
+    @pkg.CharAnno('c')
+    @pkg.ShortAnno(42)
+    @pkg.IntAnno(42)
+    @pkg.LongAnno(42L)
+    public static void m() { /* compiled code */ }
+}

java/java-tests/testData/psi/cls/mirror/src/pkg/Booleans.java

@@ -1,13 +0,0 @@
-package pkg;
-
-class Booleans  {
-  public static final boolean TRUE = true;
-  public static final boolean FALSE = false;
-
-  @BooleanAnno(true) public static boolean TRUE() { return TRUE; }
-  @BooleanAnno(false) public static boolean FALSE() { return FALSE; }
-}
-
-@interface BooleanAnno {
-  boolean value();
-}

java/java-tests/testData/psi/cls/mirror/src/pkg/Primitives.java

@@ -0,0 +1,42 @@
+package pkg;
+
+class Primitives  {
+  public static final boolean TRUE = true;
+  public static final boolean FALSE = false;
+
+  @BooleanAnno(true) public static boolean TRUE() { return TRUE; }
+  @BooleanAnno(false) public static boolean FALSE() { return FALSE; }
+
+  public static final byte BYTE = 1;
+  public static final char CHAR = 'c';
+  public static final short SHORT = 42;
+  public static final int INT = 42;
+  public static final long LONG = 42L;
+
+  @ByteAnno(1) @CharAnno('c') @ShortAnno(42) @IntAnno(42) @LongAnno(42L)
+  public static void m() { }
+}
+
+@interface BooleanAnno {
+  boolean value();
+}
+
+@interface ByteAnno {
+  byte value();
+}
+
+@interface CharAnno {
+  char value();
+}
+
+@interface ShortAnno {
+  short value();
+}
+
+@interface IntAnno {
+  int value();
+}
+
+@interface LongAnno {
+  long value();
+}