[JavaScript] Property assignments.

ris58h · Jul 18, 2023 · 4ece215 · 4ece215
1 parent 8021a21
commit 4ece215
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 13 deletions.
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptAssignmentExpression.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptAssignmentExpression.kt
@@ -3,4 +3,10 @@ package ris58h.webcalm.javascript.psi
 import com.intellij.extapi.psi.ASTWrapperPsiElement
 import com.intellij.lang.ASTNode
 
-class JavaScriptAssignmentExpression(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptExpression
+class JavaScriptAssignmentExpression(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptExpression {
+    val left: JavaScriptExpression?
+        get() = firstChild as? JavaScriptExpression
+
+    val right: JavaScriptExpression?
+        get() = if (firstChild == lastChild) null else lastChild as? JavaScriptExpression
+}
diff --git a/...in/kotlin/ris58h/webcalm/javascript/psi/JavaScriptComputedPropertyExpressionAssignment.kt b/...in/kotlin/ris58h/webcalm/javascript/psi/JavaScriptComputedPropertyExpressionAssignment.kt
@@ -0,0 +1,6 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptComputedPropertyExpressionAssignment(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptFunctionProperty.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptFunctionProperty.kt
@@ -0,0 +1,6 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptFunctionProperty(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptIdentifierReference.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptIdentifierReference.kt
@@ -141,16 +141,36 @@ class JavaScriptIdentifierReference(element: JavaScriptIdentifier, rangeInElemen
         assignable.doWhen(
             { identifier -> callback(identifier) },
             { array ->
-                array.elements.filterIsInstance<JavaScriptIdentifierExpression>().forEach {
-                    callback(it.identifier)
+                array.elements.forEach {
+                    processDeclarationsInExpression(it, callback)
                 }
             },
             { obj ->
                 obj.propertyAssignments.forEach {
-                    val identifier = it.propertyShorthand?.identifier
-                    if (identifier != null) callback(identifier)
+                    when (it) {
+                        is JavaScriptPropertyShorthand -> {
+                            val expression = it.expression
+                            if (expression != null) processDeclarationsInExpression(expression, callback)
+                        }
+                        else -> {
+                            // TODO: other property assignments
+                        }
+                    }
                 }
             }
         )
     }
+
+    private fun processDeclarationsInExpression(expression: JavaScriptExpression, callback: (PsiNamedElement) -> Unit) {
+        when (expression) {
+            is JavaScriptAssignmentExpression -> {
+                val left = expression.left
+                if (left != null) processDeclarationsInExpression(left, callback)
+            }
+            is JavaScriptIdentifierExpression -> callback(expression.identifier)
+            else -> {
+                // TODO: other expressions
+            }
+        }
+    }
 }
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyAssignment.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyAssignment.kt
@@ -1,10 +1,5 @@
 package ris58h.webcalm.javascript.psi
 
-import com.intellij.extapi.psi.ASTWrapperPsiElement
-import com.intellij.lang.ASTNode
+import com.intellij.psi.PsiElement
 
-class JavaScriptPropertyAssignment(node: ASTNode) : ASTWrapperPsiElement(node) {
-    //TODO: support other types of assignment
-    val propertyShorthand: JavaScriptIdentifierExpression?
-        get() = this.findChildByClass(JavaScriptIdentifierExpression::class.java)
-}
+sealed interface JavaScriptPropertyAssignment : PsiElement
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyExpressionAssignment.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyExpressionAssignment.kt
@@ -0,0 +1,6 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptPropertyExpressionAssignment(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyGetter.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyGetter.kt
@@ -0,0 +1,6 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptPropertyGetter(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertySetter.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertySetter.kt
@@ -0,0 +1,6 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptPropertySetter(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyShorthand.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptPropertyShorthand.kt
@@ -0,0 +1,9 @@
+package ris58h.webcalm.javascript.psi
+
+import com.intellij.extapi.psi.ASTWrapperPsiElement
+import com.intellij.lang.ASTNode
+
+class JavaScriptPropertyShorthand(node: ASTNode) : ASTWrapperPsiElement(node), JavaScriptPropertyAssignment {
+    val expression: JavaScriptExpression?
+        get() = this.findChildByClass(JavaScriptExpression::class.java)
+}
diff --git a/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptTypes.kt b/src/main/kotlin/ris58h/webcalm/javascript/psi/JavaScriptTypes.kt
@@ -200,6 +200,12 @@ object JavaScriptTypes {
         private val OBJECT = RULES[JavaScriptParser.RULE_objectLiteral]
         private val ARRAY = RULES[JavaScriptParser.RULE_arrayLiteral]
         private val PROPERTY_ASSIGNMENT = RULES[JavaScriptParser.RULE_propertyAssignment]
+        private val PROPERTY_EXPRESSION_ASSIGNMENT = createLabeledRuleElement("PropertyExpressionAssignment", PROPERTY_ASSIGNMENT)
+        private val COMPUTED_PROPERTY_EXPRESSION_ASSIGNMENT = createLabeledRuleElement("ComputedPropertyExpressionAssignment", PROPERTY_ASSIGNMENT)
+        private val FUNCTION_PROPERTY = createLabeledRuleElement("FunctionProperty", PROPERTY_ASSIGNMENT)
+        private val PROPERTY_GETTER = createLabeledRuleElement("PropertyGetter", PROPERTY_ASSIGNMENT)
+        private val PROPERTY_SETTER = createLabeledRuleElement("PropertySetter", PROPERTY_ASSIGNMENT)
+        private val PROPERTY_SHORTHAND = createLabeledRuleElement("PropertyShorthand", PROPERTY_ASSIGNMENT)
         private val TEMPLATE_STRING = RULES[JavaScriptParser.RULE_templateStringLiteral]
         private val ANONYMOUS_FUNCTION = RULES[JavaScriptParser.RULE_anonymousFunction]
         private val CLASS_DECLARATION = RULES[JavaScriptParser.RULE_classDeclaration]
@@ -262,7 +268,13 @@ object JavaScriptTypes {
                 ARGUMENT -> JavaScriptArgument(node)
                 OBJECT -> JavaScriptObject(node)
                 ARRAY -> JavaScriptArray(node)
-                PROPERTY_ASSIGNMENT -> JavaScriptPropertyAssignment(node)
+                PROPERTY_ASSIGNMENT -> unexpectedNode(node)
+                PROPERTY_EXPRESSION_ASSIGNMENT -> JavaScriptPropertyExpressionAssignment(node)
+                COMPUTED_PROPERTY_EXPRESSION_ASSIGNMENT -> JavaScriptComputedPropertyExpressionAssignment(node)
+                FUNCTION_PROPERTY -> JavaScriptFunctionProperty(node)
+                PROPERTY_GETTER -> JavaScriptPropertyGetter(node)
+                PROPERTY_SETTER -> JavaScriptPropertySetter(node)
+                PROPERTY_SHORTHAND -> JavaScriptPropertyShorthand(node)
                 TEMPLATE_STRING -> JavaScriptTemplateString(node)
                 ANONYMOUS_FUNCTION -> JavaScriptAnonymousFunction(node)
                 CLASS_DECLARATION -> JavaScriptClassDeclaration(node)