Merge pull request #8674 from lahodaj/jackpot-rules-resolve-target-typing

Fixing Jackpot rules when target typing fails, and the AST contains error types.

Author: lahodaj

java/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TargetTypingTest.hint

@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$mods$ long $test = $init :: $init instanceof java.lang.String
+=>
+$mods$ java.lang.String $test = $init
+;;
+
+$test = $init :: $test instanceof String && $init instanceof int
+=>
+$test = String.valueOf($init)
+;;

java/java.hints.declarative/test/unit/src/org/netbeans/modules/java/hints/declarative/TargetTypingTest.test

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+%%TestCase declaration
+package test;
+public class Test {
+    private void test() {
+        long l = "";
+    }
+}
+%%=>
+package test;
+public class Test {
+    private void test() {
+        String l = "";
+    }
+}
+%%TestCase assignment
+package test;
+public class Test {
+    private void test() {
+        String t;
+        t = 0;
+    }
+}
+%%=>
+package test;
+public class Test {
+    private void test() {
+        String t;
+        t = String.valueOf(0);
+    }
+}

java/java.source.base/src/org/netbeans/modules/java/source/matching/CopyFinder.java

@@ -101,6 +101,7 @@
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ErrorType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import org.netbeans.api.annotations.common.CheckForNull;
@@ -324,6 +325,10 @@ private boolean typeMatches(TreePath currentPath, String placeholderName) {
 
         if (designed != null && designed.getKind() != TypeKind.ERROR) {
             TypeMirror real = info.getTrees().getTypeMirror(currentPath);
+            if (real != null && real.getKind() == TypeKind.ERROR) {
+                ErrorType et = (ErrorType) real;
+                real = info.getTrees().getOriginalType(et);
+            }
             if (real != null && !IGNORE_KINDS.contains(real.getKind())) {
                 // special hack: if the designed type is DECLARED (assuming a boxed primitive) and the real type is 
                 // not DECLARED or is null (assuming a real primitive), do not treat them as assignable.

java/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/matching/CopyFinderTest.java

@@ -1332,6 +1332,51 @@ public void testInsidePatternMatchingInstanceOf() throws Exception {
                              false);
     }
 
+    public void testTargetTyping1() throws Exception {
+        sourceLevel = "17";
+        performVariablesTest("""
+                             package test;
+                             public class Test {
+                                 boolean test() {
+                                     long l = "";
+                                 }
+                             }
+                             """,
+                             "long $var = $1{java.lang.String};",
+                             new Pair[] {
+                                 new Pair<String, int[]>("$1", new int[] {72, 74}),
+                                 new Pair<String, int[]>("$var", new int[] {63, 75}),
+                             },
+                             new Pair[0],
+                             new Pair[] {
+                                 new Pair<String, String>("$var", "l"),
+                             },
+                             false,
+                             false);
+    }
+
+    public void testTargetTyping2() throws Exception {
+        sourceLevel = "17";
+        performVariablesTest("""
+                             package test;
+                             public class Test {
+                                 boolean test() {
+                                     long l;
+                                     l = "";
+                                 }
+                             }
+                             """,
+                             "$0{long} = $1{java.lang.String};",
+                             new Pair[] {
+                                 new Pair<String, int[]>("$1", new int[] {83, 85}),
+                                 new Pair<String, int[]>("$0", new int[] {79, 80}),
+                             },
+                             new Pair[0],
+                             new Pair[0],
+                             false,
+                             false);
+    }
+
     public void testKeepImplicitThis() throws Exception {
         prepareTest("package test; public class Test { void t() { toString(); } }", -1);