Don't recursively create output directories and remember files to cle…

…an up, fix #3322
Hannah-Sten · Nov 22, 2023 · 7906d27 · 7906d27
1 parent c0e5225
commit 7906d27
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/resources/inspectionDescriptions/LatexUndefinedCommand.html b/resources/inspectionDescriptions/LatexUndefinedCommand.html
@@ -1,5 +1,6 @@
 <html>
     <body>
         The command was not found in LaTeX or any included package.
+        This inspection is still experimental and a work in progress, so may have (many) false positives.
     </body>
 </html>
diff --git a/src/nl/hannahsten/texifyidea/run/latex/LatexCommandLineState.kt b/src/nl/hannahsten/texifyidea/run/latex/LatexCommandLineState.kt
@@ -68,6 +68,7 @@ open class LatexCommandLineState(environment: ExecutionEnvironment, private val
         else {
             setOf()
         }
+        runConfig.filesToCleanUpIfEmpty.addAll(createdOutputDirectories)
 
         val handler = createHandler(mainFile, compiler)
         val isMakeindexNeeded = runMakeindexIfNeeded(handler, mainFile, runConfig.filesToCleanUp)
@@ -77,7 +78,7 @@ open class LatexCommandLineState(environment: ExecutionEnvironment, private val
         if (!isLastCompile(isMakeindexNeeded, handler)) return handler
         scheduleBibtexRunIfNeeded(handler)
         schedulePdfViewerIfNeeded(handler)
-        scheduleFileCleanup(runConfig.filesToCleanUp, createdOutputDirectories, handler)
+        scheduleFileCleanup(runConfig.filesToCleanUp, runConfig.filesToCleanUpIfEmpty, handler)
 
         return handler
     }

diff --git a/src/nl/hannahsten/texifyidea/run/latex/LatexOutputPath.kt b/src/nl/hannahsten/texifyidea/run/latex/LatexOutputPath.kt
@@ -154,6 +154,8 @@ class LatexOutputPath(private val variant: String, var contentRoot: VirtualFile?
 
         // Create output paths (see issue #70 on GitHub)
         files.asSequence()
+            // Ignore all output directories to avoid exponential recursion
+            .filter { !it.path.contains(outPath) }
             .mapNotNull {
                 FileUtil.pathRelativeTo(includeRoot?.path ?: return@mapNotNull null, it.path)
             }

diff --git a/src/nl/hannahsten/texifyidea/run/latex/LatexRunConfiguration.kt b/src/nl/hannahsten/texifyidea/run/latex/LatexRunConfiguration.kt
@@ -176,6 +176,7 @@ class LatexRunConfiguration(
     // In order to propagate information about which files need to be cleaned up at the end between one run of the run config
     // (for example makeindex) and the last run, we save this information temporarily here while the run configuration is running.
     val filesToCleanUp = mutableListOf<File>()
+    val filesToCleanUpIfEmpty = mutableSetOf<File>()
 
     override fun getConfigurationEditor(): SettingsEditor<out RunConfiguration> {
         return LatexSettingsEditor(project)