Skip to content

Skip EnumValue as supertype of enum values in semanticdb #11807

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 1 commit into from
Mar 24, 2021
Merged

Skip EnumValue as supertype of enum values in semanticdb #11807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/semanticdb/ExtractSemanticDB.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class ExtractSemanticDB extends Phase:
if tree.symbol.isAllOf(EnumValue) =>
tree.rhs match
case Block(TypeDef(_, template: Template) :: _, _) => // simple case with specialised extends clause
template.parents.foreach(traverse)
template.parents.filter(!_.span.isZeroExtent).foreach(traverse)
case _ => // calls $new
case tree: ValDef
if tree.symbol.isSelfSym =>
Expand Down
11 changes: 11 additions & 0 deletions tests/semanticdb/expect/EnumVal.expect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package enumVal

import scala.runtime.EnumValue/*->scala::runtime::EnumValue.*/


trait A/*<-enumVal::A#*/

enum Color/*<-enumVal::Color#*/(val rgb/*<-enumVal::Color#rgb.*/: Int/*->scala::Int#*/):
case Red/*<-enumVal::Color.Red.*/ extends Color/*->enumVal::Color#*/(0xFF0000) with EnumValue/*->scala::runtime::EnumValue#*/
case Green/*<-enumVal::Color.Green.*/ extends Color/*->enumVal::Color#*/(0x00FF00) with A/*->enumVal::A#*/
case Blue/*<-enumVal::Color.Blue.*/ extends Color/*->enumVal::Color#*/(0x0000FF)
11 changes: 11 additions & 0 deletions tests/semanticdb/expect/EnumVal.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package enumVal

import scala.runtime.EnumValue


trait A

enum Color(val rgb: Int):
case Red extends Color(0xFF0000) with EnumValue
case Green extends Color(0x00FF00) with A
case Blue extends Color(0x0000FF)
32 changes: 16 additions & 16 deletions tests/semanticdb/expect/Enums.expect.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ object Enums/*<-_empty_::Enums.*/:
case Sunday/*<-_empty_::Enums.WeekDays.Sunday.*/

enum Coin/*<-_empty_::Enums.Coin#*/(value/*<-_empty_::Enums.Coin#value.*/: Int/*->scala::Int#*/):
case Penny/*<-_empty_::Enums.Coin.Penny.*/ extends Coin/*->_empty_::Enums.Coin#*/(1)/*->scala::runtime::EnumValue#*/
case Nickel/*<-_empty_::Enums.Coin.Nickel.*/ extends Coin/*->_empty_::Enums.Coin#*/(5)/*->scala::runtime::EnumValue#*/
case Dime/*<-_empty_::Enums.Coin.Dime.*/ extends Coin/*->_empty_::Enums.Coin#*/(10)/*->scala::runtime::EnumValue#*/
case Quarter/*<-_empty_::Enums.Coin.Quarter.*/ extends Coin/*->_empty_::Enums.Coin#*/(25)/*->scala::runtime::EnumValue#*/
case Dollar/*<-_empty_::Enums.Coin.Dollar.*/ extends Coin/*->_empty_::Enums.Coin#*/(100)/*->scala::runtime::EnumValue#*/
case Penny/*<-_empty_::Enums.Coin.Penny.*/ extends Coin/*->_empty_::Enums.Coin#*/(1)
case Nickel/*<-_empty_::Enums.Coin.Nickel.*/ extends Coin/*->_empty_::Enums.Coin#*/(5)
case Dime/*<-_empty_::Enums.Coin.Dime.*/ extends Coin/*->_empty_::Enums.Coin#*/(10)
case Quarter/*<-_empty_::Enums.Coin.Quarter.*/ extends Coin/*->_empty_::Enums.Coin#*/(25)
case Dollar/*<-_empty_::Enums.Coin.Dollar.*/ extends Coin/*->_empty_::Enums.Coin#*/(100)

enum Maybe/*<-_empty_::Enums.Maybe#*/[+A/*<-_empty_::Enums.Maybe#[A]*/]:
case Just/*<-_empty_::Enums.Maybe.Just#*/(value/*<-_empty_::Enums.Maybe.Just#value.*/: A/*->_empty_::Enums.Maybe.Just#[A]*/)
case None/*<-_empty_::Enums.Maybe.None.*//*->scala::runtime::EnumValue#*/
case None/*<-_empty_::Enums.Maybe.None.*/

