Add support for \includesvg

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 
 ### Added
+* Add support for \includesvg
 
 ### Fixed
 * Fix basic case of false positive of duplicate label inspection when user defined \if commands are used

src/nl/hannahsten/texifyidea/completion/pathcompletion/LatexGraphicsPathProvider.kt

@@ -3,10 +3,11 @@
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import nl.hannahsten.texifyidea.index.LatexIncludesIndex
 import nl.hannahsten.texifyidea.lang.commands.LatexGenericRegularCommand
 import nl.hannahsten.texifyidea.psi.LatexCommands
 import nl.hannahsten.texifyidea.psi.LatexNormalText
 import nl.hannahsten.texifyidea.util.files.*
+import nl.hannahsten.texifyidea.util.magic.CommandMagic
 import nl.hannahsten.texifyidea.util.magic.cmd
 import nl.hannahsten.texifyidea.util.parser.childrenOfType
 import java.io.File
@@ -33,7 +34,7 @@
      */
     fun getGraphicsPathsInFileSet(file: PsiFile): List<String> {
         val graphicsPaths = mutableListOf<String>()
-        val graphicsPathCommands = file.commandsInFileSet().filter { it.name == LatexGenericRegularCommand.GRAPHICSPATH.cmd }
+        val graphicsPathCommands = file.commandsInFileSet().filter { CommandMagic.graphicPathsCommands.map { it.cmd }.contains(it.name) }
 
         // Is a graphicspath defined?
         if (graphicsPathCommands.isNotEmpty()) {
@@ -95,7 +96,7 @@
      * Get all the graphics paths defined by one \graphicspaths command.
      */
     private fun LatexCommands.getGraphicsPaths(): List<String> {
-        if (name != LatexGenericRegularCommand.GRAPHICSPATH.cmd) return emptyList()
+        if (!CommandMagic.graphicPathsCommands.map { it.cmd }.contains(name)) return emptyList()
         return parameterList.firstNotNullOfOrNull { it.requiredParam }
             // Each graphics path is in a group.
             ?.childrenOfType(LatexNormalText::class)

src/nl/hannahsten/texifyidea/lang/LatexPackage.kt

@@ -83,6 +83,7 @@ open class LatexPackage @JvmOverloads constructor(
         val SPLITINDEX = LatexPackage("splitindex")
         val STMARYRD = LatexPackage("stmaryrd")
         val SUBFILES = LatexPackage("subfiles")
+        val SVG = LatexPackage("svg")
         val TABULARRAY = LatexPackage("tabularray")
         val TCOLORBOX = LatexPackage("tcolorbox")
         val TEXTCOMP = LatexPackage("textcomp")

src/nl/hannahsten/texifyidea/lang/commands/LatexGenericRegularCommand.kt

@@ -11,6 +11,7 @@ import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.GLOSSARIES
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.GRAPHICX
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.MATHTOOLS
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.NTHEOREM
+import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.SVG
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.TEXTCOMP
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.ULEM
 import nl.hannahsten.texifyidea.lang.LatexPackage.Companion.VARIOREF
@@ -147,6 +148,7 @@ enum class LatexGenericRegularCommand(
     INPUTMINTED("inputminted", "language".asRequired(Argument.Type.MINTED_FUNTIME_LAND), RequiredFileArgument("sourcefile", true, false, ""), dependency = LatexPackage.MINTED),
     INCLUDEGRAPHICS("includegraphics", "key-val-list".asOptional(), RequiredPicturePathArgument("imagefile", isAbsolutePathSupported = true, commaSeparatesArguments = false, FileMagic.graphicFileExtensions, supportsAnyExtension = false), dependency = GRAPHICX),
     INCLUDEONLY("includeonly", RequiredFileArgument("sourcefile", false, true, "tex")),
+    INCLUDESVG("includesvg", "options".asOptional(), RequiredPicturePathArgument("svg file", isAbsolutePathSupported = true, commaSeparatesArguments = false, extension = listOf("svg"), supportsAnyExtension = false), dependency = SVG),
     INDEXNAME("indexname", "name".asRequired()),
     INDEXSPACE("indexspace"),
     INDEX("intex", "entry".asRequired()),
@@ -303,6 +305,7 @@ enum class LatexGenericRegularCommand(
     SUBSUBSECTION_STAR("subsubsection*", "title".asRequired(Argument.Type.TEXT)),
     SUBSUBSECTIONMARK("subsubsectionmark", "code".asRequired()),
     SUPPRESSFLOATS("suppressfloats", "placement".asOptional()),
+    SVGPATH("svgpath", RequiredFolderArgument("foldername"), dependency = SVG),
     SYMBOL("symbol", "n".asRequired()),
     TABCOLSEP("tabcolsep"),
     TABLENAME("tablename", "name".asRequired(Argument.Type.TEXT)),

src/nl/hannahsten/texifyidea/reference/InputFileReference.kt

@@ -148,7 +148,8 @@ class InputFileReference(
         // Try graphicspaths
         if (targetFile == null) {
             // If we are not building the fileset, we can make use of it
-            if (!isBuildingFileset && element.containingFile.includedPackages().contains(LatexGenericRegularCommand.GRAPHICSPATH.dependency)) {
+            val includedPackages = element.containingFile.includedPackages()
+            if (!isBuildingFileset && CommandMagic.graphicPathsCommands.any { includedPackages.contains(it.dependency) }) {
                 // Add the graphics paths to the search paths
                 searchPaths.addAll(LatexGraphicsPathProvider().getGraphicsPathsInFileSet(element.containingFile))
             }

src/nl/hannahsten/texifyidea/util/magic/CommandMagic.kt

@@ -378,6 +378,8 @@ object CommandMagic {
         "\\DeclareDocumentEnvironment"
     )
 
+    val graphicPathsCommands = listOf(GRAPHICSPATH, SVGPATH)
+
     /**
      * Commands that should not have the given file extensions.
      */