Skip to content

Support MatchType for SemanticDB #14608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 3, 2022
Merged

Support MatchType for SemanticDB #14608

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7817912
Add generated semanticdb source code
tanishiking Mar 2, 2022
0480dec
Support MatchType in semanticdb
tanishiking Mar 2, 2022
fa4cb01
Remove LambdaType
tanishiking Mar 2, 2022
28d59a0
Assign types to type variables in match case types
tanishiking Mar 4, 2022
2ca6fb2
Remove `case` property from the symbol of type variable
tanishiking Mar 17, 2022
4fa62e2
Don't craft the NamedType symbol
tanishiking Mar 21, 2022
2693983
Merge branches for TypeRef/TermRef with Symbol and Name
tanishiking Mar 21, 2022
18b8901
Add undefined type case for TypeRef with no symbols
tanishiking Mar 22, 2022
b070667
Retrieve a symbol for typeref to refinements in RefinedType
tanishiking Mar 22, 2022
60c336e
Resolve symbols in refinements by fake symbols
tanishiking Mar 30, 2022
be31d56
Resolve symbol occurrences of select type fields
tanishiking Mar 30, 2022
9375ab1
Resolve real symbol from nested refined type
tanishiking Mar 31, 2022
50a43b9
No need to resolve fake symbols from RefinedTypes
tanishiking Mar 31, 2022
8465366
Dealias type for looking up symbols in refinements
tanishiking Apr 1, 2022
ba24fe1
Add test file for semanticdb and ignore symbol lookup failures
tanishiking Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions compiler/src/dotty/tools/dotc/semanticdb/TypeOps.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,22 @@ class TypeOps:
val stpe = loop(tpe)
s.ByNameType(stpe)

case tr @ TypeRef(pre, _) =>
case TypeRef(pre, sym: Symbol) =>
val spre = if tpe.hasTrivialPrefix then s.Type.Empty else loop(pre)
val ssym = sym.symbolName
s.TypeRef(spre, ssym, Seq.empty)

case tr @ TypeRef(pre, _) if tr.symbol != NoSymbol =>
val spre = if tpe.hasTrivialPrefix then s.Type.Empty else loop(pre)
val ssym = tr.symbol.symbolName
s.TypeRef(spre, ssym, Seq.empty)

case tr @ TermRef(pre, _) =>
case TermRef(pre, sym: Symbol) =>
val spre = if tpe.hasTrivialPrefix then s.Type.Empty else loop(pre)
val ssym = sym.symbolName
s.SingleType(spre, ssym)

