Revert "Fix Kotlin compiler may not in all cases be released."

This reverts commit 3d2b20f.
pinterest · Oct 14, 2021 · 295cbce · 295cbce
1 parent 2440159
commit 295cbce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/KtLint.kt b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/KtLint.kt
@@ -169,16 +169,16 @@ public object KtLint {
                     }
                 } catch (e: Exception) {
                     val (line, col) = preparedCode.positionInTextLocator(node.startOffset)
-                    kotlinPsiFileFactory.releasePsiFileFactory()
                     throw RuleExecutionException(line, col, fqRuleId, e)
                 }
             }
         }
 
-        kotlinPsiFileFactory.releasePsiFileFactory()
         errors
             .sortedWith { l, r -> if (l.line != r.line) l.line - r.line else l.col - r.col }
             .forEach { e -> params.cb(e, false) }
+
+        kotlinPsiFileFactory.releasePsiFileFactory()
     }
 
     @OptIn(FeatureInAlphaState::class)
@@ -400,7 +400,6 @@ public object KtLint {
                             }
                         }
                     } catch (e: Exception) {
-                        kotlinPsiFileFactory.releasePsiFileFactory()
                         // line/col cannot be reliably mapped as exception might originate from a node not present
                         // in the original AST
                         throw RuleExecutionException(0, 0, fqRuleId, e)
@@ -429,7 +428,6 @@ public object KtLint {
                         }
                     } catch (e: Exception) {
                         val (line, col) = preparedCode.positionInTextLocator(node.startOffset)
-                        kotlinPsiFileFactory.releasePsiFileFactory()
                         throw RuleExecutionException(line, col, fqRuleId, e)
                     }
                 }
@@ -441,7 +439,6 @@ public object KtLint {
         }
 
         if (!mutated) {
-            kotlinPsiFileFactory.releasePsiFileFactory()
             return params.text
         }
 

diff --git a/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/KotlinPsiFileFactory.kt b/ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/KotlinPsiFileFactory.kt
@@ -34,16 +34,18 @@ internal class KotlinPsiFileFactory {
     private val acquireCounter = AtomicInteger(0)
     private val initializerLock = Any()
 
-    internal fun acquirePsiFileFactory(isFromCli: Boolean): PsiFileFactory = synchronized(initializerLock) {
+    internal fun acquirePsiFileFactory(isFromCli: Boolean): PsiFileFactory {
         acquireCounter.incrementAndGet()
-        return psiFileFactory ?: initializePsiFileFactory(isFromCli).also {
-            psiFileFactory = it
+        return psiFileFactory ?: synchronized(initializerLock) {
+            initializePsiFileFactory(isFromCli).also {
+                psiFileFactory = it
+            }
         }
     }
 
-    internal fun releasePsiFileFactory() = synchronized(initializerLock) {
+    internal fun releasePsiFileFactory() {
         val acquiredCount = acquireCounter.decrementAndGet()
-        if (acquiredCount == 0) {
+        if (acquiredCount == 0) synchronized(initializerLock) {
             tempFiles?.toFile()?.deleteRecursively()
             tempFiles = null
             psiFileFactory = null