Add support for string-based TSCN resource id's

grammar/TscnParser.bnf

@@ -70,8 +70,9 @@ list_expression ::= L_BRACKET expression? (COMMA expression)* R_BRACKET
 dictionary_expression ::= L_CURLY pair_expression? (COMMA pair_expression)* R_CURLY
 pair_expression ::= expression COLON expression
 function_expression ::= IDENTIFIER L_PAREN expression? (COMMA expression)* R_PAREN
-sub_expression ::= SUB_RESOURCE L_PAREN NUMBER R_PAREN {methods=[getReference]}
-ext_expression ::= EXT_RESOURCE L_PAREN NUMBER R_PAREN {methods=[getReference]}
+sub_expression ::= SUB_RESOURCE L_PAREN sub_ext_id R_PAREN {methods=[getReference]}
+ext_expression ::= EXT_RESOURCE L_PAREN sub_ext_id R_PAREN {methods=[getReference]}
+private sub_ext_id ::= NUMBER | string
 
 // primitives
 private primitive ::= resource_string

src/main/kotlin/tscn/psi/reference/TscnResourceExtReference.kt

@@ -17,12 +17,14 @@ class TscnResourceExtReference(element: TscnExtExpression) :
     PsiReferenceBase<TscnExtExpression>(element, TextRange.from(0, element.textLength)) {
 
     override fun resolve(): PsiElement? {
-        val id = element.number.text.toIntOrNull()
+        val id = element.number
+            ?: element.doubleQuotedString
+            ?: element.singleQuotedString
             ?: return null
         val entry = PsiTreeUtil.getChildrenOfType(element.containingFile, TscnExtEntry::class.java).orEmpty()
             .flatMap { entry -> PsiTreeUtil.getChildrenOfType(entry, TscnAttribute::class.java).orEmpty().asIterable() }
             .filter { attribute -> attribute.key.text == "id" }
-            .find { attribute -> attribute.value.text.toIntOrNull() == id }
+            .find { attribute -> attribute.value.text == id.text }
             ?.parentOfTypes(TscnExtEntry::class)
             ?: return null
         val resourcePath = entry.attributeList.find { it.key.text.equals("path") }?.value?.text

src/main/kotlin/tscn/psi/reference/TscnResourceSubReference.kt

@@ -14,12 +14,15 @@ class TscnResourceSubReference(element: TscnSubExpression) :
     PsiReferenceBase<TscnSubExpression>(element, TextRange.from(0, element.textLength)) {
 
     override fun resolve(): PsiElement? {
-        val id = element.number.text.toIntOrNull()
+        val id = element.number
+            ?: element.doubleQuotedString
+            ?: element.singleQuotedString
             ?: return null
-        return PsiTreeUtil.getChildrenOfType(element.containingFile, TscnSubEntry::class.java).orEmpty()
+        return PsiTreeUtil.getChildrenOfType(element.containingFile, TscnSubEntry::class.java)
+            .orEmpty()
             .flatMap { entry -> PsiTreeUtil.getChildrenOfType(entry, TscnAttribute::class.java).orEmpty().asIterable() }
             .filter { attribute -> attribute.key.text == "id" }
-            .find { attribute -> attribute.value.text.toIntOrNull() == id }
+            .find { attribute -> attribute.value.text == id.text }
             ?.parentOfTypes(TscnSubEntry::class)
     }
 

src/test/kotlin/tscn/TscnReferenceContributorTest.kt

@@ -1,30 +1,40 @@
 package tscn
 
 import BaseTest
+import com.intellij.psi.PsiElement
 
 class TscnReferenceContributorTest : BaseTest() {
 
-    fun `test sub_resource reference`() {
-        environment.configureByText(
-            "scene.tscn", """ 
+    fun `test sub_resource number reference`() {
+        val reference = resolveReferenceAtCaret("""
             [sub_resource id=1]            
             [node]
-            x = SubResource<caret>(1)                
-        """.trimIndent()
-        )
-        val ref = environment.getReferenceAtCaretPositionWithAssertion()
-        assertNotNull(ref.resolve())
+            x = SubResource<caret>(1)     
+        """)
+        assertNotNull(reference)
+    }
+
+    fun `test sub_resource string reference`() {
+        val reference = resolveReferenceAtCaret("""
+            [sub_resource id="foo"]            
+            [node]
+            x = SubResource<caret>("foo")     
+        """)
+        assertNotNull(reference)
     }
 
     fun `test sub_resource reference not exists`() {
-        environment.configureByText(
-            "scene.tscn", """ 
+        val reference = resolveReferenceAtCaret(""" 
             [node]
             x = SubResource<caret>(1)                
-        """.trimIndent()
-        )
-        val ref = environment.getReferenceAtCaretPositionWithAssertion()
-        assertNull(ref.resolve())
+        """)
+        assertNull(reference)
+    }
+
+    private fun resolveReferenceAtCaret(code: String): PsiElement? {
+        environment.configureByText("scene.tscn", code)
+        val reference = environment.getReferenceAtCaretPositionWithAssertion()
+        return reference.resolve()
     }
 
 }