enum Tag/*<-_empty_::Enums.Tag#*/[A/*<-_empty_::Enums.Tag#[A]*/]:
case IntTag/*<-_empty_::Enums.Tag.IntTag.*/ extends Tag/*->_empty_::Enums.Tag#*/[Int/*->scala::Int#*/]/*->scala::runtime::EnumValue#*/
case BooleanTag/*<-_empty_::Enums.Tag.BooleanTag.*/ extends Tag/*->_empty_::Enums.Tag#*/[Boolean/*->scala::Boolean#*/]/*->scala::runtime::EnumValue#*/
case IntTag/*<-_empty_::Enums.Tag.IntTag.*/ extends Tag/*->_empty_::Enums.Tag#*/[Int/*->scala::Int#*/]
case BooleanTag/*<-_empty_::Enums.Tag.BooleanTag.*/ extends Tag/*->_empty_::Enums.Tag#*/[Boolean/*->scala::Boolean#*/]

enum <:</*<-_empty_::Enums.`<:<`#*/[-A/*<-_empty_::Enums.`<:<`#[A]*/, B/*<-_empty_::Enums.`<:<`#[B]*/]:
case Refl/*<-_empty_::Enums.`<:<`.Refl#*/[C/*<-_empty_::Enums.`<:<`.Refl#[C]*/]() extends (C/*->_empty_::Enums.`<:<`.Refl#[C]*/ <:</*->_empty_::Enums.`<:<`#*/ C/*->_empty_::Enums.`<:<`.Refl#[C]*/)
Expand All @@ -59,11 +59,11 @@ object Enums/*<-_empty_::Enums.*/:
def surfaceGravity/*<-_empty_::Enums.Planet#surfaceGravity().*/ = G/*->_empty_::Enums.Planet#G.*/ */*->scala::Double#`*`(+6).*/ mass/*->_empty_::Enums.Planet#mass.*/ //*->scala::Double#`::`(+6).*/ (radius/*->_empty_::Enums.Planet#radius.*/ */*->scala::Double#`*`(+6).*/ radius/*->_empty_::Enums.Planet#radius.*/)
def surfaceWeight/*<-_empty_::Enums.Planet#surfaceWeight().*/(otherMass/*<-_empty_::Enums.Planet#surfaceWeight().(otherMass)*/: Double/*->scala::Double#*/) = otherMass/*->_empty_::Enums.Planet#surfaceWeight().(otherMass)*/ */*->scala::Double#`*`(+6).*/ surfaceGravity/*->_empty_::Enums.Planet#surfaceGravity().*/

case Mercury/*<-_empty_::Enums.Planet.Mercury.*/ extends Planet/*->_empty_::Enums.Planet#*/(3.303e+23, 2.4397e6)/*->scala::runtime::EnumValue#*/
case Venus/*<-_empty_::Enums.Planet.Venus.*/ extends Planet/*->_empty_::Enums.Planet#*/(4.869e+24, 6.0518e6)/*->scala::runtime::EnumValue#*/
case Earth/*<-_empty_::Enums.Planet.Earth.*/ extends Planet/*->_empty_::Enums.Planet#*/(5.976e+24, 6.37814e6)/*->scala::runtime::EnumValue#*/
case Mars/*<-_empty_::Enums.Planet.Mars.*/ extends Planet/*->_empty_::Enums.Planet#*/(6.421e+23, 3.3972e6)/*->scala::runtime::EnumValue#*/
case Jupiter/*<-_empty_::Enums.Planet.Jupiter.*/ extends Planet/*->_empty_::Enums.Planet#*/(1.9e+27, 7.1492e7)/*->scala::runtime::EnumValue#*/
case Saturn/*<-_empty_::Enums.Planet.Saturn.*/ extends Planet/*->_empty_::Enums.Planet#*/(5.688e+26, 6.0268e7)/*->scala::runtime::EnumValue#*/
case Uranus/*<-_empty_::Enums.Planet.Uranus.*/ extends Planet/*->_empty_::Enums.Planet#*/(8.686e+25, 2.5559e7)/*->scala::runtime::EnumValue#*/
case Neptune/*<-_empty_::Enums.Planet.Neptune.*/ extends Planet/*->_empty_::Enums.Planet#*/(1.024e+26, 2.4746e7)/*->scala::runtime::EnumValue#*/
case Mercury/*<-_empty_::Enums.Planet.Mercury.*/ extends Planet/*->_empty_::Enums.Planet#*/(3.303e+23, 2.4397e6)
case Venus/*<-_empty_::Enums.Planet.Venus.*/ extends Planet/*->_empty_::Enums.Planet#*/(4.869e+24, 6.0518e6)
case Earth/*<-_empty_::Enums.Planet.Earth.*/ extends Planet/*->_empty_::Enums.Planet#*/(5.976e+24, 6.37814e6)
case Mars/*<-_empty_::Enums.Planet.Mars.*/ extends Planet/*->_empty_::Enums.Planet#*/(6.421e+23, 3.3972e6)
case Jupiter/*<-_empty_::Enums.Planet.Jupiter.*/ extends Planet/*->_empty_::Enums.Planet#*/(1.9e+27, 7.1492e7)
case Saturn/*<-_empty_::Enums.Planet.Saturn.*/ extends Planet/*->_empty_::Enums.Planet#*/(5.688e+26, 6.0268e7)
case Uranus/*<-_empty_::Enums.Planet.Uranus.*/ extends Planet/*->_empty_::Enums.Planet#*/(8.686e+25, 2.5559e7)
case Neptune/*<-_empty_::Enums.Planet.Neptune.*/ extends Planet/*->_empty_::Enums.Planet#*/(1.024e+26, 2.4746e7)
71 changes: 53 additions & 18 deletions tests/semanticdb/metac.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,58 @@ Occurrences:
[0:8..0:15): example <- example/
[2:7..2:18): EmptyObject <- example/EmptyObject.

