[code] Fixed compatibility with 213

Author: bash-spbu

.github/workflows/build.yml

@@ -75,8 +75,8 @@ jobs:
           key: ${{ runner.os }}-plugin-verifier-${{ steps.properties.outputs.ideVersions }}
 
       # Run Qodana inspections
-      - name: Qodana - Code Inspection
-        uses: JetBrains/[email protected]
+      #      - name: Qodana - Code Inspection
+      #        uses: JetBrains/[email protected]
 
       # Run tests
       - name: Run Tests

CHANGELOG.md

@@ -1,6 +1,6 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
 
-# intellij-java-code-aligner Changelog
+# Java Code Aligner Changelog
 
 ## [Unreleased]
 ### Added

README.md

@@ -1,34 +1,37 @@
-# intellij-java-code-aligner
+# Java Code Aligner
 
 ![Build](https://github.com/bash-spbu/intellij-java-code-aligner/workflows/Build/badge.svg)
 [![Version](https://img.shields.io/jetbrains/plugin/v/17939-java-code-aligner.svg)](https://plugins.jetbrains.com/plugin/17939-java-code-aligner)
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/17939-java-code-aligner.svg)](https://plugins.jetbrains.com/plugin/17939-java-code-aligner)
 
-## Template ToDo list
-- [x] Create a new [IntelliJ Platform Plugin Template][template] project.
-- [ ] Get known with the [template documentation][template].
-- [ ] Verify the [pluginGroup](/gradle.properties), [plugin ID](/src/main/resources/META-INF/plugin.xml) and [sources package](/src/main/kotlin).
-- [ ] Review the [Legal Agreements](https://plugins.jetbrains.com/docs/marketplace/legal-agreements.html).
-- [ ] [Publish a plugin manually](https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html?from=IJPluginTemplate) for the first time.
-- [ ] Set the Plugin ID in the above README badges.
-- [ ] Set the [Deployment Token](https://plugins.jetbrains.com/docs/marketplace/plugin-upload.html).
-- [ ] Click the <kbd>Watch</kbd> button on the top of the [IntelliJ Platform Plugin Template][template] to be notified about releases containing new features and fixes.
-
 <!-- Plugin description -->
-This Fancy IntelliJ Platform Plugin is going to be your implementation of the brilliant ideas that you have.
+Provides displaying the Java code as aligned horizontally in columns without actual formatting of the code.
+
+It mainly serves for _increasing code readability_ and _reducing tension_
+when reading dozens of tightly placed code lines with different elements.
+
+More formally the plugin provides:
 
-This specific section is a source for the [plugin.xml](/src/main/resources/META-INF/plugin.xml) file which will be extracted by the [Gradle](/build.gradle.kts) during the build process.
+- alignment of consecutive fields, local variables and params in columns of annotations, modifiers, types, names,
+  initializers;
+- alignment of consecutive assignments by the equal sign;
+- pretty rich set of alignment settings in `File | Settings | Editor | Inlay Hints | Java | Java Code Aligner`.
 
-To keep everything working, do not remove `<!-- ... -->` sections. 
+From the technical side, plugin works by adding invisible inlay hints (like the ones shown as parameter names for method
+calls), which can be made visible via `Enable debug mode` in settings above.
+
+Additionally, the plugin provides **folding of explicit types** to `var` and `final var` for local variable
+declarations, which can be enabled in `File | Settings | Editor | General | Code Folding | Java Code Aligner`.
 <!-- Plugin description end -->
 
 ## Installation
 
 - Using IDE built-in plugin system:
-  
-  <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>Search for "intellij-java-code-aligner"</kbd> >
+
+  <kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>Search for "
+  intellij-java-code-aligner"</kbd> >
   <kbd>Install Plugin</kbd>
-  
+
 - Manually:
 
   Download the [latest release](https://github.com/bash-spbu/intellij-java-code-aligner/releases/latest) and install it manually using

gradle.properties

@@ -2,8 +2,8 @@
 # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
 
 pluginGroup = com.github.bashspbu.intellijjavacodealigner
-pluginName = Java Code Aligner
-pluginVersion = 1.0.0
+pluginName=Java Code Aligner
+pluginVersion=1.0.1
 
 # 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/JavaAligningInlaysConfigurable.kt

@@ -2,16 +2,17 @@
 
 package com.github.bashspbu.intellijjavacodealigner
 
+import com.github.bashspbu.intellijjavacodealigner.util.myIntTextField
 import com.intellij.codeInsight.hints.ChangeListener
 import com.intellij.codeInsight.hints.ImmediateConfigurable
 import com.intellij.ui.ContextHelpLabel
 import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.EnumComboBoxModel
 import com.intellij.ui.layout.Row
 import com.intellij.ui.layout.panel
-import kotlin.reflect.KMutableProperty0
 import javax.swing.JComponent
 import javax.swing.event.DocumentEvent
+import kotlin.reflect.KMutableProperty0
 
 
 class JavaAligningInlaysConfigurable(private val settings: JavaAligningInlaysSettings) : ImmediateConfigurable {
@@ -77,7 +78,7 @@ class JavaAligningInlaysConfigurable(private val settings: JavaAligningInlaysSet
     private fun Row.maxColumnLengthIntField(labelName: String, listener: ChangeListener, settingsProperty: KMutableProperty0<Int>) {
         row {
             label(labelName)
-            intTextField(settingsProperty, range = 5..1000)
+            myIntTextField(settingsProperty, range = 5..1000)
                 .component
                 .let { intTextField ->
                     intTextField.document.addDocumentListener(object : DocumentAdapter() {

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

@@ -0,0 +1,73 @@
+package com.github.bashspbu.intellijjavacodealigner.util
+
+import com.intellij.ui.UIBundle
+import com.intellij.ui.components.JBTextField
+import com.intellij.ui.layout.Cell
+import com.intellij.ui.layout.CellBuilder
+import com.intellij.ui.layout.PropertyBinding
+import com.intellij.ui.layout.toBinding
+import com.intellij.util.MathUtil
+import java.awt.event.KeyAdapter
+import java.awt.event.KeyEvent
+import kotlin.reflect.KMutableProperty0
+
+
+internal fun Cell.myIntTextField(
+    prop: KMutableProperty0<Int>,
+    columns: Int? = null,
+    range: IntRange? = null,
+    step: Int? = null
+): CellBuilder<JBTextField> {
+    return myIntTextField(prop.toBinding(), columns, range, step)
+}
+
+/**
+ * Copy-pasted from the IntelliJ Community 213.
+ * It changed from 212 to 213, so it was copied in order to be compatible with both 212 and 213.
+ */
+internal fun Cell.myIntTextField(
+    binding: PropertyBinding<Int>,
+    columns: Int? = null,
+    range: IntRange? = null,
+    step: Int? = null
+): CellBuilder<JBTextField> {
+    return textField(
+        { binding.get().toString() },
+        { value ->
+            value.toIntOrNull()?.let { intValue ->
+                binding.set(range?.let { intValue.coerceIn(it.first, it.last) } ?: intValue)
+            }
+        },
+        columns
+    )
+        .withValidationOnInput {
+            val value = it.text.toIntOrNull()
+            when {
+                value == null                    -> error(UIBundle.message("please.enter.a.number"))
+                range != null && value !in range -> error(UIBundle.message("please.enter.a.number.from.0.to.1", range.first, range.last))
+                else                             -> null
+            }
+        }
+        .apply {
+            step ?: return@apply
+            component.addKeyListener(object : KeyAdapter() {
+                override fun keyPressed(e: KeyEvent?) {
+                    val increment: Int = when (e?.keyCode) {
+                        KeyEvent.VK_UP   -> step
+                        KeyEvent.VK_DOWN -> -step
+                        else             -> return
+                    }
+
+                    var value = component.text.toIntOrNull()
+                    if (value != null) {
+                        value += increment
+                        if (range != null) {
+                            value = MathUtil.clamp(value, range.first, range.last)
+                        }
+                        component.text = value.toString()
+                        e.consume()
+                    }
+                }
+            })
+        }
+}