Merge pull request #3485 from niknetniko/master

Add support for \Vref
Hannah-Sten · Mar 8, 2024 · fa5549a · fa5549a
2 parents c5a6244 + e2d9110
commit fa5549a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/...hsten/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspection.kt b/...hsten/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspection.kt
@@ -54,7 +54,7 @@ open class LatexNonBreakingSpaceInspection : TexifyInspectionBase() {
     /**
      * Commands redefined by cleveref, such that no non-breaking space is needed anymore.
      */
-    private val cleverefRedefinitions = setOf(THREF, VREF, VREFRANGE, FULLREF).map { it.commandWithSlash }
+    private val cleverefRedefinitions = listOf(THREF.commandWithSlash) + setOf(VREF, VREFRANGE, FULLREF).map { it.command }.flatMap { c -> listOf(c, "$c*", c.replaceFirstChar { it.uppercase() }) }.map { "\\" + it }
 
     override val inspectionGroup = InsightGroup.LATEX
 

diff --git a/src/nl/hannahsten/texifyidea/lang/commands/LatexGenericRegularCommand.kt b/src/nl/hannahsten/texifyidea/lang/commands/LatexGenericRegularCommand.kt
@@ -385,6 +385,7 @@ enum class LatexGenericRegularCommand(
     VDOTS("vdots", display = "⋮"),
     VLINE("vline"),
     VREF("vref", "key".asRequired(Argument.Type.LABEL), dependency = VARIOREF),
+    VREF_CAPITAL("Vref", "key".asRequired(Argument.Type.LABEL), dependency = VARIOREF),
     VREFRANGE("vrefrange", "start".asRequired(), "end".asRequired(), "text".asOptional(), dependency = VARIOREF),
     VSPACE("vspace", "length".asRequired()),
     VSPACE_STAR("vspace*", "length".asRequired()),

diff --git a/...n/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspectionTest.kt b/...n/texifyidea/inspections/latex/typesetting/spacing/LatexNonBreakingSpaceInspectionTest.kt
@@ -132,4 +132,25 @@ class LatexNonBreakingSpaceInspectionTest : TexifyInspectionTestBase(LatexNonBre
             """.trimIndent()
         )
     }
+
+    fun `test no warning when using cleveref`() {
+        myFixture.configureByText(
+            LatexFileType,
+            """
+            \documentclass{article}
+            \usepakackage{varioref}
+            \usepackage{cleveref}
+            \begin{document}
+                \begin{figure}
+                    Figure text.
+                    \caption{Caption}
+                    \label{fig:some-figure}
+                \end{figure}
+            
+                I ref \vref{fig:some-figure}
+            \end{document}
+            """.trimIndent()
+        )
+        myFixture.checkHighlighting(false, false, true, false)
+    }
 }