Skip to content

Commit 1de178c

Browse files
committed
refactor: apply workaround to compile with the latest EAP while retaining backward compatibility
1 parent af22849 commit 1de178c

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

src/main/kotlin/com/github/lppedd/cc/CCExtensions.kt

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.intellij.codeInsight.completion.CompletionParameters
55
import com.intellij.codeInsight.template.impl.TemplateManagerImpl
66
import com.intellij.codeInsight.template.impl.TemplateState
77
import com.intellij.openapi.actionSystem.Presentation
8+
import com.intellij.openapi.application.Application
89
import com.intellij.openapi.application.ApplicationManager
910
import com.intellij.openapi.application.ex.ApplicationUtil
1011
import com.intellij.openapi.diagnostic.Logger
@@ -40,6 +41,15 @@ import kotlin.internal.InlineOnly
4041
import kotlin.math.max
4142
import kotlin.math.min
4243

44+
// region Application
45+
46+
internal inline val application: Application
47+
get() = ApplicationManager.getApplication()
48+
49+
internal inline fun <reified T> Application.service(): T =
50+
getService(T::class.java)
51+
52+
// endregion
4353
// region PsiElement
4454

4555
@InlineOnly

src/main/kotlin/com/github/lppedd/cc/inspection/CommitInspectionsRegistrarStartupActivity.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package com.github.lppedd.cc.inspection
22

33
import com.github.lppedd.cc.api.CommitInspectionProvider
44
import com.github.lppedd.cc.api.CommitInspectionProviderService
5+
import com.github.lppedd.cc.application
6+
import com.github.lppedd.cc.service
57
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
6-
import com.intellij.openapi.components.service
78
import com.intellij.openapi.project.DumbAware
89
import com.intellij.openapi.project.Project
910
import com.intellij.openapi.startup.StartupActivity
@@ -14,7 +15,7 @@ import com.intellij.vcs.commit.message.CommitMessageInspectionProfile
1415
*/
1516
internal class CommitInspectionsRegistrarStartupActivity : StartupActivity, DumbAware {
1617
override fun runActivity(project: Project) {
17-
val inspectionProviderService = service<CommitInspectionProviderService>()
18+
val inspectionProviderService = application.service<CommitInspectionProviderService>()
1819
val inspections = inspectionProviderService.getInspectionProviders()
1920
.asSequence()
2021
.flatMap(CommitInspectionProvider::getInspections)

src/main/kotlin/com/github/lppedd/cc/whatsnew/WhatsNewDialog.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package com.github.lppedd.cc.whatsnew
22

3-
import com.github.lppedd.cc.CCBundle
3+
import com.github.lppedd.cc.*
44
import com.github.lppedd.cc.api.WhatsNewProvider
55
import com.github.lppedd.cc.api.WhatsNewProviderService
6-
import com.github.lppedd.cc.setFocused
7-
import com.github.lppedd.cc.setName
86
import com.github.lppedd.cc.ui.CCDialogWrapper
97
import com.github.lppedd.cc.ui.NoContentTabbedPaneWrapper
10-
import com.intellij.openapi.components.service
118
import com.intellij.openapi.project.Project
129
import com.intellij.openapi.ui.DialogWrapper.DialogStyle.COMPACT
1310
import com.intellij.ui.SimpleColoredText
@@ -31,7 +28,7 @@ internal class WhatsNewDialog(project: Project) : CCDialogWrapper(project) {
3128
private val newerAction = NewerAction()
3229
private val tabSelectedHandlers = mutableMapOf<Int, () -> Unit>()
3330

34-
private val providers = service<WhatsNewProviderService>()
31+
private val providers = application.service<WhatsNewProviderService>()
3532
.getWhatsNewProviders()
3633
.asSequence()
3734
.sortedWith(WhatsNewProviderComparator)

src/main/kotlin/com/github/lppedd/cc/whatsnew/WhatsNewStartupActivity.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package com.github.lppedd.cc.whatsnew
22

33
import com.github.lppedd.cc.api.WhatsNewProvider
44
import com.github.lppedd.cc.api.WhatsNewProviderService
5-
import com.intellij.openapi.components.service
5+
import com.github.lppedd.cc.application
6+
import com.github.lppedd.cc.service
67
import com.intellij.openapi.project.DumbAware
78
import com.intellij.openapi.project.Project
89
import com.intellij.openapi.startup.StartupActivity
@@ -21,7 +22,7 @@ internal class WhatsNewStartupActivity : StartupActivity, DumbAware {
2122
return
2223
}
2324

24-
val shouldDisplay = service<WhatsNewProviderService>()
25+
val shouldDisplay = application.service<WhatsNewProviderService>()
2526
.getWhatsNewProviders()
2627
.asSequence()
2728
.filter(WhatsNewProvider::shouldDisplayAtStartup)

0 commit comments

Comments
 (0)