8350595: jshell <TAB> completion on arrays does not work for clone()

Reviewed-by: asotona

Author: lahodaj

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

@@ -54,10 +54,12 @@
 import com.sun.tools.javac.code.Flags;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Symbol.CompletionFailure;
+import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.code.Symbol.VarSymbol;
 import com.sun.tools.javac.code.Symtab;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.code.Type.ClassType;
+import com.sun.tools.javac.code.Type.MethodType;
 import com.sun.tools.javac.parser.Scanner;
 import com.sun.tools.javac.parser.ScannerFactory;
 import com.sun.tools.javac.parser.Tokens.Token;
@@ -1073,7 +1075,7 @@ private List<? extends Element> membersOf(AnalyzeTask at, TypeMirror site, boole
                 if (jlObject != null) {
                     result.addAll(membersOf(at, jlObject));
                 }
-                result.add(createArrayLengthSymbol(at, site));
+                result.addAll(createArraySymbols(at, site));
                 if (shouldGenerateDotClassItem)
                     result.add(createDotClassSymbol(at, site));
                 return result;
@@ -1161,11 +1163,21 @@ private PackageElement createPackageElement(AnalyzeTask at, String packageName)
         return existing;
     }
 
-    private Element createArrayLengthSymbol(AnalyzeTask at, TypeMirror site) {
-        Name length = Names.instance(at.getContext()).length;
-        Type intType = Symtab.instance(at.getContext()).intType;
-
-        return new VarSymbol(Flags.PUBLIC | Flags.FINAL, length, intType, ((Type) site).tsym);
+    private List<Element> createArraySymbols(AnalyzeTask at, TypeMirror site) {
+        Symtab syms = Symtab.instance(at.getContext());
+        Names names = Names.instance(at.getContext());
+        Name length = names.length;
+        Name clone = names.clone;
+        Type lengthType = syms.intType;
+        Type cloneType = new MethodType(com.sun.tools.javac.util.List.<Type>nil(),
+                                        (Type) site,
+                                        com.sun.tools.javac.util.List.<Type>nil(),
+                                        syms.methodClass);
+
+        return List.of(
+                new VarSymbol(Flags.PUBLIC | Flags.FINAL, length, lengthType, ((Type) site).tsym),
+                new MethodSymbol(Flags.PUBLIC | Flags.FINAL, clone, cloneType, ((Type) site).tsym)
+        );
     }
 
     private Element createDotClassSymbol(AnalyzeTask at, TypeMirror site) {

test/langtools/jdk/jshell/CompletionSuggestionTest.java

@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658 8278039 8286206 8296789 8314662 8326333
+ * @bug 8131025 8141092 8153761 8145263 8131019 8175886 8176184 8176241 8176110 8177466 8197439 8221759 8234896 8240658 8278039 8286206 8296789 8314662 8326333 8326333
  * @summary Test Completion and Documentation
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
@@ -812,13 +812,16 @@ public void testDuplicateImport() {
     }
 
     //JDK-8326333: verify completion returns sensible output for arrays:
+    //JDK-8326333: jshell <TAB> completion on arrays is incomplete
     public void testArray() {
         assertEval("String[] strs = null;");
         assertCompletion("strs.to|", "toString()");
         assertCompletion("strs.le|", "length");
+        assertCompletion("strs.cl|", "clone()");
         assertEval("int[] ints = null;");
         assertCompletion("ints.no|", "notify()", "notifyAll()");
         assertCompletion("ints.le|", "length");
+        assertCompletion("ints.cl|", "clone()");
         assertCompletion("String[].|", "class");
     }
 }