0.9.7-alpha.1

Hannah-Sten · Jun 6, 2024 · b284a87 · b284a87
1 parent 8bf0352
commit b284a87
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
 
 ### Fixed
 
+## [0.9.7-alpha.1] - 2024-06-06
+
+### Added
+
+* Support TeX Live docker image
+* Formatter support for plain TeX \if-statements
+* Index files from the TEXINPUTS variable, for autocompletion
+
 ## [0.9.6] - 2024-06-01
 
 Welcome to TeXiFy IDEA 0.9.6! This release fixes an issue with the table insertion wizard, fixes pasting from a pdf file, and more.
@@ -358,7 +366,8 @@ Thanks to @jojo2357 and @MisterDeenis for contributing to this release!
 * Fix some intention previews. ([#2796](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2796))
 * Other small bug fixes and improvements. ([#2776](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2776), [#2774](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2774), [#2765](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2765)-[#2773](https://github.com/Hannah-Sten/TeXiFy-IDEA/issues/2773))
 
-[Unreleased]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.6...HEAD
+[Unreleased]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.7-alpha.1...HEAD
+[0.9.7-alpha.1]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.6...v0.9.7-alpha.1
 [0.9.6]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.5...v0.9.6
 [0.9.5]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.4...v0.9.5
 [0.9.4]: https://github.com/Hannah-Sten/TeXiFy-IDEA/compare/v0.9.3...v0.9.4

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-pluginVersion = 0.9.6
+pluginVersion = 0.9.7-alpha.1
 
 #     Info about build ranges: https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
 #    Note that an xyz branch corresponds to version 20xy.z and a since build of xyz.*

diff --git a/resources/META-INF/actions/actions.xml b/resources/META-INF/actions/actions.xml
@@ -18,7 +18,7 @@
         <!-- LaTeX Analyze menu -->
         <action class="nl.hannahsten.texifyidea.action.analysis.WordCountAction" id="texify.analysis.WordCount"
                 text="_Word Count" description="Estimate the word count of the currently active .tex file and inclusions." icon="nl.hannahsten.texifyidea.TexifyIcons.WORD_COUNT">
-            <keyboard-shortcut first-keystroke="control alt W" keymap="$default"/>
+            <keyboard-shortcut first-keystroke="alt W" keymap="$default"/>
             <override-text place="GoToAction" text="LaTeX _Word Count"/>
             <!-- Prior to idea 213, the Code menu was called Analyze (but only in IntelliJ) -->
             <add-to-group group-id="CodeMenu" anchor="last"/>

diff --git a/src/nl/hannahsten/texifyidea/action/analysis/WordCountAction.kt b/src/nl/hannahsten/texifyidea/action/analysis/WordCountAction.kt
@@ -4,6 +4,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.ui.DialogBuilder
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -71,6 +72,8 @@ open class WordCountAction : AnAction() {
         // Prefer texcount, I think it is slightly more accurate
         val dialog = if (SystemEnvironment.isAvailable("texcount")) {
             val root = psiFile.findRootFile().virtualFile
+            // Make sure the file is written to disk before running an external tool on it
+            FileDocumentManager.getInstance().apply { saveDocument(getDocument(root) ?: return@apply) }
             val (output, exitCode) = runCommandWithExitCode("texcount", "-1", "-inc", "-sum", root.name, workingDirectory = File(root.parent.path))
             if (exitCode == 0 && output?.toIntOrNull() != null) {
                 makeDialog(psiFile, output.toInt())

diff --git a/src/nl/hannahsten/texifyidea/util/LatexmkRcFileFinder.kt b/src/nl/hannahsten/texifyidea/util/LatexmkRcFileFinder.kt
@@ -147,9 +147,9 @@ object LatexmkRcFileFinder {
         if (projectDir?.isValid == false) return null
         projectDir?.findChild(".latexmkrc")?.let { return getTexinputs(it) }
         projectDir?.findChild("latexmkrc")?.let { return getTexinputs(it) }
-        projectDir?.children?.forEach { directory ->
-            directory?.findChild(".latexmkrc")?.let { return getTexinputs(it) }
-            directory?.findChild("latexmkrc")?.let { return getTexinputs(it) }
+        projectDir?.children?.forEach { childDir ->
+            childDir?.findChild(".latexmkrc")?.let { return getTexinputs(it) }
+            childDir?.findChild("latexmkrc")?.let { return getTexinputs(it) }
         }
         return null
     }