Skip to content

Commit 0dcb036

Browse files
authored
Merge pull request #242 from Jentsch/resolve-scalameta-warning
Resolve deprecated Scalameta extractors
2 parents 45ae0c0 + 7a31f42 commit 0dcb036

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

src/main/scala/com/thoughtworks/Example.scala

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -305,42 +305,43 @@ object Example extends AutoPlugin {
305305
defnTree match {
306306
case Defn.Object(_, name, template: Template) =>
307307
templateTestTree(name, template)
308-
case Defn.Trait(_, name, _, _, template: Template) =>
309-
templateTestTree(name, template)
310-
case Defn.Class(_, name, _, _, template: Template) =>
311-
templateTestTree(name, template)
312-
case Defn.Def(_, name, _, _, _, _) =>
313-
leafTestTree(name)
314-
case Defn.Type(_, name, _, _) =>
315-
leafTestTree(name)
308+
case trai : Defn.Trait =>
309+
templateTestTree(trai.name, trai.templ)
310+
case clazz: Defn.Class =>
311+
templateTestTree(clazz.name, clazz.templ)
312+
case de: Defn.Def =>
313+
leafTestTree(de.name)
314+
case typ: Defn.Type =>
315+
leafTestTree(typ.name)
316316
case Defn.Val(_, Seq(Pat.Var(name)), _, _) =>
317317
leafTestTree(name)
318-
case Defn.Var(_, Seq(Pat.Var(name)), _, _) =>
318+
case va: Defn.Var if va.pats.length == 1 && va.pats.head.isInstanceOf[Pat.Var] =>
319+
val Seq(Pat.Var(name)) = va.pats
319320
leafTestTree(name)
320-
case Defn.Macro(_, name, _, _, _, _) =>
321-
leafTestTree(name)
322-
case Defn.ExtensionGroup(_, paramss, stat) =>
321+
case macr: Defn.Macro =>
322+
leafTestTree(macr.name)
323+
case group: Defn.ExtensionGroup =>
323324
val Some(name) =
324-
paramss.collectFirst(Function.unlift(_.collectFirst {
325+
group.paramss.collectFirst(Function.unlift(_.collectFirst {
325326
case param
326327
if !param.mods.exists(Set(Mod.Implicit, Mod.Using)) =>
327328
param.name
328329
}))
329330
defnTestTree(
330331
name,
331-
stat match {
332+
group.body match {
332333
case Term.Block(stats) =>
333334
stats
334335
case stat => List(stat)
335336
}
336337
)
337-
case Defn.Given(_, name, _, _, template) =>
338-
templateTestTree(name, template)
339-
case Defn.GivenAlias(_, name, _, _, _, _) =>
340-
leafTestTree(name)
338+
case give: Defn.Given =>
339+
templateTestTree(give.name, give.templ)
340+
case alias: Defn.GivenAlias =>
341+
leafTestTree(alias.name)
341342
}
342-
case Ctor.Secondary(_, name, _, _, _) =>
343-
leafTestTree(name)
343+
case ctor: Ctor.Secondary =>
344+
leafTestTree(ctor.name)
344345
case _ =>
345346
Nil
346347
}

0 commit comments

Comments
 (0)