Match IntelliJ's new UI style (#8)

Author: laech

.editorconfig

@@ -3,3 +3,89 @@ root = true
 [*]
 indent_size = 2
 indent_style = space
+insert_final_newline = true
+
+# https://github.com/facebook/ktfmt/blob/main/docs/editorconfig/.editorconfig-google
+
+[{*.kt,*.kts}]
+max_line_length = 100
+ij_continuation_indent_size = 2
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 9999
+ij_kotlin_name_count_to_use_star_import_for_members = 9999
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false

.idea/ktfmt.xml

@@ -9,7 +9,7 @@ plugins {
 
 group = "com.gitlab.lae.intellij.actions.tree"
 
-version = "0.6.4-SNAPSHOT"
+version = "0.7.0-SNAPSHOT"
 
 repositories { mavenCentral() }
 

build.gradle.kts

@@ -2,7 +2,6 @@ package com.gitlab.lae.intellij.actions.tree
 
 import com.gitlab.lae.intellij.actions.tree.ui.ActionPresentation
 import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.DataContext
 import javax.swing.KeyStroke
@@ -24,13 +23,7 @@ data class ActionNode(
   ): ActionPresentation {
 
     val action = toAction(actionManager)
-    val presentation =
-      ActionPresentation.create(
-        action,
-        keysOverride,
-        separatorAbove,
-        isSticky,
-      )
+    val presentation = ActionPresentation.create(action, keysOverride, separatorAbove, isSticky)
     presentation.update(actionManager, dataContext)
     return presentation
   }
@@ -58,16 +51,4 @@ data class ActionNode(
       .toList()
       .reversed()
   }
-
-  companion object {
-
-    /* Use ACTION_SEARCH as the action place seems to work the best.
-     *
-     * 'Run | Stop' menu action works correctly this way by
-     * showing a list of processes to stop
-     *
-     * 'Exit' actions works (doesn't work if place is MAIN_MENU)
-     */
-    const val ACTION_PLACE = ActionPlaces.ACTION_SEARCH
-  }
 }

src/main/kotlin/com/gitlab/lae/intellij/actions/tree/ActionNode.kt

@@ -1,26 +1,23 @@
 package com.gitlab.lae.intellij.actions.tree
 
-import com.gitlab.lae.intellij.actions.tree.ui.ActionList
-import com.gitlab.lae.intellij.actions.tree.ui.ActionPopupEventDispatcher
 import com.gitlab.lae.intellij.actions.tree.ui.ActionPresentation
+import com.gitlab.lae.intellij.actions.tree.ui.ActionPresentationStep
 import com.gitlab.lae.intellij.actions.tree.util.setBestLocation
 import com.intellij.ide.DataManager
-import com.intellij.ide.IdeEventQueue
 import com.intellij.openapi.actionSystem.ActionGroup
 import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.ActionPlaces.ACTION_PLACE_QUICK_LIST_POPUP_ACTION
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys.EDITOR
 import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.actionSystem.IdeActions.ACTION_EDITOR_ESCAPE
 import com.intellij.openapi.actionSystem.PlatformDataKeys.CONTEXT_COMPONENT
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.application.ApplicationManager.getApplication
-import com.intellij.openapi.ui.popup.JBPopup
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.ui.popup.JBPopupFactory.ActionSelectionAid
-import com.intellij.openapi.ui.popup.PopupChooserBuilder
 import com.intellij.openapi.wm.IdeFocusManager
+import com.intellij.ui.popup.list.ListPopupImpl
 import java.awt.event.ActionEvent
 import javax.swing.JComponent
 import javax.swing.KeyStroke
@@ -31,29 +28,23 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
   private val actionManager = e.actionManager
   private val sourceComponent = e.getData(CONTEXT_COMPONENT)
   private val sourceEditor = e.getData(EDITOR)
