[code] final and volatile field modifiers are now united to the same alignment column because they are mutual exclusive

Author: bash-spbu

CHANGELOG.md

@@ -4,7 +4,14 @@
 
 ## [Unreleased]
 
+### Fixed
+
+- `final` and `volatile` field modifiers are now united to the same alignment column because they are mutual exclusive.
+
 ## [1.0.1]
-### Added
-- Initial implementation, feel free reporting any found bugs or wanted features/additional settings to the GitHub repo issues.
+
+### Added
+
+- Initial implementation, feel free reporting any found bugs or wanted features/additional settings to the GitHub repo
+  issues.
 

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.bashspbu.intellijjavacodealigner
 pluginName=Java Code Aligner
-pluginVersion=1.0.1
+pluginVersion=1.0.2
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

src/main/kotlin/com/github/bashspbu/intellijjavacodealigner/JavaAligningInlaysCollector.kt

@@ -4,9 +4,6 @@ package com.github.bashspbu.intellijjavacodealigner
 
 import com.github.bashspbu.intellijjavacodealigner.JavaAligningInlaysCollector.AlignCellType.*
 import com.github.bashspbu.intellijjavacodealigner.util.*
-import com.github.bashspbu.intellijjavacodealigner.util.getElementStartOffsetSkippingAnnotationsOnSeparateLines
-import com.github.bashspbu.intellijjavacodealigner.util.getElementLineNumber
-import com.github.bashspbu.intellijjavacodealigner.util.getOffsetFromLineStartSkippingAnnotationsOnSeparateLines
 import com.intellij.codeInsight.hints.InlayHintsCollector
 import com.intellij.codeInsight.hints.InlayHintsSink
 import com.intellij.openapi.editor.Document
@@ -340,9 +337,8 @@ class JavaAligningInlaysCollector(
         ABSTRACT,
         DEFAULT,
         STATIC,
-        FINAL,
+        MUTABILITY, // final or volatile
         TRANSIENT,
-        VOLATILE,
         SYNCHRONIZED,
         NATIVE,
         STRICTFP,
@@ -362,9 +358,9 @@ class JavaAligningInlaysCollector(
                 PsiModifier.ABSTRACT     -> ABSTRACT
                 PsiModifier.DEFAULT      -> DEFAULT
                 PsiModifier.STATIC       -> STATIC
-                PsiModifier.FINAL        -> FINAL
+                PsiModifier.FINAL        -> MUTABILITY
+                PsiModifier.VOLATILE     -> MUTABILITY
                 PsiModifier.TRANSIENT    -> TRANSIENT
-                PsiModifier.VOLATILE     -> VOLATILE
                 PsiModifier.SYNCHRONIZED -> SYNCHRONIZED
                 PsiModifier.NATIVE       -> NATIVE
                 PsiModifier.STRICTFP     -> STRICTFP
@@ -378,15 +374,15 @@ class JavaAligningInlaysCollector(
 
             val paramTypes = listOf(
                 VARIABLE_ANNOTATIONS,
-                FINAL,
+                MUTABILITY,
                 TYPE_ANNOTATIONS,
                 TYPE,
                 VARIABLE_NAME
             )
 
             val localVarTypes = listOf(
                 VARIABLE_ANNOTATIONS,
-                FINAL,
+                MUTABILITY,
                 TYPE_ANNOTATIONS,
                 TYPE,
                 VARIABLE_NAME,

src/main/kotlin/com/github/bashspbu/intellijjavacodealigner/util/ModifierUtils.kt

@@ -63,8 +63,8 @@ internal object ModifierComparator : Comparator<String> {
         PsiModifier.DEFAULT,
         PsiModifier.STATIC,
         PsiModifier.FINAL,
-        PsiModifier.TRANSIENT,
         PsiModifier.VOLATILE,
+        PsiModifier.TRANSIENT,
         PsiModifier.SYNCHRONIZED,
         PsiModifier.NATIVE,
         PsiModifier.STRICTFP,