Merge pull request #3829 from Hannah-Sten/various

Various small fixes
Hannah-Sten · Dec 29, 2024 · 63bed79 · 63bed79
2 parents 90b30fd + 0e2cfe4
commit 63bed79
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,9 @@
 * Fix parse error when using commands with arguments in parameter of \href or \url
 * Fix parse error when using parentheses in a group in a key value command argument
 * Fix parse erron when using inline math in cases* environment in inline math
-* 
+* Fix exceptions #3813, #3818
+* Fix false positive non-breaking space warning for \nameref
+* Fix confusion with \micro and \mu unicode characters
 
 ## [0.9.10-alpha.4] - 2024-12-21
 

diff --git a/src/nl/hannahsten/texifyidea/inspections/latex/probablebugs/LatexUnicodeInspection.kt b/src/nl/hannahsten/texifyidea/inspections/latex/probablebugs/LatexUnicodeInspection.kt
@@ -235,7 +235,7 @@ class LatexUnicodeInspection : TexifyInspectionBase() {
             // Try to find in lookup for special command
             val replacement: String?
             val command: LatexCommand? = if (inMathMode) {
-                LatexMathCommand.findByDisplay(c)?.firstOrNull()
+                LatexMathCommand.findByDisplay(c)?.firstOrNull() ?: LatexRegularCommand.findByDisplay(c)?.firstOrNull()
             }
             else {
                 LatexRegularCommand.findByDisplay(c)?.firstOrNull()

diff --git a/...hsten/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspection.kt b/...hsten/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspection.kt
@@ -46,6 +46,7 @@ open class LatexNonBreakingSpaceInspection : TexifyInspectionBase() {
         "\\Cref",
         "\\cpageref",
         "\\autoref",
+        "\\nameref",
         "\\citeauthor",
         "\\textcite",
         "\\Textcite"

diff --git a/src/nl/hannahsten/texifyidea/lang/commands/LatexSiunitxCommand.kt b/src/nl/hannahsten/texifyidea/lang/commands/LatexSiunitxCommand.kt
@@ -19,6 +19,7 @@ enum class LatexSiunitxCommand(
     NUM("num", "options".asOptional(), "number".asRequired(), dependency = SIUNITX),
     UNIT("unit", "options".asOptional(), "unit".asRequired(), dependency = SIUNITX),
     QTY("qty", "options".asOptional(), "number".asRequired(), "unit".asRequired(), dependency = SIUNITX),
+    MICRO("micro", display = "µ", dependency = SIUNITX),
     NUMLIST("numlist", "options".asOptional(), "numbers".asRequired(), dependency = SIUNITX),
     NUMPRODUCT("numproduct", "options".asOptional(), "numbers".asRequired(), dependency = SIUNITX),
     NUMRANGE("numrange", "options".asOptional(), "number1".asRequired(), "number2".asRequired(), dependency = SIUNITX),

diff --git a/src/nl/hannahsten/texifyidea/run/linuxpdfviewer/evince/EvinceInverseSearchListener.kt b/src/nl/hannahsten/texifyidea/run/linuxpdfviewer/evince/EvinceInverseSearchListener.kt
@@ -46,6 +46,7 @@ object EvinceInverseSearchListener {
             }
             catch (e: Exception) {
                 Notification("LaTeX", "Cannot get connection to DBus", "Check if the correct packages are installed", NotificationType.ERROR).notify(project)
+                return
             }
         }
 

diff --git a/src/nl/hannahsten/texifyidea/util/parser/Psi.kt b/src/nl/hannahsten/texifyidea/util/parser/Psi.kt
@@ -32,7 +32,7 @@ fun PsiElement.lineNumber(): Int? = containingFile.document()?.getLineNumber(tex
  */
 fun <T : PsiElement> PsiElement.childrenOfType(clazz: KClass<T>): Collection<T> {
     return runReadAction {
-        if (project.isDisposed || !this.isValid) {
+        if (!this.isValid || project.isDisposed) {
             emptyList()
         }
         else {

diff --git a/test/nl/hannahsten/texifyidea/inspections/latex/probablebugs/LatexUnicodeInspectionTest.kt b/test/nl/hannahsten/texifyidea/inspections/latex/probablebugs/LatexUnicodeInspectionTest.kt
@@ -95,6 +95,13 @@ class LatexUnicodeInspectionQuickFix : LatexUnicodeInspectionTest() {
         testNamedQuickFix("é", "\\'e", "Escape Unicode character", 2)
     }
 
+    fun `test mu`() {
+        setUnicodeSupport(false)
+
+        testNamedQuickFix("$ µ$", "$ \\micro$", "Escape Unicode character", 1)
+        testNamedQuickFix("$ μ$", "$ \\mu$", "Escape Unicode character", 1)
+    }
+
     @Suppress("NonAsciiCharacters")
     fun `test escape unicode quick fix î`() {
         setUnicodeSupport(false)
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,7 @@ object EvinceInverseSearchListener { @@
                 }
                 catch (e: Exception) {
                     Notification("LaTeX", "Cannot get connection to DBus", "Check if the correct packages are installed", NotificationType.ERROR).notify(project)
+                    return
                 }
             }
@@ Expand Down @@