Close global after compute ondemand semanticdb files

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

Hide file tree

Showing 2 changed files with 41 additions and 28 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()
@@ -321,32 +322,44 @@ object MainOps {
       args: ValidatedArgs,
       input: Input,
       file: AbsolutePath
-  ): PatchInternals.ResultWithContext = {
-    val tree = LazyValue.later { () =>
-      args.parse(input).get: Tree
-    }
-    val doc = SyntacticDocument(input, tree, args.diffDisable, args.config)
-    if (args.rules.isSemantic) {
-      val relpath = file.toRelative(args.sourceroot)
-      val sdoc = SemanticDocument.fromPath(
-        doc,
-        relpath,
-        args.classLoader,
-        args.symtab,
-        () => compileWithGlobal(args, doc)
-      )
-      val result =
-        args.rules.semanticPatch(sdoc, args.args.autoSuppressLinterErrors)
-      assertFreshSemanticDB(
-        input,
-        file,
-        result.fixed,
-        sdoc.internal.textDocument
-      )
-      result
-    } else {
-      args.rules.syntacticPatch(doc, args.args.autoSuppressLinterErrors)
-    }
+  ): PatchInternals.ResultWithContext =
+    try {
+      val tree = LazyValue.later { () =>
+        args.parse(input).get: Tree
+      }
+      val doc = SyntacticDocument(input, tree, args.diffDisable, args.config)
+      if (args.rules.isSemantic) {
+        val relpath = file.toRelative(args.sourceroot)
+        val sdoc = SemanticDocument.fromPath(
+          doc,
+          relpath,
+          args.classLoader,
+          args.symtab,
+          () => compileWithGlobal(args, doc)
+        )
+        val result =
+          args.rules.semanticPatch(sdoc, args.args.autoSuppressLinterErrors)
+        assertFreshSemanticDB(
+          input,
+          file,
+          result.fixed,
+          sdoc.internal.textDocument
+        )
+        result
+      } else {
+        args.rules.syntacticPatch(doc, args.args.autoSuppressLinterErrors)
+      }
+    } finally shutdownCompiler(args.global)
+
+  private def shutdownCompiler(global: LazyValue[Option[Global]]): Unit = {
+    global.foreach(_.foreach(g => {
+      try {
+        g.askShutdown()
+        g.closeCompat()
+      } catch {
+        case NonFatal(_) =>
+      }
+    }))
   }
 
   def previewPatches(