--- a/langtools/test/jdk/jshell/ReplToolTesting.java	Wed Jul 05 21:49:00 2017 +0200
+++ b/langtools/test/jdk/jshell/ReplToolTesting.java	Wed Jun 08 00:32:31 2016 -0700
@@ -470,8 +470,8 @@
         List<Suggestion> completions =
                 js.commandCompletionSuggestions(code, cursor, new int[1]); //XXX: ignoring anchor for now
         return completions.stream()
-                          .filter(s -> isSmart == s.isSmart)
-                          .map(s -> s.continuation)
+                          .filter(s -> isSmart == s.matchesType())
+                          .map(s -> s.continuation())
                           .distinct()
                           .collect(Collectors.toList());
     }