Skip to content

Commit f673208

Browse files
committed
Use kotlin convenient function for retrieving services
1 parent 7e31464 commit f673208

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/main/kotlin/dev/arunvelsriram/desccron/DescribeCronAction.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import com.intellij.codeInsight.hint.HintManager
44
import com.intellij.openapi.actionSystem.AnAction
55
import com.intellij.openapi.actionSystem.AnActionEvent
66
import com.intellij.openapi.actionSystem.PlatformDataKeys
7-
import com.intellij.openapi.components.ServiceManager
7+
import com.intellij.openapi.components.service
88
import com.intellij.openapi.editor.Editor
99

1010

1111
class DescribeCronAction : AnAction() {
12-
private val cronDescriptor = ServiceManager.getService(CronDescriptor::class.java)
13-
private val hintManager = HintManager.getInstance()
12+
private val cronDescriptor = service<CronDescriptor>()
13+
private val hintManager = service<HintManager>()
1414

1515
override fun update(e: AnActionEvent) {
1616
val editor = e.getData(PlatformDataKeys.EDITOR)

src/test/kotlin/dev/arunvelsriram/desccron/DescribeCronActionTest.kt

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dev.arunvelsriram.desccron
33
import com.intellij.codeInsight.hint.HintManager
44
import com.intellij.openapi.actionSystem.AnActionEvent
55
import com.intellij.openapi.actionSystem.PlatformDataKeys
6-
import com.intellij.openapi.components.ServiceManager
6+
import com.intellij.openapi.application.ApplicationManager
77
import com.intellij.openapi.editor.Editor
88
import com.intellij.openapi.editor.SelectionModel
99
import io.mockk.*
@@ -30,10 +30,13 @@ internal class DescribeCronActionTest {
3030
@BeforeEach
3131
internal fun setUp() {
3232
MockKAnnotations.init(this)
33-
mockkStatic(ServiceManager::class)
34-
every { ServiceManager.getService(CronDescriptor::class.java) } returns cronDescriptor
35-
mockkStatic(HintManager::class)
36-
every { HintManager.getInstance() } returns hintManager
33+
mockkStatic(ApplicationManager::class)
34+
every {
35+
ApplicationManager.getApplication().getService(CronDescriptor::class.java, any())
36+
} returns cronDescriptor
37+
every {
38+
ApplicationManager.getApplication().getService(HintManager::class.java, any())
39+
} returns hintManager
3740
}
3841

3942
@Test

0 commit comments

Comments
 (0)