Skip to content

Commit fc3db5c

Browse files
committed
refactor: use the same method ordering for all AnAction implementations
1 parent a52cac2 commit fc3db5c

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/main/kotlin/com/github/lppedd/cc/completion/menu/FilterAction.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,6 @@ internal class FilterAction(
7373
override fun getActionUpdateThread(): ActionUpdateThread =
7474
ActionUpdateThread.EDT
7575

76-
override fun actionPerformed(event: AnActionEvent) {
77-
if (enhancer.filterSelected(this)) {
78-
filterItems(!isFiltered)
79-
lookup.resort(false)
80-
}
81-
}
82-
8376
override fun update(event: AnActionEvent) {
8477
val presentation = provider.getPresentation()
8578
val icon = if (isFiltered) {
@@ -91,6 +84,13 @@ internal class FilterAction(
9184
event.presentation.updateIcons(icon)
9285
}
9386

87+
override fun actionPerformed(event: AnActionEvent) {
88+
if (enhancer.filterSelected(this)) {
89+
filterItems(!isFiltered)
90+
lookup.resort(false)
91+
}
92+
}
93+
9494
override fun equals(other: Any?): Boolean =
9595
other is FilterAction && provider.getId() == other.provider.getId()
9696

src/main/kotlin/com/github/lppedd/cc/completion/menu/SettingsActions.kt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ internal class SettingsActions(
4545
override fun getActionUpdateThread(): ActionUpdateThread =
4646
ActionUpdateThread.EDT
4747

48-
override fun actionPerformed(e: AnActionEvent) {
49-
val configService = CCConfigService.getInstance(lookup.project)
50-
configService.completionType = if (configService.completionType == TEMPLATE) POPUP else TEMPLATE
51-
enhancer.settingChanged()
52-
}
53-
5448
override fun update(event: AnActionEvent) {
5549
val configService = CCConfigService.getInstance(lookup.project)
5650
event.presentation.also {
@@ -62,17 +56,17 @@ internal class SettingsActions(
6256
}
6357
}
6458
}
65-
}
66-
67-
private inner class FilterModeChangeAction : AnAction() {
68-
override fun getActionUpdateThread(): ActionUpdateThread =
69-
ActionUpdateThread.EDT
7059

7160
override fun actionPerformed(e: AnActionEvent) {
7261
val configService = CCConfigService.getInstance(lookup.project)
73-
configService.providerFilterType = if (configService.providerFilterType == HIDE_SELECTED) KEEP_SELECTED else HIDE_SELECTED
62+
configService.completionType = if (configService.completionType == TEMPLATE) POPUP else TEMPLATE
7463
enhancer.settingChanged()
7564
}
65+
}
66+
67+
private inner class FilterModeChangeAction : AnAction() {
68+
override fun getActionUpdateThread(): ActionUpdateThread =
69+
ActionUpdateThread.EDT
7670

7771
override fun update(event: AnActionEvent) {
7872
val hideSelected = CCBundle["cc.completion.menu.filter.hideSelected"]
@@ -87,5 +81,11 @@ internal class SettingsActions(
8781
}
8882
}
8983
}
84+
85+
override fun actionPerformed(e: AnActionEvent) {
86+
val configService = CCConfigService.getInstance(lookup.project)
87+
configService.providerFilterType = if (configService.providerFilterType == HIDE_SELECTED) KEEP_SELECTED else HIDE_SELECTED
88+
enhancer.settingChanged()
89+
}
9090
}
9191
}

0 commit comments

Comments
 (0)