Merge pull request #701 from kczulko/main

Use scala3 compatible wildcard import
typelevel · Jan 30, 2024 · 18f1406 · 18f1406
2 parents e186a10 + 85f5b10
commit 18f1406
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/codegen/src/main/scala/fs2/grpc/codegen/Fs2CodeGenerator.scala b/codegen/src/main/scala/fs2/grpc/codegen/Fs2CodeGenerator.scala
@@ -39,9 +39,9 @@ object Fs2CodeGenerator extends CodeGenApp {
       di: DescriptorImplicits
   ): Seq[PluginProtos.CodeGeneratorResponse.File] = {
     file.getServices.asScala.map { service =>
-      val p = new Fs2GrpcServicePrinter(service, fs2params.serviceSuffix, di)
-
       import di.{ExtendedServiceDescriptor, ExtendedFileDescriptor}
+
+      val p = new Fs2GrpcServicePrinter(service, fs2params.serviceSuffix, di)
       val code = p.printService(FunctionalPrinter()).result()
       val b = PluginProtos.CodeGeneratorResponse.File.newBuilder()
       b.setName(file.scalaDirectory + "/" + service.name + s"${fs2params.serviceSuffix}.scala")

diff --git a/codegen/src/main/scala/fs2/grpc/codegen/Fs2GrpcServicePrinter.scala b/codegen/src/main/scala/fs2/grpc/codegen/Fs2GrpcServicePrinter.scala
@@ -138,7 +138,7 @@ class Fs2GrpcServicePrinter(service: ServiceDescriptor, serviceSuffix: String, d
 
   def printService(printer: FunctionalPrinter): FunctionalPrinter = {
     printer
-      .add(s"package $servicePkgName", "", "import _root_.cats.syntax.all._", "")
+      .add(s"package $servicePkgName", "", s"import _root_.cats.syntax.all.${service.getFile.V.WildcardImport}", "")
       .call(serviceTrait)
       .newline
       .call(serviceObject)