diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndexer.kt b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndexer.kt index e9f950a..6ee6f9a 100644 --- a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndexer.kt +++ b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndexer.kt @@ -28,13 +28,13 @@ class AsyncAPISchemaIndexer: DataIndexer, FileContent> { } asyncapiSchema ?: return index - index[AsyncAPISchemaIndex.asyncapi] = setOf(inputData.file.path) + index[AsyncAPISpecificationIndex.asyncapi] = setOf(inputData.file.path) var foundReferences = emptySet() AsyncAPISpecificationReferencesCollector(asyncapiSchema, inputData.file.parent).collectFiles().forEach { (referenceType, references) -> index[referenceType] = references foundReferences = foundReferences.plus(references) - index[AsyncAPISchemaIndex.references] = foundReferences + index[AsyncAPISpecificationIndex.references] = foundReferences } return index diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndex.kt b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationIndex.kt similarity index 96% rename from src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndex.kt rename to src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationIndex.kt index 67d4cfd..1e04d03 100644 --- a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISchemaIndex.kt +++ b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationIndex.kt @@ -14,7 +14,7 @@ import java.io.DataOutput * I use [Set] because of cases when schema has multiple references to schemas. * @author Pavel Bodiachevskii */ -class AsyncAPISchemaIndex: FileBasedIndexExtension>() { +class AsyncAPISpecificationIndex: FileBasedIndexExtension>() { override fun getName(): ID> = asyncapiIndexId diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationReferencesCollector.kt b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationReferencesCollector.kt index 914f30f..890e9e3 100644 --- a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationReferencesCollector.kt +++ b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/index/AsyncAPISpecificationReferencesCollector.kt @@ -54,28 +54,28 @@ class AsyncAPISpecificationReferencesCollector( companion object { val possibleReferencesLocation = mapOf( - AsyncAPISchemaIndex.channels to setOf("\$.channels.*.\$ref"), - AsyncAPISchemaIndex.parameters to setOf( + AsyncAPISpecificationIndex.channels to setOf("\$.channels.*.\$ref"), + AsyncAPISpecificationIndex.parameters to setOf( "\$.channels.*.parameters.*.\$ref", "\$.components.parameters.*.\$ref" ), - AsyncAPISchemaIndex.traits to setOf( + AsyncAPISpecificationIndex.traits to setOf( "\$.channels.*.subscribe.traits.*.\$ref", "\$.channels.*.publish.traits.*.\$ref", "\$.components.messages.*.traits.*.\$ref" ), - AsyncAPISchemaIndex.messages to setOf( + AsyncAPISpecificationIndex.messages to setOf( "\$.channels.*.subscribe.message.\$ref", "\$.channels.*.publish.message.\$ref", "\$.components.messages.*.\$ref" ), - AsyncAPISchemaIndex.schemas to setOf("\$.components.schemas.*.\$ref"), - AsyncAPISchemaIndex.securitySchemes to setOf("\$.components.securitySchemes.*.\$ref"), - AsyncAPISchemaIndex.correlationIds to setOf( + AsyncAPISpecificationIndex.schemas to setOf("\$.components.schemas.*.\$ref"), + AsyncAPISpecificationIndex.securitySchemes to setOf("\$.components.securitySchemes.*.\$ref"), + AsyncAPISpecificationIndex.correlationIds to setOf( "\$.components.messages.*.correlationId.\$ref", "\$.components.messages.*.traits.*.correlationId.\$ref" ), - AsyncAPISchemaIndex.headers to setOf( + AsyncAPISpecificationIndex.headers to setOf( "\$.components.messages.*.headers.\$ref", "\$.components.messages.*.traits.*.headers.\$ref" ) diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/inspection/AsyncAPISchemaDetector.kt b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/inspection/AsyncAPISchemaDetector.kt index d9e1e76..df2fedc 100644 --- a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/inspection/AsyncAPISchemaDetector.kt +++ b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/inspection/AsyncAPISchemaDetector.kt @@ -1,6 +1,6 @@ package com.asyncapi.plugin.idea.extensions.inspection -import com.asyncapi.plugin.idea.extensions.index.AsyncAPISchemaIndex +import com.asyncapi.plugin.idea.extensions.index.AsyncAPISpecificationIndex import com.intellij.json.psi.JsonFile import com.intellij.psi.PsiFile import com.intellij.psi.search.GlobalSearchScope @@ -68,16 +68,16 @@ class AsyncAPISchemaDetector { private fun indexedAsyncAPISchemas(asyncapiSchema: PsiFile): List { return FileBasedIndex.getInstance().getValues( - AsyncAPISchemaIndex.asyncapiIndexId, - AsyncAPISchemaIndex.asyncapi, + AsyncAPISpecificationIndex.asyncapiIndexId, + AsyncAPISpecificationIndex.asyncapi, GlobalSearchScope.allScope(asyncapiSchema.project) ).flatten() } private fun indexedReferencedAsyncAPISchemas(asyncapiSchema: PsiFile): List { return FileBasedIndex.getInstance().getValues( - AsyncAPISchemaIndex.asyncapiIndexId, - AsyncAPISchemaIndex.references, + AsyncAPISpecificationIndex.asyncapiIndexId, + AsyncAPISpecificationIndex.references, GlobalSearchScope.allScope(asyncapiSchema.project) ).flatten() } diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 1e263f8..687bc0d 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -45,7 +45,7 @@ - +