Add support for systemd network (link,netdev,network) files

buildSrc/src/main/resources/resolve-xinclude.xslt

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:xi="http://www.w3.org/2001/XInclude">
+
+  <!-- Identity template: Copies everything as-is -->
+  <xsl:template match="@* | node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()"/>
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Process XInclude -->
+  <xsl:template match="xi:include">
+    <xsl:variable name="file" select="@href"/>
+    <xsl:apply-templates select="document($file)/*"/>
+  </xsl:template>
+
+</xsl:stylesheet>

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/UnitFileIcon.kt

@@ -17,4 +17,7 @@ object UnitFileIcon {
   val SWAP = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/swap.svg", UnitFileIcon::class.java)
   val TARGET = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/target.svg", UnitFileIcon::class.java)
   val TIMER = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/timer.svg", UnitFileIcon::class.java)
+  val LINK = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/link.svg", UnitFileIcon::class.java)
+  val NETDEV = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/netdev.svg", UnitFileIcon::class.java)
+  val NETWORK = IconLoader.getIcon("/net/sjrx/intellij/plugins/systemdunitfiles/network.svg", UnitFileIcon::class.java)
 }

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/filetypes/LinkFileType.kt

@@ -0,0 +1,32 @@
+package net.sjrx.intellij.plugins.systemdunitfiles.filetypes
+
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileIcon
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileLanguage
+import org.jetbrains.annotations.Nls
+import javax.swing.Icon
+
+class LinkFileType private constructor() : AbstractUnitFileType(UnitFileLanguage.INSTANCE) {
+  override fun getName(): String {
+    return "Network Device Configuration (systemd-networkd)"
+  }
+
+  override fun getDescription(): String {
+    return displayName
+  }
+
+  override fun getDefaultExtension(): String {
+    return "link"
+  }
+
+  override fun getIcon(): Icon? {
+    return UnitFileIcon.LINK
+  }
+
+  override fun getDisplayName(): @Nls String {
+    return "Network Device Configuration (systemd-networkd)"
+  }
+
+  companion object {
+    val INSTANCE = LinkFileType()
+  }
+}

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/filetypes/NetDevFileType.kt

@@ -0,0 +1,32 @@
+package net.sjrx.intellij.plugins.systemdunitfiles.filetypes
+
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileIcon
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileLanguage
+import org.jetbrains.annotations.Nls
+import javax.swing.Icon
+
+class NetDevFileType private constructor() : AbstractUnitFileType(UnitFileLanguage.INSTANCE) {
+  override fun getName(): String {
+    return "Virtual Network Device Configuration (systemd-networkd)"
+  }
+
+  override fun getDescription(): String {
+    return displayName
+  }
+
+  override fun getDefaultExtension(): String {
+    return "netdev"
+  }
+
+  override fun getIcon(): Icon? {
+    return UnitFileIcon.NETDEV
+  }
+
+  override fun getDisplayName(): @Nls String {
+    return "Virtual Network Device Configuration (systemd-networkd)"
+  }
+
+  companion object {
+    val INSTANCE = NetDevFileType()
+  }
+}

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/filetypes/NetworkFileType.kt

@@ -0,0 +1,32 @@
+package net.sjrx.intellij.plugins.systemdunitfiles.filetypes
+
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileIcon
+import net.sjrx.intellij.plugins.systemdunitfiles.UnitFileLanguage
+import org.jetbrains.annotations.Nls
+import javax.swing.Icon
+
+class NetworkFileType private constructor() : AbstractUnitFileType(UnitFileLanguage.INSTANCE) {
+  override fun getName(): String {
+    return "Network Configuration (systemd-networkd)"
+  }
+
+  override fun getDescription(): String {
+    return displayName
+  }
+
+  override fun getDefaultExtension(): String {
+    return "network"
+  }
+
+  override fun getIcon(): Icon? {
+    return UnitFileIcon.NETWORK
+  }
+
+  override fun getDisplayName(): @Nls String {
+    return "Network Configuration (systemd-networkd)"
+  }
+
+  companion object {
+    val INSTANCE = NetworkFileType()
+  }
+}

src/main/resources/META-INF/plugin.xml

@@ -48,6 +48,9 @@
     <fileType name="Target unit configuration for systemd" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.TargetFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="target"/>
     <fileType name="Timer unit configuration for systemd" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.TimerFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="timer"/>
     <fileType name="Nspawn container systemd container images" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.NSpawnFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="nspawn"/>
+    <fileType name="Network Device Configuration (systemd-networkd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.LinkFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="link"/>
+    <fileType name="Virtual Network Device Configuration (systemd-networkd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.NetDevFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="netdev"/>
+    <fileType name="Network Configuration (systemd-networkd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.filetypes.NetworkFileType" fieldName="INSTANCE" language="Unit File (systemd)" extensions="network"/>
 
     <lang.commenter language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.commenter.UnitFileCommenter"/>
     <lang.documentationProvider language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.documentation.UnitFileDocumentationProvider"/>
@@ -58,26 +61,25 @@
     <annotator language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.annotators.PropertyIsNotInSectionAnnotator"/>
     <annotator language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.annotators.PidFileOptionWarning"/>
     <localInspection implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.inspections.UnknownKeyInSectionInspection"
-                     groupPath="Unit files (systemd)"
+                     groupPath="Unit files (systemd)" language="Unit File (systemd)"
                      shortName="UnknownKeyInSection"     displayName="Unknown option in section"
                      groupName="Validity"                                   enabledByDefault="true" level="WARNING"/>
     <localInspection implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.inspections.InvalidValueInspection"
-                     groupPath="Unit files (systemd)"
+                     groupPath="Unit files (systemd)" language="Unit File (systemd)"
                      shortName="InvalidValue" displayName="Invalid value for option"
                      groupName="Validity"     enabledByDefault="true" level="WARNING"/>
     <localInspection implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.inspections.DeprecatedOptionsInspection"
-                     groupPath="Unit files (systemd)"
+                     groupPath="Unit files (systemd)" language="Unit File (systemd)"
                      shortName="DeprecatedKey" displayName="Deprecated options"
                      groupName="Deprecation"     enabledByDefault="true" level="WARNING"/>
     <localInspection implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.inspections.ShellSyntaxInExecDirectiveInspection"
-                     groupPath="Unit files (systemd)"
+                     groupPath="Unit files (systemd)" language="Unit File (systemd)"
                      shortName="ShellSyntaxInExecDirective" displayName="Unsupported shell meta-characters"
                      groupName="Validity" enabledByDefault="true" level="WARNING"/>
     <localInspection implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.inspections.MissingRequiredKeyInspection"
-                     groupPath="Unit files (systemd)"
+                     groupPath="Unit files (systemd)" language="Unit File (systemd)"
                      shortName="MissingRequiredKey" displayName="Missing required key"
                      groupName="Validity" enabledByDefault="true" level="ERROR"/>
-
     <completion.contributor language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.completion.UnitFileKeyCompletionContributor"/>
     <completion.contributor language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.completion.UnitFileValueCompletionContributor"/>
     <completion.contributor language="Unit File (systemd)" implementationClass="net.sjrx.intellij.plugins.systemdunitfiles.completion.UnitFileSectionCompletionContributor"/>