Add comment to distinguish between scala(s semanticdb imported methods and our methods + fix PR comments

Author: poechsel

compiler/src/dotty/tools/dotc/tastyreflect/TypeOrBoundsOpsImpl.scala

@@ -23,7 +23,6 @@ trait TypeOrBoundsOpsImpl extends scala.tasty.reflect.TypeOrBoundsOps with CoreI
       if (tpe.classSymbol.exists) Some(tpe.classSymbol.asClass) else None
 
     def typeSymbol(implicit ctx: Context): Symbol = tpe.typeSymbol
-    //def pos(implicit ctx: Context): Position = tpe.pos
   }
 
   def ConstantTypeDeco(x: ConstantType): Type.ConstantTypeAPI = new Type.ConstantTypeAPI {

library/src/scala/tasty/reflect/TypeOrBoundsOps.scala

@@ -55,7 +55,6 @@ trait TypeOrBoundsOps extends Core {
     def widen(implicit ctx: Context): Type
     def classSymbol(implicit ctx: Context): Option[ClassSymbol]
     def typeSymbol(implicit ctx: Context): Symbol
-    //def pos(implicit ctx: Context): Position
   }
 
   val IsType: IsTypeModule

semanticdb/src/dotty/semanticdb/Main.scala

@@ -45,14 +45,14 @@ object Main {
       var cleanedArgs = args
       cleanedArgs += "out" -> cleanedArgs.getOrElse("out", "out.semanticdb")
       if (cleanedArgs.contains("help") || !cleanedArgs.contains("input")) {
-        return None
+        None
       } else {
         cleanedArgs += "classpath" -> cleanedArgs.getOrElse("classpath", Files.createTempDirectory("semanticdb").toString)
         val tempFolder = new File(cleanedArgs("classpath"));
         if (!tempFolder.exists()){
             tempFolder.mkdir();
         }
-        return Some(cleanedArgs)
+        Some(cleanedArgs)
       }
     }
     case None => None
@@ -69,8 +69,7 @@ object Main {
      cliArgs("input") ::
     Nil
 
-    val reporter = driver.process(compilerParams.toArray)
-    return reporter
+    driver.process(compilerParams.toArray)
   }
 
 

semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala

@@ -191,6 +191,45 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
 
         def isTrait: Boolean = symbol.flags.is(Flags.Trait)
 
+        def isConstructor(implicit ctx: Context): Boolean =
+          symbol.name == "<init>"
+
+        def isVarAccessor(implicit ctx: Context): Boolean = {
+          symbol.isVal && symbol.flags.is(Flags.Mutable)
+        }
+
+        def isValMethod(implicit ctx: Context): Boolean = {
+          symbol.isMethod && {
+            (symbol.flags.is(Flags.FieldAccessor)  && symbol.flags.is(Flags.Stable) ) ||
+            (symbol.isUsefulField && !symbol.flags.is(Flags.Mutable) )
+          }
+        }
+
+        def isAnonymousClassConstructor(implicit ctx: Context): Boolean = {
+          symbol.isConstructor && symbol.owner.isAnonymousClass
+        }
+
+        def isAnonymousSelfParameter(implicit ctx: Context): Boolean = {
+          symbol.isSelfParameter && {
+            symbol.name == tpnme.this_.toString || // hardlinked in ClassSignature.self
+            symbol.name.startsWith("x$") // wildcards can't be referenced: class A { _: B => }
+          }
+        }
+
+        def isWildCard(implicit ctx: Context): Boolean = {
+          symbol.name.startsWith(tpnme.WILDCARD.toString) &&
+          symbol.name != tpnme.THIS.toString
+        }
+
+        def isAnonymousInit(implicit ctx: Context): Boolean = {
+          return symbol.exists && symbol.owner.exists &&
+          (symbol.owner.isAnonymousFunction || symbol.owner.isAnonymousClass) &&
+          symbol.name == "<init>"
+        }
+
+        /* The following methods are directly extracted from the scala
+        implementation of SemanticDB (scalameta/semanticdb/scalac/library/src/main/scala/scala/meta/internal/semanticdb/scalac/SymbolOps.scala)
+        */
         def isValueParameter: Boolean = symbol.isParameter && !symbol.isType && !symbol.flags.is(Flags.ParamAccessor)
 
         def isJavaClass: Boolean = (symbol.isClass || symbol.isObject) && symbol.flags.is(Flags.JavaDefined)
@@ -214,9 +253,6 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           !definitelyGlobal && (definitelyLocal || ownerLocal)
         }
 