-  private val list: ActionList
-  private val popup: JBPopup
+  private val popup: ListPopupImpl
+  private val items: List<ActionPresentation>
 
   init {
-    val items =
+    items =
       action.prepare(e.dataContext).map { (keys, item) ->
         createPresentation(item, e.actionManager, e.dataContext, keys)
       }
-    list = ActionList(items)
-
-    // Register our action first before IntelliJ registers the default
-    // actions (e.g. com.intellij.ui.ScrollingUtil) so that in case of
-    // conflict our action will be executed
-    items.forEach { it.registerShortcuts(list) { item, e -> this.onActionChosen(item, e) } }
-    popup = createPopup()
-    popup.addListener(
-      ActionPopupEventDispatcher(
-        popup,
-        list,
-        IdeEventQueue.getInstance().popupManager,
-      ),
-    )
-    registerIdeAction(ACTION_EDITOR_ESCAPE, popup::cancel)
+
+    popup =
+      ListPopupImpl(
+        e.project,
+        ActionPresentationStep(items) { value, modifiers -> onActionChosen(value, modifiers) },
+      )
+    items.forEach { item ->
+      item.registerShortcuts(popup.list) { event -> onActionChosen(item, event) }
+    }
   }
 
   fun show(dataContext: DataContext) {
@@ -65,41 +56,7 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
     actionManager: ActionManager,
     dataContext: DataContext,
     keysOverride: List<KeyStroke>,
-  ): ActionPresentation =
-    action.createPresentation(
-      actionManager,
-      dataContext,
-      keysOverride,
-    )
-
-  private fun createPopup(): JBPopup =
-    PopupChooserBuilder(list)
-      .setModalContext(true)
-      .setCloseOnEnter(false)
-      .setItemChosenCallback(
-        Runnable {
-          val item = list.selectedValue
-          if (item != null) {
-            onActionChosen(item, 0)
-          }
-        }
-      )
-      .createPopup()
-
-  private fun registerIdeAction(actionId: String, runnable: () -> Unit) {
-    val action = actionManager.getAction(actionId) ?: return
-    val shortcutSet = action.shortcutSet
-    if (shortcutSet.shortcuts.isEmpty()) {
-      return
-    }
-
-    object : AnAction() {
-        override fun actionPerformed(e: AnActionEvent) {
-          runnable()
-        }
-      }
-      .registerCustomShortcutSet(shortcutSet, list)
-  }
+  ): ActionPresentation = action.createPresentation(actionManager, dataContext, keysOverride)
 
   private fun onActionChosen(item: ActionPresentation, e: ActionEvent) {
     onActionChosen(item, e.modifiers)
@@ -110,8 +67,7 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
       return
     }
 
-    list.setSelectedValue(item, false)
-    val invocation = { performAction(item.action, modifiers) }
+    val invocation = { performAction(item.value, modifiers) }
     if (item.sticky) {
       invocation()
       getApplication().invokeLater {
@@ -138,11 +94,7 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
    * action should be enabled/disabled for current cursor position.
    */
   private fun updatePresentations() {
-    getDataContextAsync { context ->
-      generateSequence(0, Int::inc).take(list.model.size).map(list.model::getElementAt).forEach {
-        it.update(actionManager, context)
-      }
-    }
+    getDataContextAsync { context -> items.forEach { it.update(actionManager, context) } }
   }
 
   private fun getDataContextAsync(consumer: (DataContext) -> Unit) {
@@ -174,16 +126,12 @@ internal class Popup(action: ActionNode, e: AnActionEvent) {
     }
   }
 
-  private fun performAction(
-    action: AnAction,
-    modifiers: Int,
-    dataContext: DataContext,
-  ) {
+  private fun performAction(action: AnAction, modifiers: Int, dataContext: DataContext) {
     val event =
       AnActionEvent(
         null,
         dataContext,
-        ActionNode.ACTION_PLACE,
+        ACTION_PLACE_QUICK_LIST_POPUP_ACTION,
         action.templatePresentation.clone(),
         actionManager,
         modifiers,