syntax changes and test result improvements

Author: bishabosha

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -17,6 +17,9 @@ class ScalaSettings extends Settings.SettingGroup {
   val javabootclasspath: Setting[String] = PathSetting("-javabootclasspath", "Override java boot classpath.", Defaults.javaBootClassPath) withAbbreviation "--java-boot-class-path"
   val javaextdirs: Setting[String] = PathSetting("-javaextdirs", "Override java extdirs classpath.", Defaults.javaExtDirs) withAbbreviation "--java-extension-directories"
   val sourcepath: Setting[String] = PathSetting("-sourcepath", "Specify location(s) of source files.", Defaults.scalaSourcePath) withAbbreviation "--source-path"
+  val scansource: Setting[Boolean] = BooleanSetting("-scansource", "Scan source files to locate classes for which class-name != file-name") withAbbreviation "--scan-source"
+  val sourceroot: Setting[String] = PathSetting("-sourceroot", "Specify workspace root directory", ".")
+  val targetroot: Setting[String] = PathSetting("-targetroot", "Specify output directory", "")
 
   val classpath: Setting[String] = PathSetting("-classpath", "Specify where to find user class files.", defaultClasspath) withAbbreviation "-cp" withAbbreviation "--class-path"
   val outputDir: Setting[AbstractFile] = OutputSetting("-d", "directory|jar", "destination for generated classfiles.",

compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala

@@ -511,9 +511,10 @@ class ExtractSemanticDB extends Phase with
         else limit
       Span(start max limit, end)
 
-    private given spanOps: (span: Span) with
+    private given extension (span: Span) with
       def hasLength: Boolean = span.start != span.end
       def zeroLength: Boolean = span.start == span.end
+    end given
 
     /**Consume head while not an import statement.
      * Returns the rest of the list after the first import, or else the empty list

compiler/src/dotty/tools/dotc/semanticdb/Scala3.scala

@@ -67,7 +67,7 @@ object Scala3 with
 
   end Symbols
 
-  given NameOps: (name: Name) with
+  given NameOps: extension (name: Name) with
 
     def isWildcard = name match
       case nme.WILDCARD | WILDCARDTypeName => true
@@ -89,7 +89,7 @@ object Scala3 with
 
   end NameOps
 
-  given SymbolOps: (sym: Symbol) with
+  given SymbolOps: extension (sym: Symbol) with
 
     def ifExists(given Context): Option[Symbol] = if sym.exists then Some(sym) else None
 
@@ -146,7 +146,7 @@ object Scala3 with
     case '/' | '.' | '#' | ']' | ')' => true
     case _                           => false
 
-  given StringOps: (symbol: String) with
+  given StringOps: extension (symbol: String) with
 
     def isSymbol: Boolean = !symbol.isEmpty
     def isRootPackage: Boolean = RootPackage == symbol
@@ -171,7 +171,7 @@ object Scala3 with
 
   end StringOps
 
-  given InfoOps: (info: SymbolInformation) with
+  given InfoOps: extension (info: SymbolInformation) with
 
     def isAbstract: Boolean = (info.properties & SymbolInformation.Property.ABSTRACT.value) != 0
     def isFinal: Boolean = (info.properties & SymbolInformation.Property.FINAL.value) != 0
@@ -207,7 +207,7 @@ object Scala3 with
 
   end InfoOps
 
-  given RangeOps: (range: Range) with
+  given RangeOps: extension (range: Range) with
     def hasLength = range.endLine > range.startLine || range.endCharacter > range.startCharacter
   end RangeOps
 

tests/semanticdb/expect/Givens.expect.scala

@@ -3,11 +3,11 @@ package b
 
 object Givens/*<-a::b::Givens.*/
 
-  given :[A](any: A)
-    de/*<-a::b::Givens.given_sayHello_of_A.*//*<-a::b::Givens.given_sayHello_of_A.sayHello().[A]*//*<-a::b::Givens.given_sayHello_of_A.sayHello().(any)*//*->a::b::Givens.given_sayHello_of_A.sayHello().[A]*/f sayHello/*<-a::b::Givens.given_sayHello_of_A.sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.given_sayHello_of_A.sayHello().(any)*//*->scala::StringContext#s().*/"
+  given extension [A](any: /*<-a::b::Givens.given_sayHello_of_A.*//*<-a::b::Givens.given_sayHello_of_A.sayHello().[A]*//*<-a::b::Givens.given_sayHello_of_A.sayHello().(any)*/A/*->a::b::Givens.given_sayHello_of_A.sayHello().[A]*/)
+    def sayHello/*<-a::b::Givens.given_sayHello_of_A.sayHello().*/ = s"/*->scala::StringContext.apply().*/Hello, I am $any/*->a::b::Givens.given_sayHello_of_A.sayHello().(any)*//*->scala::StringContext#s().*/"
 
-  given :[B](any: B)
-    def /*<-a::b::Givens.given_sayGoodbye_of_B.*//*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().[B]*//*<-a::b::Givens.given_sayGoodbye_of_B.saySoLong().[B]*//*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().(any)*//*<-a::b::Givens.given_sayGoodbye_of_B.saySoLong().(any)*//*->a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().[B]*//*->a::b::Givens.given_sayGoodbye_of_B.saySoLong().[B]*/sayGoodbye/*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().(any)*//*->scala::StringContext#s().*/"
+  given extension [B](any: B)/*<-a::b::Givens.given_sayGoodbye_of_B.*//*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().[B]*//*<-a::b::Givens.given_sayGoodbye_of_B.saySoLong().[B]*//*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().(any)*//*<-a::b::Givens.given_sayGoodbye_of_B.saySoLong().(any)*//*->a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().[B]*//*->a::b::Givens.given_sayGoodbye_of_B.saySoLong().[B]*/
+    def sayGoodbye/*<-a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().*/ = s"/*->scala::StringContext.apply().*/Goodbye, from $any/*->a::b::Givens.given_sayGoodbye_of_B.sayGoodbye().(any)*//*->scala::StringContext#s().*/"
     def saySoLong/*<-a::b::Givens.given_sayGoodbye_of_B.saySoLong().*/ = s"/*->scala::StringContext.apply().*/So Long, from $any/*->a::b::Givens.given_sayGoodbye_of_B.saySoLong().(any)*//*->scala::StringContext#s().*/"
 
   val hello1/*<-a::b::Givens.hello1.*/ = /*->a::b::Givens.given_sayHello_of_A.sayHello().*/1.sayHello

tests/semanticdb/expect/Givens.scala

@@ -3,10 +3,10 @@ package b
 
 object Givens
 
-  given :[A](any: A)
+  given extension [A](any: A)
     def sayHello = s"Hello, I am $any"
 
-  given :[B](any: B)
+  given extension [B](any: B)
     def sayGoodbye = s"Goodbye, from $any"
     def saySoLong = s"So Long, from $any"
 

tests/semanticdb/expect/MethodUsages.expect.scala

@@ -13,7 +13,7 @@ class MethodUsages/*<-example::MethodUsages#*/ {
   m/*->example::MethodUsages#m.*/.m6/*->example::Methods#m6(+2).*/(Nil/*->scala::package.Nil.*/)
   m/*->example::MethodUsages#m.*/.m7/*->example::Methods#m7().*/(m/*->example::MethodUsages#m.*/, new m/*->example::MethodUsages#m.*/.List/*->example::Methods#List#*/[Int/*->scala::Int#*/]/*->example::Methods#List#`<init>`().*/)/*->scala::math::Ordering.Int.*/
   m/*->example::MethodUsages#m.*/.`m8().`/*->example::Methods#`m8().`().*/()
-  // m.m9(null) suspended due to issue https://github.com/lampepfl/dotty/issues/7514
+  m/*->example::MethodUsages#m.*/.m9/*->example::Methods#m9().*/(null)
   m/*->example::MethodUsages#m.*/.m10/*->example::Methods#m10().*/(null)
   m/*->example::MethodUsages#m.*/.m11/*->example::Methods#m11().*/(Predef/*->scala::Predef.*/)
   m/*->example::MethodUsages#m.*/.m11/*->example::Methods#m11(+1).*/(Example/*->example::Example.*/)

tests/semanticdb/expect/MethodUsages.scala

@@ -13,7 +13,7 @@ class MethodUsages {
   m.m6(Nil)
   m.m7(m, new m.List[Int])
   m.`m8().`()
-  // m.m9(null) suspended due to issue https://github.com/lampepfl/dotty/issues/7514
+  m.m9(null)
   m.m10(null)
   m.m11(Predef)
   m.m11(Example)

tests/semanticdb/expect/Methods.expect.scala

@@ -16,9 +16,9 @@ class Methods/*<-example::Methods#*/[T/*<-example::Methods#[T]*/] {
   def m6/*<-example::Methods#m6(+1).*/(x/*<-example::Methods#m6(+1).(x)*/: List/*->example::Methods#List#*/[T/*->example::Methods#[T]*/]) = ???/*->scala::Predef.`???`().*/
   def m6/*<-example::Methods#m6(+2).*/(x/*<-example::Methods#m6(+2).(x)*/: scala.List/*->scala::package.List#*/[T/*->example::Methods#[T]*/]) = ???/*->scala::Predef.`???`().*/
   def m7/*<-example::Methods#m7().*/[U/*<-example::Methods#m7().[U]*/: Ordering/*->scala::math::Ordering#*//*->example::Methods#m7().[U]*/](c/*<-example::Methods#m7().(c)*/: Methods/*->example::Methods#*/[T/*->example::Methods#[T]*/], l/*<-example::Methods#m7().(l)*/: List/*->example::Methods#List#*/[U/*->example::Methods#m7().[U]*/]) = ???/*->scala::Predef.`???`().*/
-  def `m8().`() =/*<-example::Methods#`m8().`().*/ ???/*->scala::Predef.`???`().*/
-  class `m9().`
-  d/*<-example::Methods#`m9().`#*/ef m9/*<-example::Methods#m9().*/(x/*<-example::Methods#m9().(x)*/: `m9().`/*->example::Methods#`m9().`#*/) = ???/*->scala::Predef.`???`().*/
+  def `m8()./*<-example::Methods#`m8().`().*/`() = ???/*->scala::Predef.`???`().*/
+  class `m9()./*<-example::Methods#`m9().`#*/`
+  def m9/*<-example::Methods#m9().*/(x/*<-example::Methods#m9().(x)*/: `m9().`/*->example::Methods#`m9().`#*/) = ???/*->scala::Predef.`???`().*/
   def m10/*<-example::Methods#m10().*/(x/*<-example::Methods#m10().(x)*/: AList/*->example::Methods#AList#*/[T/*->example::Methods#[T]*/]) = ???/*->scala::Predef.`???`().*/
   def m11/*<-example::Methods#m11().*/(x/*<-example::Methods#m11().(x)*/: Predef/*->scala::Predef.*/.type) = ???/*->scala::Predef.`???`().*/
   def m11/*<-example::Methods#m11(+1).*/(x/*<-example::Methods#m11(+1).(x)*/: Example/*->example::Example.*/.type) = ???/*->scala::Predef.`???`().*/

tests/semanticdb/metac.expect

@@ -1311,21 +1311,21 @@ Occurrences:
 [0:8..0:9): a <- a/
 [1:8..1:9): b <- a/b/
 [3:7..3:13): Givens <- a/b/Givens.
-[5:8..6:6): <- a/b/Givens.given_sayHello_of_A.
-[5:10..5:11): A <- a/b/Givens.given_sayHello_of_A.sayHello().[A]
-[5:13..5:16): any <- a/b/Givens.given_sayHello_of_A.sayHello().(any)
-[5:18..5:19): A -> a/b/Givens.given_sayHello_of_A.sayHello().[A]
+[5:8..5:27): extension [A](any:  <- a/b/Givens.given_sayHello_of_A.
+[5:19..5:20): A <- a/b/Givens.given_sayHello_of_A.sayHello().[A]
+[5:22..5:25): any <- a/b/Givens.given_sayHello_of_A.sayHello().(any)
+[5:27..5:28): A -> a/b/Givens.given_sayHello_of_A.sayHello().[A]
 [6:8..6:16): sayHello <- a/b/Givens.given_sayHello_of_A.sayHello().
 [6:21..6:21): -> scala/StringContext.apply().
 [6:34..6:37): any -> a/b/Givens.given_sayHello_of_A.sayHello().(any)
 [6:37..6:37): -> scala/StringContext#s().
-[8:8..9:8): <- a/b/Givens.given_sayGoodbye_of_B.
-[8:10..8:11): B <- a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().[B]
-[8:10..8:11): B <- a/b/Givens.given_sayGoodbye_of_B.saySoLong().[B]
-[8:13..8:16): any <- a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().(any)
-[8:13..8:16): any <- a/b/Givens.given_sayGoodbye_of_B.saySoLong().(any)
-[8:18..8:19): B -> a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().[B]
-[8:18..8:19): B -> a/b/Givens.given_sayGoodbye_of_B.saySoLong().[B]
+[8:8..8:29): extension [B](any: B) <- a/b/Givens.given_sayGoodbye_of_B.
+[8:19..8:20): B <- a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().[B]
+[8:19..8:20): B <- a/b/Givens.given_sayGoodbye_of_B.saySoLong().[B]
+[8:22..8:25): any <- a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().(any)
+[8:22..8:25): any <- a/b/Givens.given_sayGoodbye_of_B.saySoLong().(any)
+[8:27..8:28): B -> a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().[B]
+[8:27..8:28): B -> a/b/Givens.given_sayGoodbye_of_B.saySoLong().[B]
 [9:8..9:18): sayGoodbye <- a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().
 [9:23..9:23): -> scala/StringContext.apply().
 [9:38..9:41): any -> a/b/Givens.given_sayGoodbye_of_B.sayGoodbye().(any)
@@ -1792,7 +1792,7 @@ Uri => MethodUsages.scala
 Text => empty
 Language => Scala
 Symbols => 3 entries
-Occurrences => 74 entries
+Occurrences => 76 entries
 
 Symbols:
 example/MethodUsages# => class MethodUsages
@@ -1839,7 +1839,9 @@ Occurrences:
 [13:25..13:25): -> example/Methods#List#`<init>`().
 [13:26..13:26): -> scala/math/Ordering.Int.
 [14:2..14:3): m -> example/MethodUsages#m.
-[14:3..14:11): .`m8().` -> example/Methods#`m8().`().
+[14:4..14:11): `m8().` -> example/Methods#`m8().`().
+[15:2..15:3): m -> example/MethodUsages#m.
+[15:4..15:6): m9 -> example/Methods#m9().
 [16:2..16:3): m -> example/MethodUsages#m.
 [16:4..16:7): m10 -> example/Methods#m10().
 [17:2..17:3): m -> example/MethodUsages#m.
@@ -2025,10 +2027,10 @@ Occurrences:
 [17:40..17:44): List -> example/Methods#List#
 [17:45..17:46): U -> example/Methods#m7().[U]
 [17:51..17:54): ??? -> scala/Predef.`???`().
-[18:7..18:17): m8().`() = <- example/Methods#`m8().`().
+[18:7..18:12): m8(). <- example/Methods#`m8().`().
 [18:18..18:21): ??? -> scala/Predef.`???`().
 [19:2..19:2): <- example/Methods#`m9().`#`<init>`().
-[19:9..20:3): <- example/Methods#`m9().`#
+[19:9..19:14): m9(). <- example/Methods#`m9().`#
 [20:6..20:8): m9 <- example/Methods#m9().
 [20:9..20:10): x <- example/Methods#m9().(x)
 [20:12..20:19): `m9().` -> example/Methods#`m9().`#