expect/EnumVal.scala
--------------------

Summary:
Schema => SemanticDB v4
Uri => EnumVal.scala
Text => empty
Language => Scala
Symbols => 16 entries
Occurrences => 21 entries

Symbols:
enumVal/A# => trait A
enumVal/A#`<init>`(). => primary ctor <init>
enumVal/Color# => abstract sealed enum class Color
enumVal/Color#`<init>`(). => primary ctor <init>
enumVal/Color#`<init>`().(rgb) => val param rgb
enumVal/Color#rgb. => val method rgb
enumVal/Color. => final object Color
enumVal/Color.$values. => val method $values
enumVal/Color.Blue. => case val static enum method Blue
enumVal/Color.Green. => case val static enum method Green
enumVal/Color.Red. => case val static enum method Red
enumVal/Color.fromOrdinal(). => method fromOrdinal
enumVal/Color.fromOrdinal().(ordinal) => param ordinal
enumVal/Color.valueOf(). => method valueOf
enumVal/Color.valueOf().($name) => param $name
enumVal/Color.values(). => method values

Occurrences:
[0:8..0:15): enumVal <- enumVal/
[2:7..2:12): scala -> scala/
[2:13..2:20): runtime -> scala/runtime/
[2:21..2:30): EnumValue -> scala/runtime/EnumValue.
[5:0..5:0): <- enumVal/A#`<init>`().
[5:6..5:7): A <- enumVal/A#
[7:5..7:10): Color <- enumVal/Color#
[7:10..7:10): <- enumVal/Color#`<init>`().
[7:15..7:18): rgb <- enumVal/Color#rgb.
[7:20..7:23): Int -> scala/Int#
[8:7..8:10): Red <- enumVal/Color.Red.
[8:21..8:26): Color -> enumVal/Color#
[8:26..8:26): -> enumVal/Color#`<init>`().
[8:42..8:51): EnumValue -> scala/runtime/EnumValue#
[9:7..9:12): Green <- enumVal/Color.Green.
[9:21..9:26): Color -> enumVal/Color#
[9:26..9:26): -> enumVal/Color#`<init>`().
[9:42..9:43): A -> enumVal/A#
[10:7..10:11): Blue <- enumVal/Color.Blue.
[10:21..10:26): Color -> enumVal/Color#
[10:26..10:26): -> enumVal/Color#`<init>`().

expect/Enums.scala
------------------

Expand All @@ -667,7 +719,7 @@ Uri => Enums.scala
Text => empty
Language => Scala
Symbols => 181 entries
Occurrences => 201 entries
Occurrences => 184 entries

