Close global after compute ondemand semanticdb files

scalacenter · Mar 4, 2021 · 3e8fb47 · 3e8fb47
1 parent 32a03fb
commit 3e8fb47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala b/scalafix-cli/src/main/scala/scalafix/internal/v1/Args.scala
@@ -383,7 +383,7 @@ case class Args(
         settings.YpresentationAnyThread.value = true
         settings.classpath.value = validatedClasspath.syntax
         val reporter = new StoreReporter()
-        new Global(settings, reporter)
+        new Global(settings, reporter, "Scalafix")
       })
     }
 

diff --git a/scalafix-cli/src/main/scala/scalafix/internal/v1/MainOps.scala b/scalafix-cli/src/main/scala/scalafix/internal/v1/MainOps.scala
@@ -12,6 +12,7 @@ import java.nio.file.attribute.BasicFileAttributes
 
 import scala.annotation.tailrec
 import scala.collection.mutable.ListBuffer
+import scala.tools.nsc.interactive.Global
 import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
@@ -37,6 +38,7 @@ import org.typelevel.paiges.{Doc => D}
 import scalafix.Versions
 import scalafix.cli.ExitStatus
 import scalafix.interfaces.ScalafixEvaluation
+import scalafix.internal.compat.CompilerCompat.XtensionGlobal
 import scalafix.internal.config.PrintStreamReporter
 import scalafix.internal.diff.DiffUtils
 import scalafix.internal.interfaces.ScalafixEvaluationImpl
@@ -267,7 +269,6 @@ object MainOps {
           )
         } catch {
           case NonFatal(_) =>
-            args.global.restart()
             TextDocument.defaultInstance
         }
       g.unitOfFile.clear()
@@ -326,7 +327,7 @@ object MainOps {
       args.parse(input).get: Tree
     }
     val doc = SyntacticDocument(input, tree, args.diffDisable, args.config)
-    if (args.rules.isSemantic) {
+    val results = if (args.rules.isSemantic) {
       val relpath = file.toRelative(args.sourceroot)
       val sdoc = SemanticDocument.fromPath(
         doc,
@@ -347,6 +348,18 @@ object MainOps {
     } else {
       args.rules.syntacticPatch(doc, args.args.autoSuppressLinterErrors)
     }
+    // close global if evaluated
+    cleanGlobalRessources(args.global)
+    results
+  }
+
+  private def cleanGlobalRessources(global: LazyValue[Option[Global]]): Unit = {
+    if (global.isEvaluated)
+      global.value.foreach { g =>
+        g.askShutdown()
+        g.closeCompat()
+      }
+    else ()
   }
 
   def previewPatches(