diff options
| author | Alex Saveau <asaveau@google.com> | 2020-06-30 19:44:35 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-30 19:44:35 +0000 |
| commit | 1e6036c2c57ae07625a35c4d288496bec2a7e6bc (patch) | |
| tree | a393daccb9485c393d2f0e33d54a575c390dfc92 | |
| parent | 527883d423cf5f96522e9b7c65eeda6969d98bcc (diff) | |
| parent | 5bf5a8aa477d439dc053642f665cfa9950ad18a3 (diff) | |
| download | dokka-1e6036c2c57ae07625a35c4d288496bec2a7e6bc.tar.gz | |
Fix NPE loading JavadocManager in JavadocParser#resolveExternalLink am: 92fcde47f4 am: 5bf5a8aa47
Original change: https://android-review.googlesource.com/c/platform/external/dokka/+/1353263
Change-Id: Ibf27614fc4abe45b9f42e8ee92f77b7288164708
| -rw-r--r-- | core/src/main/kotlin/Analysis/AnalysisEnvironment.kt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt index 7003024c8..9fea67407 100644 --- a/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt +++ b/core/src/main/kotlin/Analysis/AnalysisEnvironment.kt @@ -15,8 +15,11 @@ import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.util.Disposer import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.psi.PsiElement +import com.intellij.psi.impl.source.javadoc.JavadocManagerImpl +import com.intellij.psi.javadoc.CustomJavadocTagProvider +import com.intellij.psi.javadoc.JavadocManager +import com.intellij.psi.javadoc.JavadocTagInfo import com.intellij.psi.search.GlobalSearchScope -import com.intellij.util.io.URLUtil import org.jetbrains.kotlin.analyzer.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.jvm.JvmBuiltIns @@ -96,10 +99,19 @@ class AnalysisEnvironment(val messageCollector: MessageCollector) : Disposable { CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), OrderEnumerationHandler.EP_NAME, OrderEnumerationHandler.Factory::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getArea(environment.project), + JavadocTagInfo.EP_NAME, JavadocTagInfo::class.java) + CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), + CustomJavadocTagProvider.EP_NAME, CustomJavadocTagProvider::class.java) + projectComponentManager.registerService(ProjectFileIndex::class.java, projectFileIndex) projectComponentManager.registerService(ProjectRootManager::class.java, CoreProjectRootManager(projectFileIndex)) + projectComponentManager.registerService(JavadocManager::class.java, + JavadocManagerImpl(environment.project)) + projectComponentManager.registerService(CustomJavadocTagProvider::class.java, + CustomJavadocTagProvider { emptyList() }) return environment } |