src/jdk.compiler/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java

*** 386,399 ****
              Symbol sym = t.tsym;
              if (sym.name.length() == 0 ||
                      !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
                  return super.className(t, longform, locale);
              }
!             else if (longform)
!                 return nameSimplifier.simplify(sym).toString();
              else
!                 return sym.name.toString();
          }
  
          @Override
          public String visitTypeVar(TypeVar t, Locale locale) {
              if (unique(t) ||
--- 386,402 ----
              Symbol sym = t.tsym;
              if (sym.name.length() == 0 ||
                      !getConfiguration().isEnabled(RichFormatterFeature.SIMPLE_NAMES)) {
                  return super.className(t, longform, locale);
              }
!             String s;
!             if (longform)
!                 s =  nameSimplifier.simplify(sym).toString();
              else
!                 s = sym.name.toString();
! 
!             return sym.isProjectedNullable() ? s + '?' : s;
          }
  
          @Override
          public String visitTypeVar(TypeVar t, Locale locale) {
              if (unique(t) ||