Merge branch 'release/2.6.0' into feat/preview_panel

asyncapi · Aug 28, 2024 · ad1fa05 · ad1fa05
2 parents 7c58e39 + 646db56
commit ad1fa05
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -13,6 +13,7 @@ version = "2.6.0+jre17"
 repositories {
     mavenCentral()
     intellijPlatform {
+        jetbrainsRuntime()
         defaultRepositories()
 
         jetbrainsRuntime()

diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/_core/xpath/PsiFileXPath.kt b/src/main/kotlin/com/asyncapi/plugin/idea/_core/xpath/PsiFileXPath.kt
@@ -18,8 +18,10 @@ abstract class PsiFileXPath<AsyncAPISpecification: PsiFile> {
      */
     fun compileXPath(specificationReference: String): String {
         return specificationReference
-                .removePrefix("\"")
+                .removePrefix("\"") // double quoted "some text"
                 .removeSuffix("\"")
+                .removePrefix("\'") // single quoted 'some text'
+                .removeSuffix("\'")
                 .replace("#/", "")
                 .split("/")
                 .joinToString(".", "$.", "")

diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/_core/xpath/YamlFileXPath.kt b/src/main/kotlin/com/asyncapi/plugin/idea/_core/xpath/YamlFileXPath.kt
@@ -14,7 +14,11 @@ object YamlFileXPath: PsiFileXPath<YAMLFile>() {
 
     override fun findText(asyncAPISpecification: YAMLFile?, psiXPath: String, partialMatch: Boolean): List<String> {
         return findPsi(asyncAPISpecification, psiXPath, partialMatch).map {
-            it.text.removePrefix("\"").removeSuffix("\"")
+            it.text
+                .removePrefix("\"") // double quoted "some text"
+                .removeSuffix("\"")
+                .removePrefix("\'") // single quoted 'some text'
+                .removeSuffix("\'")
         }
     }
 

diff --git a/src/main/kotlin/com/asyncapi/plugin/idea/extensions/psi/reference/AsyncAPIFileReference.kt b/src/main/kotlin/com/asyncapi/plugin/idea/extensions/psi/reference/AsyncAPIFileReference.kt
@@ -84,11 +84,23 @@ class AsyncAPIFileReference(
     }
 
     private fun extractFileLocation(fileReference: String): String? {
-        return fileReference.removePrefix("\"").removeSuffix("\"").split("#/").firstOrNull()
+        return fileReference
+            .removePrefix("\"") // double quoted 'some text'
+            .removeSuffix("\"")
+            .removePrefix("\'") // single quoted 'some text'
+            .removeSuffix("\'")
+            .split("#/")
+            .firstOrNull()
     }
 
     private fun extractLocalReference(fileReference: String): String? {
-        return fileReference.removePrefix("\"").removeSuffix("\"").split("#/").getOrNull(1)
+        return fileReference
+            .removePrefix("\"") // double quoted 'some text'
+            .removeSuffix("\"")
+            .removePrefix("\'") // single quoted 'some text'
+            .removeSuffix("\'")
+            .split("#/")
+            .getOrNull(1)
     }
 
     private fun findFile(fileLocation: String): PsiFile? {

diff --git a/...ea/extensions/psi/reference/contributor/yaml/AsyncAPISpecificationReferenceContributor.kt b/...ea/extensions/psi/reference/contributor/yaml/AsyncAPISpecificationReferenceContributor.kt
@@ -33,8 +33,8 @@ class AsyncAPISpecificationReferenceContributor: PsiReferenceContributor() {
         return expectedChild.withParent(expectedParent)
     }
 
-    private fun fileReferencePattern(): PsiElementPattern.Capture<YAMLValue> {
-        val expectedChild = PlatformPatterns.psiElement(YAMLValue::class.java)
+    private fun fileReferencePattern(): PsiElementPattern.Capture<YAMLQuotedText> {
+        val expectedChild = PlatformPatterns.psiElement(YAMLQuotedText::class.java)
                 .withText(StandardPatterns.string().contains(".yaml"))
 
         val expectedParent = PlatformPatterns.psiElement(YAMLKeyValue::class.java)

diff --git a/...ncapi/plugin/idea/extensions/psi/reference/provider/yaml/AsyncAPIFileReferenceProvider.kt b/...ncapi/plugin/idea/extensions/psi/reference/provider/yaml/AsyncAPIFileReferenceProvider.kt
@@ -14,7 +14,10 @@ class AsyncAPIFileReferenceProvider: PsiReferenceProvider() {
 
     override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
         /* experimental */
-        val value = element.text.removePrefix("\"").removeSuffix("\"")
+        val value = element.text.removePrefix("\"") // Double quoted "some text"
+            .removeSuffix("\"")
+            .removePrefix("\'") // Single quoted 'some text'
+            .removePrefix("\'")
         val textRange = TextRange(1, value.length + 1)
         /* experimental */
 

diff --git a/...capi/plugin/idea/extensions/psi/reference/provider/yaml/AsyncAPILocalReferenceProvider.kt b/...capi/plugin/idea/extensions/psi/reference/provider/yaml/AsyncAPILocalReferenceProvider.kt
@@ -14,7 +14,10 @@ class AsyncAPILocalReferenceProvider: PsiReferenceProvider() {
 
     override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
         /* experimental */
-        val value = element.text.removePrefix("\"").removeSuffix("\"")
+        val value = element.text.removePrefix("\"") // Double quoted "some text"
+            .removeSuffix("\"")
+            .removePrefix("\'") // Single quoted 'some text'
+            .removeSuffix("\'")
         val textRange = TextRange(1, value.length + 1)
         /* experimental */