improve class def & deal with default arguments

Author: poechsel

semanticdb/input/src/main/scala/example/New.scala

@@ -1,5 +1,9 @@
 package example
 
+class Bonjour() {
+}
+
 class TestNew extends C {
   val b = new B
+  val c = new Bonjour
 }

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -91,6 +91,8 @@ class SemanticdbConsumer extends TastyConsumer {
           case _                  => false
         }
 
+        def isDefaultGetter: Boolean = symbol.name.contains(tpnme.DEFAULT_GETTER.toString)
+
         def isParameter: Boolean = symbol.flags.is(Flags.Param)
 
         def isObject: Boolean = symbol.flags.is(Flags.Object)
@@ -222,6 +224,7 @@ class SemanticdbConsumer extends TastyConsumer {
         def isUseless(implicit ctx: Context): Boolean = {
           symbol == NoSymbol ||
           //symbol.isInitChild ||
+          symbol.isDefaultGetter ||
           symbol.isWildCard ||
           symbol.isAnonymousClass ||
           symbol.isAnonymousFunction ||
@@ -303,7 +306,7 @@ class SemanticdbConsumer extends TastyConsumer {
                 case _ =>
                   d.Term(symbol.name)
               }
-            } else if (symbol.isMethod) {
+            } else if (symbol.isMethod || symbol.isUsefulField) {
               d.Method(symbol.name,
                        disimbiguate(previous_symbol + symbol.name, symbol))
             } else if (symbol.isTypeParameter) {
@@ -358,23 +361,28 @@ class SemanticdbConsumer extends TastyConsumer {
           case _ =>
             symbolToSymbolString(symbol)
         }
-
         if (symbol_path == "" || symbol.isUselessOccurrence) return
-        println(symbol_path, range, symbol.owner.flags)
 
         val key = (symbol_path, range)
-        if (!is_global || !(symbolPathsMap.contains(key))) {
-          if (is_global) {
-            symbolPathsMap += key
-          }
-          occurrences =
-            occurrences :+
-              s.SymbolOccurrence(
-                Some(range),
-                symbol_path,
-                type_symbol
-              )
-        }
+        // TODO: refactor the following
+
+        // this is to avoid duplicates symbols
+        // For example, when we define a class as: `class foo(x: Int)`,
+        // dotty will generate a ValDef for the x, but the x will also
+        // be present in the constructor, thus making a double definition
+        if (symbolPathsMap.contains(key)) return
+        if (is_global) {
+          symbolPathsMap += key
+          println("duplicates", key)
+        }
+        println(symbol_path, range, symbol.owner.flags, is_global)
+        occurrences =
+          occurrences :+
+            s.SymbolOccurrence(
+              Some(range),
+              symbol_path,
+              type_symbol
+            )
       }
 
       val reserverdFunctions: List[String] = "apply" :: "unapply" :: Nil
@@ -522,12 +530,6 @@ class SemanticdbConsumer extends TastyConsumer {
       override def traversePattern(tree: Pattern)(implicit ctx: Context): Unit = {
         tree match {
           case Pattern.Bind(name, _) => {
-            println("[bind]",
-                    tree.pos.startColumn,
-                    tree.pos.endColumn,
-                    tree.symbol,
-                    tree.symbol.pos.startColumn,
-                    tree.symbol.pos.endColumn)
             addOccurence(
               tree.symbol,
               s.SymbolOccurrence.Role.REFERENCE,
@@ -681,7 +683,7 @@ class SemanticdbConsumer extends TastyConsumer {
                              s.SymbolOccurrence.Role.REFERENCE,
                              posToRange(tree.pos).get)
 
-          case Term.Select(qualifier, _, _) => {
+          case Term.Select(qualifier, _) => {
             val range = {
               val r = rangeSelect(tree.symbol.name, tree.pos)
               if (tree.symbol.name == "<init>")

semanticdb/test/dotty/semanticdb/Tests.scala

@@ -191,7 +191,7 @@ class Tests {
   //@Test def testLocals(): Unit = checkFile("example/Locals.scala")
   //@Test def testMacroAnnotations(): Unit = checkFile("example/MacroAnnotations.scala")
   //WIP(assert) @Test def testMethods(): Unit = checkFile("example/Methods.scala")
-  //@Test def testMultiArguments(): Unit = checkFile("example/MultiArguments.scala")
+  @Test def testMultiArguments(): Unit = checkFile("example/MultiArguments.scala")
   //@Test def testMethodUsages(): Unit = checkFile("example/MethodUsages.scala")
   //def testObjects(): Unit = checkFile("example/Objects.scala")
   //@Test def testOverrides(): Unit = checkFile("example/Overrides.scala")
@@ -205,7 +205,7 @@ class Tests {
   //@Test def testDependantModule(): Unit = checkFile("example/DependantModule.scala")
   //@Test def testNew(): Unit = checkFile("example/New.scala")
   //@Test def testIgnoredSymbol(): Unit = checkFile("example/IgnoredSymbol.scala")
-  @Test def testCase(): Unit = checkFile("example/Case.scala")
+  //@Test def testCase(): Unit = checkFile("example/Case.scala")
 
 
   def testOutput(className: String, expected: String): Unit = {