src/jdk.jshell/share/classes/jdk/jshell/TaskFactory.java

*** 31,41 ****
  import com.sun.tools.javac.api.JavacTaskImpl;
  import com.sun.tools.javac.api.JavacTool;
  import com.sun.tools.javac.util.Context;
  import java.util.ArrayList;
  import java.util.Arrays;
- import java.util.Iterator;
  import java.util.List;
  import javax.tools.Diagnostic;
  import javax.tools.DiagnosticCollector;
  import javax.tools.JavaCompiler;
  import javax.tools.JavaFileManager;
--- 31,40 ----
*** 393,403 ****
          DiagList getDiagnostics() {
              if (diags == null) {
                  LinkedHashMap<String, Diag> diagMap = new LinkedHashMap<>();
                  for (Diagnostic<? extends JavaFileObject> in : diagnostics.getDiagnostics()) {
                      Diag d = diag(in);
!                     String uniqueKey = d.getCode() + ":" + d.getPosition() + ":" + d.getMessage(null);
                      diagMap.put(uniqueKey, d);
                  }
                  diags = new DiagList(diagMap.values());
              }
              return diags;
--- 392,402 ----
          DiagList getDiagnostics() {
              if (diags == null) {
                  LinkedHashMap<String, Diag> diagMap = new LinkedHashMap<>();
                  for (Diagnostic<? extends JavaFileObject> in : diagnostics.getDiagnostics()) {
                      Diag d = diag(in);
!                     String uniqueKey = d.getCode() + ":" + d.getPosition() + ":" + d.getMessage(PARSED_LOCALE);
                      diagMap.put(uniqueKey, d);
                  }
                  diags = new DiagList(diagMap.values());
              }
              return diags;
*** 408,418 ****
          }
  
          String shortErrorMessage() {
              StringBuilder sb = new StringBuilder();
              for (Diag diag : getDiagnostics()) {
!                 for (String line : diag.getMessage(null).split("\\r?\\n")) {
                      if (!line.trim().startsWith("location:")) {
                          sb.append(line);
                      }
                  }
              }
--- 407,417 ----
          }
  
          String shortErrorMessage() {
              StringBuilder sb = new StringBuilder();
              for (Diag diag : getDiagnostics()) {
!                 for (String line : diag.getMessage(PARSED_LOCALE).split("\\r?\\n")) {
                      if (!line.trim().startsWith("location:")) {
                          sb.append(line);
                      }
                  }
              }
*** 420,430 ****
          }
  
          void debugPrintDiagnostics(String src) {
              for (Diag diag : getDiagnostics()) {
                  state.debug(DBG_GEN, "ERROR --\n");
!                 for (String line : diag.getMessage(null).split("\\r?\\n")) {
                      if (!line.trim().startsWith("location:")) {
                          state.debug(DBG_GEN, "%s\n", line);
                      }
                  }
                  int start = (int) diag.getStartPosition();
--- 419,429 ----
          }
  
          void debugPrintDiagnostics(String src) {
              for (Diag diag : getDiagnostics()) {
                  state.debug(DBG_GEN, "ERROR --\n");
!                 for (String line : diag.getMessage(PARSED_LOCALE).split("\\r?\\n")) {
                      if (!line.trim().startsWith("location:")) {
                          state.debug(DBG_GEN, "%s\n", line);
                      }
                  }
                  int start = (int) diag.getStartPosition();