From 31b57b30d83046b428b2016dd86bf862932e9fc1 Mon Sep 17 00:00:00 2001
From: kasiaMarek <kasia@marek.net>
Date: Mon, 10 Feb 2025 15:01:52 +0100
Subject: [PATCH] fix: don't add `()` to semanticdb symbol for java variables

[Cherry-picked 38154ba9bb857a46b0ab3546dfa67be1881cc2d1]
---
 .../semanticdb/SemanticSymbolBuilder.scala    |  2 +-
 .../expect/JavaStaticVar.expect.scala         |  7 +++++
 tests/semanticdb/expect/JavaStaticVar.scala   |  7 +++++
 .../javacp/com/javacp/JavaStaticVar.java      |  5 ++++
 tests/semanticdb/metac.expect                 | 27 +++++++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 tests/semanticdb/expect/JavaStaticVar.expect.scala
 create mode 100644 tests/semanticdb/expect/JavaStaticVar.scala
 create mode 100644 tests/semanticdb/javacp/com/javacp/JavaStaticVar.java

diff --git a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
index 81f5d37f443f..077ee0e40b86 100644
--- a/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
+++ b/compiler/src/dotty/tools/dotc/semanticdb/SemanticSymbolBuilder.scala
@@ -111,7 +111,7 @@ class SemanticSymbolBuilder:
         addName(b, sym.name)
         if sym.is(Package) then b.append('/')
         else if sym.isType || sym.isAllOf(JavaModule) then b.append('#')
-        else if sym.isOneOf(Method | Mutable)
+        else if sym.is(Method) || (sym.is(Mutable) && !sym.is(JavaDefined))
         && (!sym.is(StableRealizable) || sym.isConstructor) then
           b.append('('); addOverloadIdx(sym); b.append(").")
         else b.append('.')
diff --git a/tests/semanticdb/expect/JavaStaticVar.expect.scala b/tests/semanticdb/expect/JavaStaticVar.expect.scala
new file mode 100644
index 000000000000..171596bc9519
--- /dev/null
+++ b/tests/semanticdb/expect/JavaStaticVar.expect.scala
@@ -0,0 +1,7 @@
+package example
+
+import com.javacp.JavaStaticVar/*->com::javacp::JavaStaticVar#*/
+
+class ScalaFoo/*<-example::ScalaFoo#*/ {
+  val javaStaticVarFoo/*<-example::ScalaFoo#javaStaticVarFoo.*/ = JavaStaticVar/*->com::javacp::JavaStaticVar#*/.foo/*->com::javacp::JavaStaticVar#foo.*/
+}
diff --git a/tests/semanticdb/expect/JavaStaticVar.scala b/tests/semanticdb/expect/JavaStaticVar.scala
new file mode 100644
index 000000000000..7a7efeaa670a
--- /dev/null
+++ b/tests/semanticdb/expect/JavaStaticVar.scala
@@ -0,0 +1,7 @@
+package example
+
+import com.javacp.JavaStaticVar
+
+class ScalaFoo {
+  val javaStaticVarFoo = JavaStaticVar.foo
+}
diff --git a/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java b/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java
new file mode 100644
index 000000000000..1124c8768421
--- /dev/null
+++ b/tests/semanticdb/javacp/com/javacp/JavaStaticVar.java
@@ -0,0 +1,5 @@
+package com.javacp;
+
+public class JavaStaticVar {
+  public static int foo = 0;
+}
diff --git a/tests/semanticdb/metac.expect b/tests/semanticdb/metac.expect
index a89da0fb8aec..4e3dee9d79a6 100644
--- a/tests/semanticdb/metac.expect
+++ b/tests/semanticdb/metac.expect
@@ -2249,6 +2249,33 @@ Synthetics:
 [8:2..8:10):(x1, x1) => *(Tuple2(Int, Int))
 [8:10..8:10): => *(Int, Int)
 
+expect/JavaStaticVar.scala
+--------------------------
+
+Summary:
+Schema => SemanticDB v4
+Uri => JavaStaticVar.scala
+Text => empty
+Language => Scala
+Symbols => 3 entries
+Occurrences => 9 entries
+
+Symbols:
+example/ScalaFoo# => class ScalaFoo extends Object { self: ScalaFoo => +2 decls }
+example/ScalaFoo#`<init>`(). => primary ctor <init> (): ScalaFoo
+example/ScalaFoo#javaStaticVarFoo. => val method javaStaticVarFoo Int
+
+Occurrences:
+[0:8..0:15): example <- example/
+[2:7..2:10): com -> com/
+[2:11..2:17): javacp -> com/javacp/
+[2:18..2:31): JavaStaticVar -> com/javacp/JavaStaticVar#
+[4:6..4:14): ScalaFoo <- example/ScalaFoo#
+[5:2..5:2): <- example/ScalaFoo#`<init>`().
+[5:6..5:22): javaStaticVarFoo <- example/ScalaFoo#javaStaticVarFoo.
+[5:25..5:38): JavaStaticVar -> com/javacp/JavaStaticVar#
+[5:39..5:42): foo -> com/javacp/JavaStaticVar#foo.
+
 expect/Local.scala
 ------------------