diff options
| author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2018-04-24 20:35:42 +0300 |
|---|---|---|
| committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2018-07-14 23:44:08 +0300 |
| commit | a3f16fd75c200020465f79563ca58b2833236865 (patch) | |
| tree | 03530320492ca7e3d055a9de6efd8319485e78d2 /core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | |
| parent | 31a4a3804020130e7caf5826b317aaee5547c0d0 (diff) | |
| download | dokka-a3f16fd75c200020465f79563ca58b2833236865.tar.gz dokka-a3f16fd75c200020465f79563ca58b2833236865.tar.bz2 dokka-a3f16fd75c200020465f79563ca58b2833236865.zip | |
[backport] Stabilize signatures to fix linking from Java to Kotlin
Basically there is 2 ways to get signature, from PSI and from
descriptors, and there should be only one way in one session
Original: adc09f2
Diffstat (limited to 'core/src/main/kotlin/Analysis/AnalysisEnvironment.kt')
| -rw-r--r-- | core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index b2e4b490..6854b323 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.cli.jvm.config.* import org.jetbrains.kotlin.cli.jvm.index.JavaRoot import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.container.getService +import org.jetbrains.kotlin.container.tryGetService import org.jetbrains.kotlin.context.ProjectContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor @@ -250,7 +251,7 @@ class DokkaResolutionFacade(override val project: Project, } override fun <T : Any> tryGetFrontendService(element: PsiElement, serviceClass: Class<T>): T? { - return null + return resolverForModule.componentProvider.tryGetService(serviceClass) } override fun resolveToDescriptor(declaration: KtDeclaration, bodyResolveMode: BodyResolveMode): DeclarationDescriptor { |