Skip to content

fix: underline grammar-backed keys instead of recoloring them (#467) #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SJrX wants to merge 1 commit into
base: issue-345-11
Choose a base branch
from
+7 −3
Open

fix: underline grammar-backed keys instead of recoloring them (#467) #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...kotlin/net/sjrx/intellij/plugins/systemdunitfiles/annotators/GrammarEngineKeyAnnotator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ package net.sjrx.intellij.plugins.systemdunitfiles.annotators
import com.intellij.lang.annotation.AnnotationHolder
import com.intellij.lang.annotation.Annotator
import com.intellij.lang.annotation.HighlightSeverity
import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
import com.intellij.openapi.editor.colors.TextAttributesKey
import com.intellij.openapi.editor.markup.EffectType
import com.intellij.openapi.editor.markup.TextAttributes
import com.intellij.psi.PsiElement
import com.intellij.ui.JBColor
import java.awt.Font
import com.intellij.psi.util.PsiTreeUtil
import net.sjrx.intellij.plugins.systemdunitfiles.psi.UnitFileProperty
import net.sjrx.intellij.plugins.systemdunitfiles.psi.UnitFileSectionType
Expand Down Expand Up @@ -40,10 +43,11 @@ class GrammarEngineKeyAnnotator : Annotator {
}

companion object {
// Layered on top of the normal key color; METADATA gives a distinct, theme-aware tint.
// Underline the key, keeping its normal color — recoloring grammar vs non-grammar keys with two
// different colors was too distracting, especially on light themes.
val NEW_ENGINE_KEY: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
"SYSTEMD_UNIT_FILE_NEW_GRAMMAR_ENGINE_KEY",
DefaultLanguageHighlighterColors.METADATA,
TextAttributes(null, null, JBColor.GRAY, EffectType.LINE_UNDERSCORE, Font.PLAIN),
)
}
}
Loading