Skip to content

Commit fda1873

Browse files
committed
refactor: remove unnecessary Application extension functions
1 parent 31e84ed commit fda1873

4 files changed

Lines changed: 9 additions & 18 deletions

File tree

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ 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
98
import com.intellij.openapi.application.ApplicationManager
109
import com.intellij.openapi.application.ex.ApplicationUtil
1110
import com.intellij.openapi.diagnostic.Logger
@@ -41,15 +40,6 @@ import kotlin.internal.InlineOnly
4140
import kotlin.math.max
4241
import kotlin.math.min
4342

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
5343
// region PsiElement
5444

5545
@InlineOnly

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ 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
75
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
6+
import com.intellij.openapi.components.service
87
import com.intellij.openapi.project.DumbAware
98
import com.intellij.openapi.project.Project
109
import com.intellij.openapi.startup.ProjectActivity
@@ -20,7 +19,7 @@ internal class CommitInspectionsRegistrarStartupActivity : ProjectActivity, Dumb
2019
}
2120

2221
override suspend fun execute(project: Project) {
23-
val inspectionProviderService = application.service<CommitInspectionProviderService>()
22+
val inspectionProviderService = service<CommitInspectionProviderService>()
2423
val inspectionProviders = inspectionProviderService.getInspectionProviders()
2524
val inspections = inspectionProviders.flatMap(CommitInspectionProvider::getInspections)
2625

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package com.github.lppedd.cc.whatsnew
22

3-
import com.github.lppedd.cc.*
3+
import com.github.lppedd.cc.CCBundle
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
68
import com.github.lppedd.cc.ui.CCDialogWrapper
79
import com.github.lppedd.cc.ui.NoContentTabbedPaneWrapper
10+
import com.intellij.openapi.components.service
811
import com.intellij.openapi.project.Project
912
import com.intellij.openapi.ui.DialogWrapper.DialogStyle.COMPACT
1013
import com.intellij.ui.SimpleColoredText
@@ -28,7 +31,7 @@ internal class WhatsNewDialog(project: Project) : CCDialogWrapper(project) {
2831
private val newerAction = NewerAction()
2932
private val tabSelectedHandlers = mutableMapOf<Int, () -> Unit>()
3033

31-
private val providers = application.service<WhatsNewProviderService>()
34+
private val providers = service<WhatsNewProviderService>()
3235
.getWhatsNewProviders()
3336
.asSequence()
3437
.sortedWith(WhatsNewProviderComparator)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ 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.github.lppedd.cc.application
6-
import com.github.lppedd.cc.service
5+
import com.intellij.openapi.components.service
76
import com.intellij.openapi.project.DumbAware
87
import com.intellij.openapi.project.Project
98
import com.intellij.openapi.startup.ProjectActivity
@@ -21,7 +20,7 @@ internal class WhatsNewStartupActivity : ProjectActivity, DumbAware {
2120
return
2221
}
2322

24-
val shouldDisplay = application.service<WhatsNewProviderService>()
23+
val shouldDisplay = service<WhatsNewProviderService>()
2524
.getWhatsNewProviders()
2625
.asSequence()
2726
.filter(WhatsNewProvider::shouldDisplayAtStartup)

0 commit comments

Comments
 (0)