Symbols:
_empty_/Enums. => final object Enums
Expand Down Expand Up @@ -910,46 +962,37 @@ Occurrences:
[31:9..31:14): Penny <- _empty_/Enums.Coin.Penny.
[31:26..31:30): Coin -> _empty_/Enums.Coin#
[31:30..31:30): -> _empty_/Enums.Coin#`<init>`().
[31:33..31:33): -> scala/runtime/EnumValue#
[32:9..32:15): Nickel <- _empty_/Enums.Coin.Nickel.
[32:26..32:30): Coin -> _empty_/Enums.Coin#
[32:30..32:30): -> _empty_/Enums.Coin#`<init>`().
[32:33..32:33): -> scala/runtime/EnumValue#
[33:9..33:13): Dime <- _empty_/Enums.Coin.Dime.
[33:26..33:30): Coin -> _empty_/Enums.Coin#
[33:30..33:30): -> _empty_/Enums.Coin#`<init>`().
[33:34..33:34): -> scala/runtime/EnumValue#
[34:9..34:16): Quarter <- _empty_/Enums.Coin.Quarter.
[34:26..34:30): Coin -> _empty_/Enums.Coin#
[34:30..34:30): -> _empty_/Enums.Coin#`<init>`().
[34:34..34:34): -> scala/runtime/EnumValue#
[35:9..35:15): Dollar <- _empty_/Enums.Coin.Dollar.
[35:26..35:30): Coin -> _empty_/Enums.Coin#
[35:30..35:30): -> _empty_/Enums.Coin#`<init>`().
[35:35..35:35): -> scala/runtime/EnumValue#
[37:7..37:12): Maybe <- _empty_/Enums.Maybe#
[37:12..37:12): <- _empty_/Enums.Maybe#`<init>`().
[37:14..37:15): A <- _empty_/Enums.Maybe#[A]
[38:9..38:13): Just <- _empty_/Enums.Maybe.Just#
[38:13..38:13): <- _empty_/Enums.Maybe.Just#`<init>`().
[38:14..38:19): value <- _empty_/Enums.Maybe.Just#value.
[38:21..38:22): A -> _empty_/Enums.Maybe.Just#[A]
[39:4..39:4): -> _empty_/Enums.Maybe#`<init>`().
[39:9..39:13): None <- _empty_/Enums.Maybe.None.
[39:13..39:13): -> scala/runtime/EnumValue#
[41:7..41:10): Tag <- _empty_/Enums.Tag#
[41:10..41:10): <- _empty_/Enums.Tag#`<init>`().
[41:11..41:12): A <- _empty_/Enums.Tag#[A]
[42:9..42:15): IntTag <- _empty_/Enums.Tag.IntTag.
[42:24..42:27): Tag -> _empty_/Enums.Tag#
[42:28..42:31): Int -> scala/Int#
[42:32..42:32): -> _empty_/Enums.Tag#`<init>`().
[42:32..42:32): -> scala/runtime/EnumValue#
[43:9..43:19): BooleanTag <- _empty_/Enums.Tag.BooleanTag.
[43:28..43:31): Tag -> _empty_/Enums.Tag#
[43:32..43:39): Boolean -> scala/Boolean#
[43:40..43:40): -> _empty_/Enums.Tag#`<init>`().
[43:40..43:40): -> scala/runtime/EnumValue#
[45:7..45:10): <:< <- _empty_/Enums.`<:<`#
[45:10..45:10): <- _empty_/Enums.`<:<`#`<init>`().
[45:12..45:13): A <- _empty_/Enums.`<:<`#[A]
Expand Down Expand Up @@ -1025,35 +1068,27 @@ Occurrences:
[61:9..61:16): Mercury <- _empty_/Enums.Planet.Mercury.
[61:25..61:31): Planet -> _empty_/Enums.Planet#
[61:31..61:31): -> _empty_/Enums.Planet#`<init>`().
[61:52..61:52): -> scala/runtime/EnumValue#
[62:9..62:14): Venus <- _empty_/Enums.Planet.Venus.
[62:25..62:31): Planet -> _empty_/Enums.Planet#
[62:31..62:31): -> _empty_/Enums.Planet#`<init>`().
[62:52..62:52): -> scala/runtime/EnumValue#
[63:9..63:14): Earth <- _empty_/Enums.Planet.Earth.
[63:25..63:31): Planet -> _empty_/Enums.Planet#
[63:31..63:31): -> _empty_/Enums.Planet#`<init>`().
[63:53..63:53): -> scala/runtime/EnumValue#
[64:9..64:13): Mars <- _empty_/Enums.Planet.Mars.
[64:25..64:31): Planet -> _empty_/Enums.Planet#
[64:31..64:31): -> _empty_/Enums.Planet#`<init>`().
[64:52..64:52): -> scala/runtime/EnumValue#
[65:9..65:16): Jupiter <- _empty_/Enums.Planet.Jupiter.
[65:25..65:31): Planet -> _empty_/Enums.Planet#
[65:31..65:31): -> _empty_/Enums.Planet#`<init>`().
[65:52..65:52): -> scala/runtime/EnumValue#
[66:9..66:15): Saturn <- _empty_/Enums.Planet.Saturn.
[66:25..66:31): Planet -> _empty_/Enums.Planet#
[66:31..66:31): -> _empty_/Enums.Planet#`<init>`().
[66:52..66:52): -> scala/runtime/EnumValue#
[67:9..67:15): Uranus <- _empty_/Enums.Planet.Uranus.
[67:25..67:31): Planet -> _empty_/Enums.Planet#
[67:31..67:31): -> _empty_/Enums.Planet#`<init>`().
[67:52..67:52): -> scala/runtime/EnumValue#
[68:9..68:16): Neptune <- _empty_/Enums.Planet.Neptune.
[68:25..68:31): Planet -> _empty_/Enums.Planet#
[68:31..68:31): -> _empty_/Enums.Planet#`<init>`().
[68:52..68:52): -> scala/runtime/EnumValue#

expect/EtaExpansion.scala
-------------------------
Expand Down