Skip to content

Commit 5f271fd

Browse files
committed
refactor: optional ult provider
1 parent ef2e965 commit 5f271fd

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

marker/js-marker/src/main/kotlin/spp/jetbrains/marker/js/JavascriptLanguageProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class JavascriptLanguageProvider : LanguageProvider {
5656
val endpointDetector = AggregateEndpointDetector(
5757
project,
5858
mutableListOf<EndpointDetector<*>>().apply {
59-
addAll(getUltimateProvider(project).getEndpointDetectors(project))
59+
getUltimateProvider(project)?.let { addAll(it.getEndpointDetectors(project)) }
6060
add(JavascriptEndpointDetector(project))
6161
}
6262
)

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/JVMLanguageProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class JVMLanguageProvider : LanguageProvider {
6565
val endpointDetector = AggregateEndpointDetector(
6666
project,
6767
mutableListOf<EndpointDetector<*>>().apply {
68-
addAll(getUltimateProvider(project).getEndpointDetectors(project))
68+
getUltimateProvider(project)?.let { addAll(it.getEndpointDetectors(project)) }
6969
add(JVMEndpointDetector(project))
7070
}
7171
)

marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonLanguageProvider.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class PythonLanguageProvider : LanguageProvider {
5555
val endpointDetector = AggregateEndpointDetector(
5656
project,
5757
mutableListOf<EndpointDetector<*>>().apply {
58-
addAll(getUltimateProvider(project).getEndpointDetectors(project))
58+
getUltimateProvider(project)?.let { addAll(it.getEndpointDetectors(project)) }
5959
add(PythonEndpointDetector(project))
6060
}
6161
)

marker/src/main/kotlin/spp/jetbrains/marker/LanguageProvider.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ interface LanguageProvider {
2323
fun canSetup(): Boolean
2424
fun setup(project: Project)
2525

26-
fun getUltimateProvider(project: Project): UltimateProvider {
26+
fun getUltimateProvider(project: Project): UltimateProvider? {
2727
val ultimateProvider: UltimateProvider?
2828
val originalClassLoader = Thread.currentThread().contextClassLoader
2929
try {
@@ -32,7 +32,7 @@ interface LanguageProvider {
3232
} finally {
3333
Thread.currentThread().contextClassLoader = originalClassLoader
3434
}
35-
return ultimateProvider!!
35+
return ultimateProvider
3636
}
3737

3838
fun classExists(className: String): Boolean {

0 commit comments

Comments
 (0)