Explicitly highlight all the section headers (#18)

* Explicitly highlight all the section headers Due to how language injection works these headers can sometimes become un-highlighted. This should fix that by highlighting them in the highlighting annotator and not just the syntax highlighter. Fixes #17
carbonblack · Aug 7, 2023 · fc97fe7 · fc97fe7
1 parent 31d2687
commit fc97fe7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ detekt {
 }
 
 group = "com.carbonblack"
-version = "2.1.0"
+version = "2.2.0"
 
 tasks.compileJava {
     options.release.set(17)

diff --git a/src/main/kotlin/com/carbonblack/intellij/rpmspec/RpmSpecHighlightingAnnotator.kt b/src/main/kotlin/com/carbonblack/intellij/rpmspec/RpmSpecHighlightingAnnotator.kt
@@ -144,6 +144,33 @@ class RpmSpecHighlightingAnnotator : Annotator {
             }
         }
 
+        // Explicitly highlight the section headers; this resolves issues with the shell sections
+        // causing the headers to be un-highlighted.
+        when (element) {
+            is RpmSpecFilesSection,
+            is RpmSpecPackageSection,
+            is RpmSpecDescriptionSection,
+            is RpmSpecChangelogSection,
+            -> element.node.getChildren(TokenSet.ANY)
+                .firstOrNull {
+                    it.elementType == RpmSpecTypes.FILES ||
+                        it.elementType == RpmSpecTypes.PACKAGE ||
+                        it.elementType == RpmSpecTypes.CHANGELOG ||
+                        it.elementType == RpmSpecTypes.DESCRIPTION
+                }?.let {
+                    holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+                        .textAttributes(RpmSpecSyntaxHighligher.RESERVED)
+                        .range(it.textRange).create()
+                }
+            is RpmSpecGenericSection -> element.node.getChildren(TokenSet.ANY).firstOrNull()?.let {
+                if (element.text.firstOrNull() == '%') {
+                    holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
+                        .textAttributes(RpmSpecSyntaxHighligher.RESERVED)
+                        .range(it.textRange).create()
+                }
+            }
+        }
+
         val colorType = when (element) {
             is RpmSpecChangelogItem -> RpmSpecSyntaxHighligher.TEXT
             is RpmSpecChangelogEntry -> RpmSpecSyntaxHighligher.TEXT

diff --git a/src/main/kotlin/com/carbonblack/intellij/rpmspec/psi/RpmSpecMacroElementImpl.kt b/src/main/kotlin/com/carbonblack/intellij/rpmspec/psi/RpmSpecMacroElementImpl.kt
@@ -5,7 +5,6 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement
 import com.intellij.lang.ASTNode
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.*
-import java.util.*
 
 abstract class RpmSpecMacroElementImpl(node: ASTNode) :
     ASTWrapperPsiElement(node), PsiNameIdentifierOwner, RpmSpecMacroElement {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -9,10 +9,10 @@
 
     <change-notes><![CDATA[
         <html>
-        <b>Changes in version 2.1.0:</b>
+        <b>Changes in version 2.2.0:</b>
         <ul>
-          <li>Build against IntelliJ 2022.3 and Java 17</li>
-          <li>Allow macros such as %autochangelog within the changelog section</li>
+          <li>Build against IntelliJ 2023.2</li>
+          <li>Fix section headers sometimes not being highlighted</li>
         </ul><br>
         </html>
             ]]>