Skip to content

Commit 2b6d9d7

Browse files
authored
fix: update IntelliJ platform to 2024.1 (#61)
1 parent 8f671fe commit 2b6d9d7

File tree

6 files changed

+22
-2
lines changed

6 files changed

+22
-2
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ kotlin {
2020
}
2121

2222
intellijPlatform {
23+
buildSearchableOptions = true
2324
pluginConfiguration {
2425
name = "Git extended update-index"
2526
ideaVersion {
@@ -37,7 +38,7 @@ intellijPlatform {
3738

3839
dependencies {
3940
intellijPlatform {
40-
create("IC", "2022.3")
41+
create(type = "IC", version = "2024.1", useInstaller = false)
4142
bundledPlugin("Git4Idea")
4243

4344
pluginVerifier()

src/main/kotlin/com/github/monosoul/git/updateindex/extended/ExtendedUpdateIndexAction.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.github.monosoul.git.updateindex.extended.ExtendedUpdateIndexCommand.N
66
import com.github.monosoul.git.updateindex.extended.ExtendedUpdateIndexCommand.SKIP_WORKTREE
77
import com.github.monosoul.git.updateindex.extended.support.CommandInvoker
88
import com.github.monosoul.git.updateindex.extended.support.PresentationUpdater
9+
import com.intellij.openapi.actionSystem.ActionUpdateThread
910
import com.intellij.openapi.actionSystem.AnActionEvent
1011
import com.intellij.openapi.actionSystem.Presentation
1112
import com.intellij.openapi.diagnostic.debug
@@ -19,6 +20,8 @@ sealed class ExtendedUpdateIndexAction(private val command: ExtendedUpdateIndexC
1920

2021
private val logger = thisLogger()
2122

23+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
24+
2225
override fun update(event: AnActionEvent) {
2326
event.run {
2427
project?.updatePresentation(presentation)

src/main/kotlin/com/github/monosoul/git/updateindex/extended/changes/view/ToggleSkippedWorktreeAction.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.github.monosoul.git.updateindex.extended.changes.view
33
import com.github.monosoul.git.updateindex.extended.changes.view.Constants.PROPERTY
44
import com.github.monosoul.git.updateindex.extended.support.PresentationUpdater
55
import com.intellij.ide.util.PropertiesComponent
6+
import com.intellij.openapi.actionSystem.ActionUpdateThread
67
import com.intellij.openapi.actionSystem.AnActionEvent
78
import com.intellij.openapi.actionSystem.Presentation
89
import com.intellij.openapi.actionSystem.ToggleAction
@@ -15,6 +16,8 @@ class ToggleSkippedWorktreeAction : ToggleAction() {
1516

1617
private val logger = logger<ToggleSkippedWorktreeAction>()
1718

19+
override fun getActionUpdateThread() = ActionUpdateThread.BGT
20+
1821
override fun update(event: AnActionEvent) {
1922
super.update(event)
2023
event.run {

src/test/kotlin/com/github/monosoul/git/updateindex/extended/UpdateIndexLineHandlerFactoryTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ internal class UpdateIndexLineHandlerFactoryTest {
7474
every { gitExecutableManager.tryGetVersion(any()) } returns CAN_NOT_OVERRIDE_GIT_CONFIG_FOR_COMMAND
7575
every { gitExecutableManager.getExecutable(project) } returns gitExecutable
7676
every { gitExecutable.exePath } returns exePath
77+
every { gitExecutable.isLocal } returns true
7778
}
7879

7980
@AfterEach

src/test/kotlin/com/github/monosoul/git/updateindex/extended/changes/view/GetSkippedWorktreeFilesTaskTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ internal class GetSkippedWorktreeFilesTaskTest {
157157
}
158158

159159
expectThat(captor.captured) {
160-
get { printableCommandLine() } isEqualTo "git ls-files -v"
160+
get { printableCommandLine() } isEqualTo "\"\" ls-files -v"
161161
}
162162
}
163163

src/test/kotlin/com/github/monosoul/git/updateindex/extended/changes/view/SkippedWorktreeChangesViewModifierTest.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,20 @@ import com.intellij.mock.MockApplication
1111
import com.intellij.mock.MockLocalFileSystem
1212
import com.intellij.mock.MockProject
1313
import com.intellij.openapi.application.ApplicationManager
14+
import com.intellij.openapi.application.AsyncExecutionService
1415
import com.intellij.openapi.progress.ProgressManager
1516
import com.intellij.openapi.util.Disposer.dispose
1617
import com.intellij.openapi.vcs.FilePath
1718
import com.intellij.openapi.vcs.LocalFilePath
19+
import com.intellij.openapi.vcs.actions.VcsContextFactory
1820
import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode
1921
import com.intellij.openapi.vcs.changes.ui.ChangesViewModelBuilder
2022
import com.intellij.openapi.vcs.changes.ui.NoneChangesGroupingFactory
2123
import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
2224
import com.intellij.openapi.vfs.LocalFileSystem
2325
import com.intellij.openapi.vfs.VirtualFile
2426
import com.intellij.openapi.vfs.VirtualFileManager
27+
import com.intellij.peer.impl.VcsContextFactoryImpl
2528
import io.mockk.Called
2629
import io.mockk.every
2730
import io.mockk.impl.annotations.MockK
@@ -53,6 +56,10 @@ internal class SkippedWorktreeChangesViewModifierTest {
5356
private lateinit var project: MockProject
5457
private lateinit var propertiesComponent: AppPropertyService
5558
private lateinit var localFileSystem: MockLocalFileSystem
59+
private lateinit var vcsContextFactory: VcsContextFactory
60+
61+
@MockK(relaxed = true)
62+
private lateinit var asyncExecutionService: AsyncExecutionService
5663

5764
@MockK(relaxUnitFun = true)
5865
private lateinit var progressManager: ProgressManager
@@ -82,6 +89,11 @@ internal class SkippedWorktreeChangesViewModifierTest {
8289
application.registerService(virtualFileManager, parent)
8390
every { virtualFileManager.getFileSystem(any()) } returns localFileSystem
8491

92+
vcsContextFactory = VcsContextFactoryImpl()
93+
application.registerService(vcsContextFactory, parent)
94+
95+
application.registerService(asyncExecutionService, parent)
96+
8597
modifier = SkippedWorktreeChangesViewModifier(project)
8698
}
8799

0 commit comments

Comments
 (0)