-        def isConstructor(implicit ctx: Context): Boolean =
-          symbol.name == "<init>"
-
         def isSyntheticConstructor(implicit ctx: Context): Boolean = {
           val isObjectConstructor = symbol.isConstructor && symbol.owner.exists && symbol.owner.flags.is(Flags.Object)
           val isModuleConstructor = symbol.isConstructor && symbol.owner.isClass
@@ -247,17 +283,6 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           }
         }
 
-        def isVarAccessor(implicit ctx: Context): Boolean = {
-          symbol.isVal && symbol.flags.is(Flags.Mutable)
-        }
-
-        def isValMethod(implicit ctx: Context): Boolean = {
-          symbol.isMethod && {
-            (symbol.flags.is(Flags.FieldAccessor)  && symbol.flags.is(Flags.Stable) ) ||
-            (symbol.isUsefulField && !symbol.flags.is(Flags.Mutable) )
-          }
-        }
-
         /* the `isFieldForPrivateThis` is commented out otherwise class members of the form
           "private[this] val foo" are not converted to symbol occurences.
           In the original semanticdb this line is commented out.
@@ -284,9 +309,6 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           }
           !resolved.flags.is(Flags.Package)  && resolved.flags.is(Flags.JavaDefined)  && resolved.flags.is(Flags.Object)
         }
-        def isAnonymousClassConstructor(implicit ctx: Context): Boolean = {
-          symbol.isConstructor && symbol.owner.isAnonymousClass
-        }
         def isSyntheticAbstractType(implicit ctx: Context): Boolean = {
           symbol.flags.is(Flags.Synthetic)  && symbol.isAbstractType // these are hardlinked to TypeOps
         }
@@ -297,12 +319,6 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           symbol.name.startsWith("x$") &&
           symbol.owner.isAnonymousFunction
         }
-        def isAnonymousSelfParameter(implicit ctx: Context): Boolean = {
-          symbol.isSelfParameter && {
-            symbol.name == tpnme.this_.toString || // hardlinked in ClassSignature.self
-            symbol.name.startsWith("x$") // wildcards can't be referenced: class A { _: B => }
-          }
-        }
         def isStaticMember(implicit ctx: Context): Boolean =
           symbol.exists &&
             (symbol.flags.is(Flags.Static)  || symbol.owner.flags.is(Flags.ImplClass)  ||
@@ -312,6 +328,8 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           (symbol.isStaticMember && symbol.isClassConstructor) || (symbol.name == tpnme.STATIC_CONSTRUCTOR.toString)
         }
 
+        /* End of methods imported from the scala version of SemanticDB */
+
         def isInitChild(implicit ctx: Context): Boolean = {
           if (symbol.exists && symbol.owner.exists) {
             return symbol.owner.name == "<init>" || symbol.owner.isInitChild
@@ -320,17 +338,6 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
           }
         }
 
-        def isWildCard(implicit ctx: Context): Boolean = {
-          symbol.name.startsWith(tpnme.WILDCARD.toString) &&
-          symbol.name != tpnme.THIS.toString
-        }
-
-        def isAnonymousInit(implicit ctx: Context): Boolean = {
-          return symbol.exists && symbol.owner.exists &&
-          (symbol.owner.isAnonymousFunction || symbol.owner.isAnonymousClass) &&
-          symbol.name == "<init>"
-        }
-
         def isUseless(implicit ctx: Context): Boolean = {
           !symbol.exists ||
           symbol.isReservedName ||