diff --git a/plugins/grazie/resources/META-INF/plugin.xml b/plugins/grazie/resources/META-INF/plugin.xml index 82742a9b67b8..2d672432a06f 100644 --- a/plugins/grazie/resources/META-INF/plugin.xml +++ b/plugins/grazie/resources/META-INF/plugin.xml @@ -62,8 +62,8 @@ - - + + diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/icons/GrazieIcons.java b/plugins/grazie/src/main/kotlin/com/intellij/grazie/icons/GrazieIcons.java index d10921ba9209..c5bf38b5d873 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/icons/GrazieIcons.java +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/icons/GrazieIcons.java @@ -13,8 +13,8 @@ public final class GrazieIcons { private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { return IconManager.getInstance().loadRasterizedIcon(path, GrazieIcons.class.getClassLoader(), cacheKey, flags); } - /** 16x16 */ public static final @NotNull Icon GrammarError = load("icons/grammarError.svg", 1325171794, 0); - /** 16x16 */ public static final @NotNull Icon StyleError = load("icons/styleError.svg", 2060433281, 0); - /** 16x16 */ public static final @NotNull Icon StyleSuggestion = load("icons/styleSuggestion.svg", 2100257017, 0); - /** 16x16 */ public static final @NotNull Icon StyleWarning = load("icons/styleWarning.svg", 139367264, 0); + /** 16x16 */ public static final @NotNull Icon GrammarError = load("icons/grammarError.svg", 1531410605, 2); + /** 16x16 */ public static final @NotNull Icon StyleError = load("icons/styleError.svg", 2060433281, 2); + /** 16x16 */ public static final @NotNull Icon StyleSuggestion = load("icons/styleSuggestion.svg", 2100257017, 2); + /** 16x16 */ public static final @NotNull Icon StyleWarning = load("icons/styleWarning.svg", 139367264, 2); } diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemsTrafficLightRendererContributor.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/StyleProblemsTrafficLightRendererContributor.kt similarity index 87% rename from plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemsTrafficLightRendererContributor.kt rename to plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/StyleProblemsTrafficLightRendererContributor.kt index 0fa984077a35..040a36bfe773 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemsTrafficLightRendererContributor.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/StyleProblemsTrafficLightRendererContributor.kt @@ -1,4 +1,4 @@ -package com.intellij.grazie.ide.inspection.style +package com.intellij.grazie.ide import com.intellij.codeInsight.daemon.impl.SeverityRegistrar import com.intellij.codeInsight.daemon.impl.TrafficLightRenderer @@ -21,9 +21,9 @@ internal class StyleProblemsTrafficLightRendererContributor: TrafficLightRendere private class StyleProblemTrafficLightRenderer(project: Project, document: Document): TrafficLightRenderer(project, document) { override fun getErrorCounts(): IntArray { val errors = super.getErrorCounts() - val errorIndex = severityRegistrar.findSeverityIndex(StyleProblemSeverities.STYLE_ERROR) - val warningIndex = severityRegistrar.findSeverityIndex(StyleProblemSeverities.STYLE_WARNING) - val suggestionIndex = severityRegistrar.findSeverityIndex(StyleProblemSeverities.STYLE_SUGGESTION) + val errorIndex = severityRegistrar.findSeverityIndex(TextProblemSeverities.STYLE_ERROR) + val warningIndex = severityRegistrar.findSeverityIndex(TextProblemSeverities.STYLE_WARNING) + val suggestionIndex = severityRegistrar.findSeverityIndex(TextProblemSeverities.STYLE_SUGGESTION) if (errors[warningIndex] != 0) { errors[warningIndex] += errors[suggestionIndex] errors[suggestionIndex] = 0 diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemSeverities.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/TextProblemSeverities.kt similarity index 54% rename from plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemSeverities.kt rename to plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/TextProblemSeverities.kt index 9bd2f0deeda6..e05a151362c0 100644 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemSeverities.kt +++ b/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/TextProblemSeverities.kt @@ -1,4 +1,4 @@ -package com.intellij.grazie.ide.inspection.style +package com.intellij.grazie.ide import com.intellij.codeInsight.daemon.impl.HighlightInfoType import com.intellij.codeInsight.daemon.impl.HighlightInfoType.HighlightInfoTypeImpl @@ -10,16 +10,17 @@ import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.spellchecker.SpellCheckerSeveritiesProvider import javax.swing.Icon -class StyleProblemSeverities: SeveritiesProvider() { +class TextProblemSeverities: SeveritiesProvider() { override fun getSeveritiesHighlightInfoTypes(): MutableList { return mutableListOf( - StyleHighlightInfoType(STYLE_ERROR, StyleProblemTextAttributes.STYLE_ERROR, GrazieIcons.StyleError), - StyleHighlightInfoType(STYLE_WARNING, StyleProblemTextAttributes.STYLE_WARNING, GrazieIcons.StyleWarning), - StyleHighlightInfoType(STYLE_SUGGESTION, StyleProblemTextAttributes.STYLE_SUGGESTION, GrazieIcons.StyleSuggestion) + TextHighlightInfoType(STYLE_ERROR, STYLE_ERROR_ATTRIBUTES, GrazieIcons.StyleError), + TextHighlightInfoType(STYLE_WARNING, STYLE_WARNING_ATTRIBUTES, GrazieIcons.StyleWarning), + TextHighlightInfoType(STYLE_SUGGESTION, STYLE_SUGGESTION_ATTRIBUTES, GrazieIcons.StyleSuggestion), + TextHighlightInfoType(GRAMMAR_ERROR, GRAMMAR_ERROR_ATTRIBUTES, GrazieIcons.GrammarError) ) } - private class StyleHighlightInfoType( + private class TextHighlightInfoType( severity: HighlightSeverity, attributesKey: TextAttributesKey, private val icon: Icon @@ -48,5 +49,27 @@ class StyleProblemSeverities: SeveritiesProvider() { @JvmField val STYLE_SUGGESTION = createStyleSeverity("STYLE_SUGGESTION", 3) + + @JvmField + val GRAMMAR_ERROR = HighlightSeverity( + "GRAMMAR_ERROR", + SpellCheckerSeveritiesProvider.TYPO.myVal + 1, + GrazieBundle.messagePointer("grammar.error.severity.name"), + GrazieBundle.messagePointer("grammar.error.severity.name.capitalized"), + @Suppress("InvalidBundleOrProperty") + GrazieBundle.messagePointer("grammar.error.severity.count") + ) + + @JvmField + val STYLE_ERROR_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_ERROR") + + @JvmField + val STYLE_WARNING_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_WARNING") + + @JvmField + val STYLE_SUGGESTION_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_SUGGESTION") + + @JvmField + val GRAMMAR_ERROR_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("GRAZIE_GRAMMAR_ERROR") } } diff --git a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemTextAttributes.kt b/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemTextAttributes.kt deleted file mode 100644 index 94ef082d505a..000000000000 --- a/plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/style/StyleProblemTextAttributes.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.intellij.grazie.ide.inspection.style - -import com.intellij.openapi.editor.colors.TextAttributesKey - -object StyleProblemTextAttributes { - @JvmField - val STYLE_ERROR = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_ERROR") - - @JvmField - val STYLE_WARNING = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_WARNING") - - @JvmField - val STYLE_SUGGESTION = TextAttributesKey.createTextAttributesKey("GRAZIE_STYLE_SUGGESTION") -} diff --git a/plugins/grazie/src/main/resources/colorSchemes/GrazieDarcula.xml b/plugins/grazie/src/main/resources/colorSchemes/GrazieDarcula.xml index 20bddcb85390..53ee88440fec 100644 --- a/plugins/grazie/src/main/resources/colorSchemes/GrazieDarcula.xml +++ b/plugins/grazie/src/main/resources/colorSchemes/GrazieDarcula.xml @@ -2,20 +2,26 @@ + diff --git a/plugins/grazie/src/main/resources/colorSchemes/GrazieDefault.xml b/plugins/grazie/src/main/resources/colorSchemes/GrazieDefault.xml index 6d770e811241..3b397593499c 100644 --- a/plugins/grazie/src/main/resources/colorSchemes/GrazieDefault.xml +++ b/plugins/grazie/src/main/resources/colorSchemes/GrazieDefault.xml @@ -2,20 +2,26 @@ + diff --git a/plugins/grazie/src/main/resources/icons/grammarError.svg b/plugins/grazie/src/main/resources/icons/grammarError.svg index 5d59ae06ca1d..6e4777744bb4 100644 --- a/plugins/grazie/src/main/resources/icons/grammarError.svg +++ b/plugins/grazie/src/main/resources/icons/grammarError.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/plugins/grazie/src/main/resources/icons/grammarError_dark.svg b/plugins/grazie/src/main/resources/icons/grammarError_dark.svg new file mode 100644 index 000000000000..15a488209286 --- /dev/null +++ b/plugins/grazie/src/main/resources/icons/grammarError_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/grazie/src/main/resources/icons/styleError_dark.svg b/plugins/grazie/src/main/resources/icons/styleError_dark.svg new file mode 100644 index 000000000000..34b0b97da310 --- /dev/null +++ b/plugins/grazie/src/main/resources/icons/styleError_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/grazie/src/main/resources/icons/styleSuggestion_dark.svg b/plugins/grazie/src/main/resources/icons/styleSuggestion_dark.svg new file mode 100644 index 000000000000..840ab14be172 --- /dev/null +++ b/plugins/grazie/src/main/resources/icons/styleSuggestion_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/grazie/src/main/resources/icons/styleWarning_dark.svg b/plugins/grazie/src/main/resources/icons/styleWarning_dark.svg new file mode 100644 index 000000000000..88186fa26662 --- /dev/null +++ b/plugins/grazie/src/main/resources/icons/styleWarning_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/plugins/grazie/src/main/resources/messages/GrazieBundle.properties b/plugins/grazie/src/main/resources/messages/GrazieBundle.properties index 3a82b0bbbf94..985086d9a9ff 100644 --- a/plugins/grazie/src/main/resources/messages/GrazieBundle.properties +++ b/plugins/grazie/src/main/resources/messages/GrazieBundle.properties @@ -92,3 +92,6 @@ grazie.spellcheck.dictionary.name=Extended Dictionary style.problem.severity.name=style issue style.problem.severity.name.capitalized=Style issue style.problem.severity.count={0} {0, choice, 0#style issues|1#style issue|2#style issues} +grammar.error.severity.name=grammar error +grammar.error.severity.name.capitalized=Grammar error +grammar.error.severity.count={0} {0, choice, 0#grammar errors|1#grammar error|2#grammar errors}