Merge branch 'main-v2' into metalsv2/supress-warnings

Author: zielinsky

metals/src/main/scala/scala/meta/internal/builds/MavenBuildTool.scala

@@ -116,6 +116,17 @@ case class MavenBuildTool(
       phase,
       "-DskipTests",
       "-Denforcer.skip=true",
+      "-Dcheckstyle.skip=true",
+      "-Dspotbugs.skip=true",
+      "-Drat.skip=true",
+      "-Dpmd.skip=true",
+      "-Dmaven.javadoc.skip=true",
+      "-Dspring-javaformat.skip=true",
+      "-Dspotless.check.skip=true",
+      "-Djacoco.skip=true",
+      "-Dsonar.skip=true",
+      "-Ddependency-check.skip=true",
+      "-Dgpg.skip=true",
     )
   }
 

mtags-java/src/main/scala/scala/meta/internal/jpc/JavaDefinitionProvider.scala

@@ -318,7 +318,7 @@ class JavaDefinitionProvider(
       }
 
     if (startPos >= 0 && endPos >= 0) {
-      val elementName = targetElement.getSimpleName().toString()
+      val elementName = compiler.sourceName(targetElement)
       val (start, end) = compiler.findIndentifierStartAndEnd(
         params.text(),
         elementName,

mtags-java/src/main/scala/scala/meta/internal/jpc/JavaMetalsCompiler.scala

@@ -8,6 +8,7 @@ import java.nio.file.Path
 import java.util.concurrent.ScheduledExecutorService
 import java.{util => ju}
 import javax.lang.model.element.Element
+import javax.lang.model.element.ElementKind
 import javax.lang.model.element.ExecutableElement
 import javax.lang.model.element.TypeElement
 import javax.tools.JavaCompiler
@@ -244,6 +245,17 @@ class JavaMetalsCompiler(
    * @param originalStart
    * @param originalEnd
    */
+  /**
+   * The name of the element as it appears in source. For constructors
+   * `getSimpleName` returns the internal `<init>`, so we fall back to the
+   * enclosing type's name, which is what is actually written in the source.
+   */
+  def sourceName(element: Element): String =
+    if (element.getKind() == ElementKind.CONSTRUCTOR)
+      element.getEnclosingElement().getSimpleName().toString()
+    else
+      element.getSimpleName().toString()
+
   def findIndentifierStartAndEnd(
       text: String,
       elementName: String,

mtags-java/src/main/scala/scala/meta/internal/jpc/JavaRenameProvider.scala

@@ -65,7 +65,7 @@ class JavaRenameProvider(
             sourcePositions.getEndPosition(compile.cu, treePath.getLeaf())
           val (realStart, realEnd) = compiler.findIndentifierStartAndEnd(
             params.text(),
-            element.getSimpleName().toString(),
+            compiler.sourceName(element),
             start.toInt,
             end.toInt,
             treePath.getLeaf(),

mtags-java/src/main/scala/scala/meta/internal/jpc/ReferenceScanner.scala

@@ -37,7 +37,7 @@ abstract class ReferenceScanner[T](
         val treeEnd = sourcePositions.getEndPosition(root, tree)
         if (treeStart >= 0 && treeEnd >= 0) {
           // Extract just the name position from the full tree range
-          val elementName = element.getSimpleName().toString()
+          val elementName = compiler.sourceName(element)
 
           // Find the name as a complete identifier, not as a substring
           val (start, end) = compiler.findIndentifierStartAndEnd(

tests/javapc/src/test/scala/highlight/JavaDocumentHighlightSuite.scala

@@ -232,6 +232,30 @@ class JavaDocumentHighlightSuite extends BaseJavaPCSuite with RangeReplace {
        |""".stripMargin,
   )
 
+  check(
+    "constructor-name-def",
+    """|class Foo {
+       |    public <<F@@oo>>() {}
+       |    public static Foo create() {
+       |        return new <<Foo>>();
+       |    }
+       |}
+       |""".stripMargin,
+  )
+
+  // Clicking on `new Foo()` resolves to the type `Foo`, so all type
+  // occurrences are highlighted (not just the constructor).
+  check(
+    "constructor-name-usage",
+    """|class <<Foo>> {
+       |    public Foo() {}
+       |    public static <<Foo>> create() {
+       |        return new <<F@@oo>>();
+       |    }
+       |}
+       |""".stripMargin,
+  )
+
   check(
     "this-reference",
     """|class Foo {

tests/unit/src/test/scala/tests/MavenBuildToolSuite.scala

@@ -61,7 +61,11 @@ class MavenBuildToolSuite extends BaseSuite {
       mavenBuildTool(workspace).mbtCompileCommand(workspace, target),
       List(
         "mvn", "-q", "-P", "dev,ci", "-pl", ":app", "--also-make", "install",
-        "-DskipTests", "-Denforcer.skip=true",
+        "-DskipTests", "-Denforcer.skip=true", "-Dcheckstyle.skip=true",
+        "-Dspotbugs.skip=true", "-Drat.skip=true", "-Dpmd.skip=true",
+        "-Dmaven.javadoc.skip=true", "-Dspring-javaformat.skip=true",
+        "-Dspotless.check.skip=true", "-Djacoco.skip=true", "-Dsonar.skip=true",
+        "-Ddependency-check.skip=true", "-Dgpg.skip=true",
       ),
     )
   }