fix: fixes Some reference properties are skipped during the indexing …

…process #68 Signed-off-by: Lorenzo Addazi <[email protected]>
Strumenta · Mar 7, 2024 · f0def9e · f0def9e
1 parent 24d927e
commit f0def9e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.21")
-    implementation("com.strumenta.kolasu:kolasu-core:1.5.31")
+    implementation("com.strumenta.kolasu:kolasu-core:1.5.45")
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:0.21.1")
     implementation("org.apache.lucene:lucene-core:9.8.0")
 }

diff --git a/library/src/main/kotlin/com/strumenta/kolasu/languageserver/KolasuServer.kt b/library/src/main/kotlin/com/strumenta/kolasu/languageserver/KolasuServer.kt
@@ -6,6 +6,7 @@ import com.strumenta.kolasu.model.Point
 import com.strumenta.kolasu.model.PossiblyNamed
 import com.strumenta.kolasu.model.ReferenceByName
 import com.strumenta.kolasu.model.children
+import com.strumenta.kolasu.model.kReferenceByNameProperties
 import com.strumenta.kolasu.parsing.ASTParser
 import com.strumenta.kolasu.parsing.ParsingResult
 import com.strumenta.kolasu.traversing.findByPosition
@@ -240,15 +241,23 @@ open class KolasuServer<T : Node>(protected open val parser: ASTParser<T>?, prot
 
             if (node is PossiblyNamed && node.name != null) {
                 document.add(StringField("name", node.name, Field.Store.YES))
-            } else {
-                val referenceField = node::class.declaredMemberProperties.find { it.returnType.isSubtypeOf(typeOf<ReferenceByName<*>>()) }
-                referenceField?.javaField?.let { field ->
-                    field.isAccessible = true
-                    val value = field.get(node) as ReferenceByName<*>
-
-                    if (value.referred is Node && uuid[value.referred as Node] != null) {
-                        document.add(StringField("reference", uuid[value.referred as Node], Field.Store.YES))
-                    }
+            }
+
+            // handle reference by name properties
+            node.kReferenceByNameProperties()
+                .mapNotNull { it.get(node) as? ReferenceByName<*> }
+                .mapNotNull { it.referred as? Node }
+                .mapNotNull { uuid[it] }
+                .map { StringField("reference", it, Field.Store.YES) }
+                .forEach(document::add)
+
+            val referenceField = node::class.declaredMemberProperties.find { it.returnType.isSubtypeOf(typeOf<ReferenceByName<*>>()) }
+            referenceField?.javaField?.let { field ->
+                field.isAccessible = true
+                val value = field.get(node) as ReferenceByName<*>
+
+                if (value.referred is Node && uuid[value.referred as Node] != null) {
+                    document.add(StringField("reference", uuid[value.referred as Node], Field.Store.YES))
                 }
             }