case tr @ TermRef(pre, _) if tr.symbol != NoSymbol =>
val spre = if(tpe.hasTrivialPrefix) s.Type.Empty else loop(pre)
val ssym = tr.symbol.symbolName
s.SingleType(spre, ssym)
Expand Down Expand Up @@ -448,10 +458,17 @@ class TypeOps:
private def hasTrivialPrefix(using Context): Boolean =
def checkTrivialPrefix(pre: Type, sym: Symbol)(using Context): Boolean =
pre =:= sym.owner.thisType
// Make sure `tr.symbol != NoSymbol` where `tr @ TypeRef(...)`, that happens
// when TypeRef refers the refinement of RefinedType e.g.
// TypeRef for `foo.B` in `trait T[A] { val foo: { type B = A } = ???; def bar(b: foo.B) = () }` has NoSymbol
tpe match {
case tr @ TypeRef(pre, _) =>
case TypeRef(pre, sym: Symbol) =>
checkTrivialPrefix(pre, sym)
case tr @ TypeRef(pre, _) if tr.symbol != NoSymbol =>
checkTrivialPrefix(pre, tr.symbol)
case tr @ TermRef(pre, _) =>
case TermRef(pre, sym: Symbol) =>
checkTrivialPrefix(pre, sym)
case tr @ TermRef(pre, _) if tr.symbol != NoSymbol =>
checkTrivialPrefix(pre, tr.symbol)
case _ => false
}
Expand Down
5 changes: 3 additions & 2 deletions tests/semanticdb/expect/Advanced.expect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Structural/*<-advanced::Structural#*/ {
def s2/*<-advanced::Structural#s2().*/: { val x/*<-local1*/: Int/*->scala::Int#*/ } = new { val x/*<-local2*/: Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
def s3/*<-advanced::Structural#s3().*/: { def m/*<-local6*/(x/*<-local5*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ } = new { def m/*<-local8*/(x/*<-local7*/: Int/*->scala::Int#*/): Int/*->scala::Int#*/ = ???/*->scala::Predef.`???`().*/ }
def s4/*<-advanced::Structural#s4().*/(a/*<-advanced::Structural#s4().(a)*/: Int/*->scala::Int#*/): { val x/*<-local11*/: Int/*->scala::Int#*/ } = ???/*->scala::Predef.`???`().*/
trait T/*<-advanced::Structural#T#*/[A/*<-advanced::Structural#T#[A]*/] { val foo/*<-advanced::Structural#T#foo.*/: { type B/*<-local12*/ = A/*->advanced::Structural#T#[A]*/ } = ???/*->scala::Predef.`???`().*/; def bar/*<-advanced::Structural#T#bar().*/(b/*<-advanced::Structural#T#bar().(b)*/: foo/*->advanced::Structural#T#foo.*/.B) = () } // from tests/pos/t8177e.scala
}

class Wildcards/*<-advanced::Wildcards#*/ {
Expand All @@ -36,8 +37,8 @@ object Test/*<-advanced::Test.*/ {

{
(???/*->scala::Predef.`???`().*/ : Any/*->scala::Any#*/) match {
case e3/*<-local12*/: List/*->scala::package.List#*/[_] =>
val e3x/*<-local14*/ = e3/*->local12*/.head/*->scala::collection::IterableOps#head().*/
case e3/*<-local13*/: List/*->scala::package.List#*/[_] =>
val e3x/*<-local15*/ = e3/*->local13*/.head/*->scala::collection::IterableOps#head().*/
()
}
}
Expand Down
1 change: 1 addition & 0 deletions tests/semanticdb/expect/Advanced.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Structural {
def s2: { val x: Int } = new { val x: Int = ??? }
def s3: { def m(x: Int): Int } = new { def m(x: Int): Int = ??? }
def s4(a: Int): { val x: Int } = ???
trait T[A] { val foo: { type B = A } = ???; def bar(b: foo.B) = () } // from tests/pos/t8177e.scala
}

class Wildcards {
Expand Down
154 changes: 85 additions & 69 deletions tests/semanticdb/metac.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Schema => SemanticDB v4
Uri => Advanced.scala
Text => empty
Language => Scala
Symbols => 48 entries
Occurrences => 105 entries
Symbols => 55 entries
Occurrences => 114 entries
Synthetics => 3 entries

Symbols:
Expand All @@ -67,7 +67,13 @@ advanced/HKClass#foo(). => method foo [typeparam T , typeparam U ](param x: F[T,
advanced/HKClass#foo().(x) => param x: F[T, U]
advanced/HKClass#foo().[T] => typeparam T
advanced/HKClass#foo().[U] => typeparam U
advanced/Structural# => class Structural extends Object { self: Structural => +5 decls }
advanced/Structural# => class Structural extends Object { self: Structural => +6 decls }
advanced/Structural#T# => trait T [typeparam A ] extends Object { self: T[A] => +4 decls }
advanced/Structural#T#[A] => typeparam A
advanced/Structural#T#`<init>`(). => primary ctor <init> [typeparam A ](): T[A]
advanced/Structural#T#bar(). => method bar (param b: <?>): Unit
advanced/Structural#T#bar().(b) => param b: <?>
Copy link
Member

@bishabosha bishabosha Mar 22, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b should still have a type here - it seems a symbol does exist for foo.B because apparently it is local12

Edit: I have now seen your comment :) #14608 (comment)

advanced/Structural#T#foo. => val method foo Object { type B = A }
advanced/Structural#`<init>`(). => primary ctor <init> (): Structural
advanced/Structural#s1(). => method s1 => Object { abstract val method x Int }
advanced/Structural#s2(). => method s2 => Object { abstract val method x Int }
Expand Down Expand Up @@ -99,8 +105,9 @@ local7 => param x: Int
local8 => method m (param x: Int): Int
local9 => final class $anon extends Object { self: $anon => +2 decls }
local11 => abstract val method x Int
local12 => val local e3: List[local13]
local14 => val local e3x: local13
local12 => type B = A
local13 => val local e3: List[local14]
local15 => val local e3x: local14

Occurrences:
[0:8..0:16): advanced <- advanced/
Expand Down Expand Up @@ -146,73 +153,82 @@ Occurrences:
[15:24..15:25): x <- local11
[15:27..15:30): Int -> scala/Int#
[15:35..15:38): ??? -> scala/Predef.`???`().
[18:6..18:15): Wildcards <- advanced/Wildcards#
[19:6..19:8): e1 <- advanced/Wildcards#e1().
[19:10..19:14): List -> scala/package.List#
[19:20..19:23): ??? -> scala/Predef.`???`().
[20:6..20:8): e2 <- advanced/Wildcards#e2().
[16:8..16:9): T <- advanced/Structural#T#
[16:10..16:11): A <- advanced/Structural#T#[A]
[16:19..16:22): foo <- advanced/Structural#T#foo.
[16:31..16:32): B <- local12
[16:35..16:36): A -> advanced/Structural#T#[A]
[16:41..16:44): ??? -> scala/Predef.`???`().
[16:50..16:53): bar <- advanced/Structural#T#bar().
[16:54..16:55): b <- advanced/Structural#T#bar().(b)
[16:57..16:60): foo -> advanced/Structural#T#foo.
[19:6..19:15): Wildcards <- advanced/Wildcards#
[20:6..20:8): e1 <- advanced/Wildcards#e1().
[20:10..20:14): List -> scala/package.List#
[20:20..20:23): Int -> scala/Int#
[20:27..20:30): ??? -> scala/Predef.`???`().
[23:7..23:11): Test <- advanced/Test.
[24:6..24:7): s <- advanced/Test.s.
[24:14..24:24): Structural -> advanced/Structural#
[25:6..25:8): s1 <- advanced/Test.s1.
[25:11..25:12): s -> advanced/Test.s.
[25:13..25:15): s1 -> advanced/Structural#s1().
[26:6..26:9): s1x <- advanced/Test.s1x.
[26:12..26:13): s -> advanced/Test.s.
[26:14..26:16): s1 -> advanced/Structural#s1().
[27:6..27:8): s2 <- advanced/Test.s2.
[27:11..27:12): s -> advanced/Test.s.
[27:13..27:15): s2 -> advanced/Structural#s2().
[28:6..28:9): s2x <- advanced/Test.s2x.
[28:12..28:13): s -> advanced/Test.s.
[28:14..28:16): s2 -> advanced/Structural#s2().
[29:6..29:8): s3 <- advanced/Test.s3.
[29:11..29:12): s -> advanced/Test.s.
[29:13..29:15): s3 -> advanced/Structural#s3().
[30:6..30:9): s3x <- advanced/Test.s3x.
[30:12..30:13): s -> advanced/Test.s.
[30:14..30:16): s3 -> advanced/Structural#s3().
[30:19..30:22): ??? -> scala/Predef.`???`().
[32:6..32:7): e <- advanced/Test.e.
[32:14..32:23): Wildcards -> advanced/Wildcards#
[33:6..33:8): e1 <- advanced/Test.e1.
[33:11..33:12): e -> advanced/Test.e.
[33:13..33:15): e1 -> advanced/Wildcards#e1().
[34:6..34:9): e1x <- advanced/Test.e1x.
[34:12..34:13): e -> advanced/Test.e.
[34:14..34:16): e1 -> advanced/Wildcards#e1().
[34:17..34:21): head -> scala/collection/IterableOps#head().
[37:5..37:8): ??? -> scala/Predef.`???`().
[37:11..37:14): Any -> scala/Any#
[38:11..38:13): e3 <- local12
[38:15..38:19): List -> scala/package.List#
[39:12..39:15): e3x <- local14
[39:18..39:20): e3 -> local12
[39:21..39:25): head -> scala/collection/IterableOps#head().
[47:6..47:13): HKClass <- advanced/HKClass#
[47:14..47:15): F <- advanced/HKClass#[F]
[47:20..47:21): T <- advanced/HKClass#`<init>`().[F][T]
[47:28..47:29): U <- advanced/HKClass#`<init>`().[F][U]
[47:36..47:37): U -> advanced/HKClass#`<init>`().[F][U]
[47:39..47:40): T -> advanced/HKClass#`<init>`().[F][T]
[48:6..48:9): foo <- advanced/HKClass#foo().
[48:10..48:11): T <- advanced/HKClass#foo().[T]
[48:12..48:13): U <- advanced/HKClass#foo().[U]
[48:15..48:16): x <- advanced/HKClass#foo().(x)
[48:18..48:19): F -> advanced/HKClass#[F]
[48:20..48:21): T -> advanced/HKClass#foo().[T]
[48:23..48:24): U -> advanced/HKClass#foo().[U]
[48:28..48:34): String -> scala/Predef.String#
[48:37..48:38): x -> advanced/HKClass#foo().(x)
[48:39..48:47): toString -> scala/Tuple2#toString().
[20:20..20:23): ??? -> scala/Predef.`???`().
[21:6..21:8): e2 <- advanced/Wildcards#e2().
[21:10..21:14): List -> scala/package.List#
[21:20..21:23): Int -> scala/Int#
[21:27..21:30): ??? -> scala/Predef.`???`().
[24:7..24:11): Test <- advanced/Test.
[25:6..25:7): s <- advanced/Test.s.
[25:14..25:24): Structural -> advanced/Structural#
[26:6..26:8): s1 <- advanced/Test.s1.
[26:11..26:12): s -> advanced/Test.s.
[26:13..26:15): s1 -> advanced/Structural#s1().
[27:6..27:9): s1x <- advanced/Test.s1x.
[27:12..27:13): s -> advanced/Test.s.
[27:14..27:16): s1 -> advanced/Structural#s1().
[28:6..28:8): s2 <- advanced/Test.s2.
[28:11..28:12): s -> advanced/Test.s.
[28:13..28:15): s2 -> advanced/Structural#s2().
[29:6..29:9): s2x <- advanced/Test.s2x.
[29:12..29:13): s -> advanced/Test.s.
[29:14..29:16): s2 -> advanced/Structural#s2().
[30:6..30:8): s3 <- advanced/Test.s3.
[30:11..30:12): s -> advanced/Test.s.
[30:13..30:15): s3 -> advanced/Structural#s3().
[31:6..31:9): s3x <- advanced/Test.s3x.
[31:12..31:13): s -> advanced/Test.s.
[31:14..31:16): s3 -> advanced/Structural#s3().
[31:19..31:22): ??? -> scala/Predef.`???`().
[33:6..33:7): e <- advanced/Test.e.
[33:14..33:23): Wildcards -> advanced/Wildcards#
[34:6..34:8): e1 <- advanced/Test.e1.
[34:11..34:12): e -> advanced/Test.e.
[34:13..34:15): e1 -> advanced/Wildcards#e1().
[35:6..35:9): e1x <- advanced/Test.e1x.
[35:12..35:13): e -> advanced/Test.e.
[35:14..35:16): e1 -> advanced/Wildcards#e1().
[35:17..35:21): head -> scala/collection/IterableOps#head().
[38:5..38:8): ??? -> scala/Predef.`???`().
[38:11..38:14): Any -> scala/Any#
[39:11..39:13): e3 <- local13
[39:15..39:19): List -> scala/package.List#
[40:12..40:15): e3x <- local15
[40:18..40:20): e3 -> local13
[40:21..40:25): head -> scala/collection/IterableOps#head().
[48:6..48:13): HKClass <- advanced/HKClass#
[48:14..48:15): F <- advanced/HKClass#[F]
[48:20..48:21): T <- advanced/HKClass#`<init>`().[F][T]
[48:28..48:29): U <- advanced/HKClass#`<init>`().[F][U]
[48:36..48:37): U -> advanced/HKClass#`<init>`().[F][U]
[48:39..48:40): T -> advanced/HKClass#`<init>`().[F][T]
[49:6..49:9): foo <- advanced/HKClass#foo().
[49:10..49:11): T <- advanced/HKClass#foo().[T]
[49:12..49:13): U <- advanced/HKClass#foo().[U]
[49:15..49:16): x <- advanced/HKClass#foo().(x)
[49:18..49:19): F -> advanced/HKClass#[F]
[49:20..49:21): T -> advanced/HKClass#foo().[T]
[49:23..49:24): U -> advanced/HKClass#foo().[U]
[49:28..49:34): String -> scala/Predef.String#
[49:37..49:38): x -> advanced/HKClass#foo().(x)
[49:39..49:47): toString -> scala/Tuple2#toString().

Synthetics:
[26:12..26:16):s.s1 => reflectiveSelectable(*)
[28:12..28:16):s.s2 => reflectiveSelectable(*)
[30:12..30:16):s.s3 => reflectiveSelectable(*)
[27:12..27:16):s.s1 => reflectiveSelectable(*)
[29:12..29:16):s.s2 => reflectiveSelectable(*)
[31:12..31:16):s.s3 => reflectiveSelectable(*)

expect/Annotations.scala
------------------------
Expand Down