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.

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

Jump to bottom

Update scalafmt-core to 3.4.2 #125

Merged
merged 2 commits into from
Feb 8, 2022
Merged

Update scalafmt-core to 3.4.2 #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15d176d
Update scalafmt-core to 3.4.2
scala-steward Feb 6, 2022
344c853
Reformat with scalafmt 3.4.2
scala-steward Feb 6, 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
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.4.0
version = 3.4.2

runner.dialect = scala213

Expand Down
12 changes: 5 additions & 7 deletions src/main/scala/sangria/visitor/VisitorMacro.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,7 @@ class VisitMacro(val c: blackbox.Context) {
}

q"""
def ${TermName(
info.onEnterName)}(stack: VisitorStack[$tpe]): _root_.sangria.visitor.VisitorControlCommand = {
def ${TermName(info.onEnterName)}(stack: VisitorStack[$tpe]): _root_.sangria.visitor.VisitorControlCommand = {
var enterResult: _root_.sangria.visitor.VisitorControlCommand = _root_.sangria.visitor.VisitorCommand.Continue

..${transformersForType(info.tpe.asType.toType, tx).map(enterLogic)}
Expand Down Expand Up @@ -352,8 +351,7 @@ class VisitMacro(val c: blackbox.Context) {
}

q"""
def ${TermName(
info.onLeaveName)}(stack: VisitorStack[$tpe]): _root_.sangria.visitor.VisitorControlCommand = {
def ${TermName(info.onLeaveName)}(stack: VisitorStack[$tpe]): _root_.sangria.visitor.VisitorControlCommand = {
var leaveResult: _root_.sangria.visitor.VisitorControlCommand = _root_.sangria.visitor.VisitorCommand.Continue

..${transformersForType(info.tpe.asType.toType, tx).map(leaveLogic)}
Expand Down Expand Up @@ -398,9 +396,9 @@ class VisitMacro(val c: blackbox.Context) {
}

${m.memberType match {
case MemberType.List => q"builder.result().toList"
case _ => q"builder.result()"
}}
case MemberType.List => q"builder.result().toList"
case _ => q"builder.result()"
}}
"""

case MemberType.Special =>
Expand Down