MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[external annotations] fix lookup of bundled annotations list IDEA-243907

Browse Source 
GitOrigin-RevId: 84dede4686bb93937c8b3e1183e1b123338290dc
This commit is contained in:
Nikita Skvortsov
2020-06-19 11:41:53 +03:00
committed by intellij-monorepo-bot
parent 971216100f
commit a9a74d6917
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/externalAnnotation/location/JBBundledAnnotationsProvider.kt
+9 -7
View File
@@ -14,7 +14,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.util.text.VersionComparatorUtil
class JBBundledAnnotationsProvider : AnnotationsLocationProvider {
private val myPluginId = PluginManagerCore.CORE_ID
private val myPluginId = PluginManagerCore.JAVA_PLUGIN_ID
private val knownAnnotations: Map<String, Map<VersionRange, AnnotationsLocation>> by lazy { buildAnnotations() }
override fun getLocations(project: Project,
@@ -34,12 +34,14 @@ class JBBundledAnnotationsProvider : AnnotationsLocationProvider {
private fun buildAnnotations(): Map<String, Map<VersionRange, AnnotationsLocation>> {
val extensionsRootType = ExtensionsRootType.getInstance()
val annotationsFile = extensionsRootType.findResource(myPluginId, "predefinedExternalAnnotations.json")
?: extensionsRootType.run {
extractBundledResources(myPluginId, "")
findResource(myPluginId, "predefinedExternalAnnotations.json")
}
?: return emptyMap()
var annotationsFile = extensionsRootType.findResource(myPluginId, "predefinedExternalAnnotations.json")
if (annotationsFile?.exists() != true) {
extensionsRootType.extractBundledResources(myPluginId, "")
annotationsFile = extensionsRootType.findResource(myPluginId, "predefinedExternalAnnotations.json")
if (annotationsFile?.exists() != true) {
return emptyMap()
}
}
val gsonBuilder = GsonBuilder()
gsonBuilder.registerTypeAdapter(VersionRange::class.java, VersionRangeTypeAdapter())