Checkpoint #290 - All tests passing

Author: Steve Ramage

build.gradle.kts

@@ -202,7 +202,21 @@ tasks.register<GenerateParserTask>("generateParserTask") {
 
 
 tasks.register<Copy>("generateOptionValidator") {
-  from("./systemd-build/build/load-fragment-gperf.gperf")
+  listOf(
+    "journald-gperf.gperf",
+      "link-config-gperf.gperf",
+      "load-fragment-gperf.gperf",
+      "logind-gperf.gperf",
+      "netdev-gperf.gperf",
+      "networkd-gperf.gperf",
+      "networkd-network-gperf.gperf",
+      "nspawn-gperf.gperf",
+      "resolved-dnssd-gperf.gperf",
+      "resolved-gperf.gperf",
+      "timesyncd-gperf.gperf").forEach {
+    fileName -> from("./systemd-build/build/${fileName}")
+  }
+
   into("${sourceSets["main"].output.resourcesDir?.getAbsolutePath()}/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/")
 }
 

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/completion/UnitFileKeyCompletionContributor.kt

@@ -35,9 +35,12 @@ class UnitFileKeyCompletionContributor : CompletionContributor() {
                val sectionName = section.sectionName
                val definedKeys = section.propertyList.stream().map { obj: UnitFileProperty -> obj.key }.collect(Collectors.toSet())
                val sdr = SemanticDataRepository.instance
-               for (keyword in sdr.getDocumentedKeywordsInSection(sectionName)) {
+
+               val filename = section.containingFile.name
+
+               for (keyword in sdr.getDocumentedKeywordsInSection(filename, sectionName)) {
                  if (definedKeys.contains(keyword)) continue
-                 val deprecated = sdr.isDeprecated(sectionName, keyword)
+                 val deprecated = sdr.isDeprecated(filename, sectionName, keyword)
                  val builder = LookupElementBuilder
                    .create(keyword)
                    .withInsertHandler(KeyInsertHandler())

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/completion/UnitFileValueCompletionContributor.kt

@@ -44,7 +44,9 @@ class UnitFileValueCompletionContributor : CompletionContributor() {
                val sectionName = section.sectionName
                val keyName = property.key
                val sdr = SemanticDataRepository.instance
-               val validator = sdr.getOptionValidator(sectionName, keyName)
+               val filename = section.containingFile.name
+
+               val validator = sdr.getOptionValidator(filename, sectionName, keyName)
                resultSet.addAllElements(
                  validator.getAutoCompleteOptions(property.project)
                    .stream()

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/documentation/UnitFileDocumentationProvider.kt

@@ -26,7 +26,9 @@ class UnitFileDocumentationProvider : AbstractDocumentationProvider() {
       val sectionName = section.sectionName
       val keyName = element.node.text
       val sdr: SemanticDataRepository = SemanticDataRepository.instance
-      val keyComment = sdr.getDocumentationContentForKeyInSection(sectionName, keyName)
+      val filename = section.containingFile.name
+
+      val keyComment = sdr.getDocumentationContentForKeyInSection(filename, sectionName, keyName)
       if (keyComment != null) {
         return DocumentationMarkup.DEFINITION_START + keyName + DocumentationMarkup.DEFINITION_END + DocumentationMarkup.CONTENT_START + keyComment + DocumentationMarkup.CONTENT_END
       }
@@ -53,13 +55,14 @@ class UnitFileDocumentationProvider : AbstractDocumentationProvider() {
       val section = PsiTreeUtil.getParentOfType(element, UnitFileSectionType::class.java) ?: return null
       val sectionName = section.sectionName
       val keyName = element.text
+      val fname = section.containingFile.name
       val sdr: SemanticDataRepository = SemanticDataRepository.instance
-      val url = sdr.getKeywordDocumentationUrl(sectionName, keyName)
+      val url = sdr.getKeywordDocumentationUrl(fname, sectionName, keyName)
       if (url != null) {
         return listOf(url)
       }
-      val keyNameToPointTo = sdr.getKeywordLocationInDocumentation(sectionName, keyName)
-      val filename = sdr.getKeywordFileLocationInDocumentation(sectionName, keyName)
+      val keyNameToPointTo = sdr.getKeywordLocationInDocumentation(fname, sectionName, keyName)
+      val filename = sdr.getKeywordFileLocationInDocumentation(fname, sectionName, keyName)
       if (keyNameToPointTo != null && filename != null) {
         return listOf(
           "https://www.freedesktop.org/software/systemd/man/" + filename.replaceFirst(".xml$".toRegex(), ".html") + "#"

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/DeprecatedOptionsInspection.kt

@@ -26,8 +26,10 @@ class DeprecatedOptionsInspection : LocalInspectionTool() {
       val sdr = SemanticDataRepository.instance
       val sectionName = section.sectionName
       val key = property.key
-      if (sdr.isDeprecated(sectionName, key)) {
-        val text = sdr.getDeprecationReason(sectionName, key, false)
+      val filename = section.containingFile.name
+
+      if (sdr.isDeprecated(filename, sectionName, key)) {
+        val text = sdr.getDeprecationReason(filename, sectionName, key, false)
         holder.registerProblem(property.keyNode.psi, text!!, ProblemHighlightType.LIKE_DEPRECATED)
       }
     }

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/InvalidValueInspection.kt

@@ -24,7 +24,8 @@ class InvalidValueInspection : LocalInspectionTool() {
       val section = PsiTreeUtil.getParentOfType(property, UnitFileSectionGroups::class.java) ?: return
       property.valueText ?: return
       val key = property.key
-      val ovi = SemanticDataRepository.instance.getOptionValidator(section.sectionName, key)
+      val filename = section.containingFile.name
+      val ovi = SemanticDataRepository.instance.getOptionValidator(filename, section.sectionName, key)
       ovi.generateProblemDescriptors(property, holder)
     }
   }

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/ShellSyntaxInExecDirectiveInspection.kt

@@ -38,7 +38,8 @@ class ShellSyntaxInExecDirectiveInspection : LocalInspectionTool() {
       val section = PsiTreeUtil.getParentOfType(property, UnitFileSectionGroups::class.java) ?: return
       val value = property.valueText ?: return
       val key = property.key
-      if (SemanticDataRepository.instance.getOptionValidator(section.sectionName, key) !is ExecOptionValue) return
+      val filename = section.containingFile.name
+      if (SemanticDataRepository.instance.getOptionValidator(filename, section.sectionName, key) !is ExecOptionValue) return
       val completedString = StringBuilder()
       val im = holder.manager
       while (completedString.length < value.length) {

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/UnknownKeyInSectionInspection.kt

@@ -45,7 +45,8 @@ class UnknownKeyInSectionInspection : LocalInspectionTool() {
         return
       }
 
-      if (!SemanticDataRepository.instance.getAllowedKeywordsInSectionFromValidators(sectionName).contains(key)) {
+      val filename = section.containingFile.name
+      if (!SemanticDataRepository.instance.getAllowedKeywordsInSectionFromValidators(filename, sectionName).contains(key)) {
         // TODO Figure out what highlight to use
         holder.registerProblem(property.keyNode.psi, INSPECTION_TOOL_TIP_TEXT, ProblemHighlightType.GENERIC_ERROR_OR_WARNING)
       }