From 6eb1633e0209ab28ffbe94c85c43c7d32dc5b103 Mon Sep 17 00:00:00 2001 From: Tobias Bordenca Date: Wed, 16 Jan 2019 15:48:26 +0100 Subject: [PATCH 1/3] Add missing final flag in ValDef and DefDef --- library/src/scala/tasty/reflect/Printers.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/scala/tasty/reflect/Printers.scala b/library/src/scala/tasty/reflect/Printers.scala index 512e0e56e333..ef1a105c84dc 100644 --- a/library/src/scala/tasty/reflect/Printers.scala +++ b/library/src/scala/tasty/reflect/Printers.scala @@ -690,6 +690,7 @@ trait Printers val flags = vdef.symbol.flags if (flags.is(Flags.Implicit)) this += highlightKeyword("implicit ", color) if (flags.is(Flags.Override)) this += highlightKeyword("override ", color) + if (flags.is(Flags.Final) && !flags.is(Flags.Object)) this += highlightKeyword("final ", color) printProtectedOrPrivate(vdef) @@ -739,6 +740,7 @@ trait Printers if (flags.is(Flags.Implicit)) this += highlightKeyword("implicit ", color) if (flags.is(Flags.Inline)) this += highlightKeyword("inline ", color) if (flags.is(Flags.Override)) this += highlightKeyword("override ", color) + if (flags.is(Flags.Final) && !flags.is(Flags.Object)) this += highlightKeyword("final ", color) printProtectedOrPrivate(ddef) From 306464d9358e648846deb0d5ff638e35889e9dfd Mon Sep 17 00:00:00 2001 From: Tobias Bordenca Date: Wed, 16 Jan 2019 16:11:25 +0100 Subject: [PATCH 2/3] Handle default initialisers --- library/src/scala/tasty/reflect/Printers.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/src/scala/tasty/reflect/Printers.scala b/library/src/scala/tasty/reflect/Printers.scala index ef1a105c84dc..74b13ccc3a75 100644 --- a/library/src/scala/tasty/reflect/Printers.scala +++ b/library/src/scala/tasty/reflect/Printers.scala @@ -761,6 +761,9 @@ trait Printers } this + case Term.Ident("_") => + this += "_" + case IsTerm(tree @ Term.Ident(_)) => printType(tree.tpe) From 7cce411ac9cc0323546aee3cf530acbafe13acbc Mon Sep 17 00:00:00 2001 From: Tobias Bordenca Date: Wed, 16 Jan 2019 16:13:14 +0100 Subject: [PATCH 3/3] Remove duplicate type arguments --- library/src/scala/tasty/reflect/Printers.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/library/src/scala/tasty/reflect/Printers.scala b/library/src/scala/tasty/reflect/Printers.scala index 74b13ccc3a75..2c6706f248fe 100644 --- a/library/src/scala/tasty/reflect/Printers.scala +++ b/library/src/scala/tasty/reflect/Printers.scala @@ -606,7 +606,6 @@ trait Printers printTypeTree(parent) case IsTerm(Term.TypeApply(fun, targs)) => printParent(fun) - inSquare(printTypeOrBoundsTrees(targs, ", ")) case IsTerm(Term.Apply(fun, args)) => printParent(fun) inParens(printTrees(args, ", "))