Resolves #90 - Add support for systemd networking

Author: Steve Ramage

buildSrc/src/main/groovy/GenerateDataFromManPages.groovy

@@ -647,7 +647,7 @@ class GenerateDataFromManPages extends DefaultTask {
 
       NodeList paragraphList = (NodeList)xpath.evaluate("description/paragraph", parameterNode, XPathConstants.NODESET)
 
-      Matcher match = (variableName =~ /(\w+)=(.*)/)
+      Matcher match = (variableName =~ /([^=]+)=(.*)/)
 
       match.find()
       if (match.groupCount() != 2) {

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/SemanticDataRepository.kt

@@ -21,7 +21,6 @@ import java.io.InputStreamReader
 import java.nio.charset.StandardCharsets
 import java.util.*
 import java.util.regex.Pattern
-import kotlin.collections.HashMap
 
 enum class FileClass(val fileClass: String, val gperfFile: String) {
   UNIT_FILE("unit", "load-fragment-gperf.gperf"),
@@ -45,6 +44,10 @@ class SemanticDataRepository private constructor() {
 
   private val fileClassToUndocumentedOptionInfo: MutableMap<String, MutableMap<String, Map<String, KeywordData>>>
 
+  private val fileClassToValidatorConfigToSectionKeys: MutableMap<String, MutableMap<String, MutableSet<String>>> = HashMap()
+
+  private val fileClassToSectionKeyToValidatorConfig: MutableMap<String, MutableMap<String, String>> = HashMap()
+
   class KeywordData {
     var declaredUnderKeyword: String? = null
     var declaredInFile: String? = null
@@ -68,17 +71,22 @@ class SemanticDataRepository private constructor() {
     for (fileClass in FileClass.entries) {
       val name = SEMANTIC_DATA_ROOT + fileClass.gperfFile
       val resource = this.javaClass.classLoader.getResourceAsStream(name)
+      fileClassToValidatorConfigToSectionKeys.put(fileClass.fileClass, HashMap())
+      fileClassToSectionKeyToValidatorConfig.put(fileClass.fileClass, HashMap())
+
       if (resource != null) {
         try {
           BufferedReader(InputStreamReader(resource)).use { fr ->
             var line: String?
             while (fr.readLine().also { line = it } != null) {
-              val m = LINE_MATCHER.matcher(line)
+              val lineWithoutComments = line?.replace(Regex("/\\*.*?\\*/"), "")
+              val m = LINE_MATCHER.matcher(lineWithoutComments)
               if (m.find()) {
                 val section = m.group("Section")
                 val key = m.group("Key")
                 val validator = m.group("Validator")
-                val mysteryValue = m.group("MysteryColumn")
+                val mysteryValue = m.group("MysteryColumn1")
+                val mysteryValue2 = m.group("MysteryColumn2")
                 when (mysteryValue) {
                   LEGACY_PARAMETERS_KEY, EXPERIMENTAL_PARAMETERS_KEY -> {}
 
@@ -88,6 +96,22 @@ class SemanticDataRepository private constructor() {
                     fileClassToSectionToKeyAndValidatorMap.computeIfAbsent(fileClass.fileClass, { _: String? -> HashMap() }).computeIfAbsent(intern(cache, section)) { _: String? -> HashMap() }[intern(cache, key)] = intern(cache2, myValidator)
                   }
                 }
+
+                if (mysteryValue2 != "0") {
+
+                  val validatorConfigKey = mysteryValue + "/" + mysteryValue2
+                  val validatorConfigToSectionKey = fileClassToValidatorConfigToSectionKeys.get(fileClass.fileClass)
+                  validatorConfigToSectionKey?.putIfAbsent(validatorConfigKey, HashSet())
+
+                  val set = validatorConfigToSectionKey?.get(validatorConfigKey)
+
+                  set?.add("$section.$key")
+
+                  val sectionKeyToValidatorConfig = fileClassToSectionKeyToValidatorConfig.get(fileClass.fileClass)
+
+                  sectionKeyToValidatorConfig?.put("$section.$key", validatorConfigKey)
+                }
+
               }
             }
           }
@@ -99,6 +123,7 @@ class SemanticDataRepository private constructor() {
       }
     }
 
+
     validatorMap = HashMap()
     validatorMap.putAll(BooleanOptionValue.validators)
     validatorMap.putAll(TriStateOptionValue.validators)
@@ -172,6 +197,16 @@ class SemanticDataRepository private constructor() {
     return Collections.unmodifiableSet(fileClassToSectionNameToKeyValuesFromDoc.getOrDefault(fileClass, emptyMap()).keys)
   }
 
+  fun getAliasesForSectionKey(fileClass: String, sectionKey: String): Set<String> {
+
+    val validatorConfig = fileClassToSectionKeyToValidatorConfig.getOrDefault(fileClass, emptyMap())[sectionKey]
+
+    if (validatorConfig == null) {
+      return emptySet()
+    }
+
+    return Collections.unmodifiableSet(fileClassToValidatorConfigToSectionKeys.getOrDefault(fileClass, emptyMap()).getOrDefault(validatorConfig, emptySet()))
+  }
 
   /**
    * Returns the allowed keywords by a given section name.
@@ -709,7 +744,7 @@ unit types. These options are documented in <a href="http://man7.org/linux/man-p
   companion object {
     private val LOG = Logger.getInstance(SemanticDataRepository::class.java)
     const val SEMANTIC_DATA_ROOT = "net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/"
-    private const val GPERF_REGEX = """^(?<Section>\w+)\.(?<Key>\w+)\s*,\s*(?<Validator>\w+)\s*,\s*(?<MysteryColumn>\w+)\s*,.+$"""
+    private const val GPERF_REGEX = """^(?<Section>[a-zA-Z0-9_-]+)\.(?<Key>[a-zA-Z0-9_-]+)\s*,\s*(?<Validator>\w+)\s*,\s*(?<MysteryColumn1>\w+)\s*,\s*(?<MysteryColumn2>.+)$"""
     private val LINE_MATCHER = Pattern.compile(GPERF_REGEX)
     private val NULL_VALIDATOR = Validator("NULL", "0")