chylex/IntelliJ-Keyboard-Master
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-Keyboard-Master.git synced 2025-04-21 05:15:43 +02:00
Code

Update uses of obsolete APIs for IDEA 2024.2

Browse Source
This commit is contained in:
chylex 2024-08-10 15:30:55 +02:00
parent f3a3685084
commit 356826f6ae
Signed by: chylex
GPG Key ID: 4DE42C8F19A80548
7 changed files with 12 additions and 9 deletions

4
build.gradle.kts
View File

@ -16,7 +16,7 @@ repositories {
intellij {
type.set("IU")
version.set("2024.1.1")
version.set("2024.2")
updateSinceUntilBuild.set(false)
plugins.add("com.intellij.java")
@ -35,7 +35,7 @@ dependencies {
}
tasks.patchPluginXml {
sinceBuild.set("241")
sinceBuild.set("242")
}
tasks.test {

3
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoError/GotoNextErrorInOtherModeAction.kt
View File

@ -2,9 +2,10 @@ package com.chylex.intellij.keyboardmaster.feature.action.gotoError
import com.intellij.codeInsight.CodeInsightActionHandler
import com.intellij.codeInsight.daemon.impl.actions.GotoNextErrorAction
import com.intellij.openapi.actionSystem.DataContext
class GotoNextErrorInOtherModeAction : GotoNextErrorAction() {
override fun getHandler(): CodeInsightActionHandler {
override fun getHandler(dataContext: DataContext): CodeInsightActionHandler {
return GotoErrorInOtherModeHandler(forward = true)
}
}

3
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoError/GotoPreviousErrorInOtherModeAction.kt
View File

@ -2,9 +2,10 @@ package com.chylex.intellij.keyboardmaster.feature.action.gotoError
import com.intellij.codeInsight.CodeInsightActionHandler
import com.intellij.codeInsight.daemon.impl.actions.GotoPreviousErrorAction
import com.intellij.openapi.actionSystem.DataContext
class GotoPreviousErrorInOtherModeAction : GotoPreviousErrorAction() {
override fun getHandler(): CodeInsightActionHandler {
override fun getHandler(dataContext: DataContext): CodeInsightActionHandler {
return GotoErrorInOtherModeHandler(forward = false)
}
}

2
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/action/gotoType/GotoTypeInFileHandler.kt
View File

@ -52,7 +52,7 @@ class GotoTypeInFileHandler(private val forward: Boolean) : CodeInsightActionHan
private companion object {
fun getNavigationOffsets(file: PsiFile, searchedOffsetRange: IntRange): IntArray {
val structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file)
val structureViewBuilder = LanguageStructureViewBuilder.getInstance().getStructureViewBuilder(file)
if (structureViewBuilder !is TreeBasedStructureViewBuilder) {
return intArrayOf()
}

4
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/codeCompletion/CodeCompletionPopupConfiguration.kt
View File

@ -1,13 +1,13 @@
package com.chylex.intellij.keyboardmaster.feature.codeCompletion
import com.intellij.util.containers.IntIntHashMap
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap
object CodeCompletionPopupConfiguration {
const val SHORTCUT_NONE = -1
const val SHORTCUT_NEXT_PAGE = -2
const val SHORTCUT_PREV_PAGE = -3
private val charToShortcutMap = IntIntHashMap(16, SHORTCUT_NONE)
private val charToShortcutMap = Int2IntOpenHashMap(16).also { it.defaultReturnValue(SHORTCUT_NONE) }
private var hintTexts = mutableListOf<String>()
val itemShortcutCount

2
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/KeyStrokeNode.kt
View File

@ -59,7 +59,7 @@ internal interface KeyStrokeNode<T> {
override fun performAction(holder: T, actionEvent: AnActionEvent, keyEvent: KeyEvent) {
val action = actionEvent.actionManager.getAction(name) ?: return
val dataContext = CustomizedDataContext.create(actionEvent.dataContext) {
val dataContext = CustomizedDataContext.withProvider(actionEvent.dataContext) {
when {
PlatformDataKeys.CONTEXT_COMPONENT.`is`(it) -> holder.component
else -> null

3
src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/VimNavigationDispatcher.kt
View File

@ -28,7 +28,8 @@ import javax.swing.KeyStroke
internal open class VimNavigationDispatcher<T : JComponent>(final override val component: T, private val rootNode: KeyStrokeNode.Parent<VimNavigationDispatcher<T>>) : DumbAwareAction(), ComponentHolder {
companion object {
private val DISPOSABLE = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
private val DISPOSABLE
get() = ApplicationManager.getApplication().getService(PluginDisposableService::class.java)
@JvmStatic
protected val ENTER_KEY: KeyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)