Skip to content
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.

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

surface: Simplify extractSymbol - avoid .tree to make library working with Scala 3.4.2 #3533

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -172,15 +172,24 @@ private[surface] class CompileTimeSurfaceFactory[Q <: Quotes](using quotes: Q):
}

private def extractSymbol(t: TypeRepr) =
val dealiased = t.dealias
val symbolInOwner = t.typeSymbol.maybeOwner.declarations.find(_.name.toString == t.typeSymbol.name.toString)
symbolInOwner.map(_.tree) match
case Some(TypeDef(_, b: TypeTree)) if t == dealiased =>
// t.dealias does not dealias for path dependent types, so extracting the dealiased type from AST.
surfaceOf(b.tpe)
case _ =>
if t != dealiased then surfaceOf(dealiased)
else surfaceOf(t.simplified)
val dealiased = t.dealias

println(s"dealiased ${dealiased.show} of ${t.show}")
println(s" maybeOwner.declarations ${t.typeSymbol.maybeOwner.declarations.map(_.name).mkString(",")}")

if t != dealiased then
println(s"dealiased as ${dealiased.show}")
surfaceOf(dealiased)
else
// t.dealias does not dealias for path dependent types, so try to find a matching inner type
val symbolInOwner = t.typeSymbol.maybeOwner.declarations.find(_.name.toString == t.typeSymbol.name.toString)
symbolInOwner match
case Some(sym) =>
println(s"Match 1 $sym in $symbolInOwner as ${sym.typeRef.show} -> ${sym.typeRef.dealias.show}")
surfaceOf(sym.typeRef.dealias)
case _ =>
println(s"Match 2 $symbolInOwner as ${t.simplified.show}")
surfaceOf(t.simplified)

private def aliasFactory: Factory = {
case t if t.typeSymbol.typeRef.isOpaqueAlias =>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package wvlet.airframe.surface

import wvlet.airspec.AirSpec

// extracted from wvlet.airframe.di.PathDependentTypeTest

class PathDependentTypeTest extends AirSpec {
test("pass dependent types") {
import PathDependentType.*
val s = Surface.of[MyProfile#Backend#Database]
assert(s.name == "Database")
assert(s.toString == "Database:=DatabaseDef")
}
}

object PathDependentType {
object MyBackend extends MyBackend

class MyService(val p: MyProfile#Backend#Database)

trait MyProfile {
type Backend = MyBackend
}

trait MyBackend {
type Database = DatabaseDef
class DatabaseDef {
def hello = "hello my"
}
}
}
Loading