language-server: resolve super() to super constructor instead of supe…

…rclass (closes #769)
BowlerHatLLC · Oct 9, 2024 · 5addc55 · 5addc55
1 parent 389ca09
commit 5addc55
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/DefinitionProvider.java
@@ -24,6 +24,7 @@
 
 import org.apache.royale.compiler.common.ISourceLocation;
 import org.apache.royale.compiler.common.XMLName;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
 import org.apache.royale.compiler.constants.IMetaAttributeConstants;
 import org.apache.royale.compiler.definitions.IClassDefinition;
 import org.apache.royale.compiler.definitions.IDefinition;
@@ -255,13 +256,29 @@ private Either<List<? extends Location>, List<? extends LocationLink>> actionScr
                 case SUPER: {
                     IClassNode classNode = (IClassNode) offsetNode.getAncestorOfType(IClassNode.class);
                     if (classNode != null) {
-                        expressionToResolve = classNode.getBaseClassExpressionNode();
+                        if (parentNode instanceof IFunctionCallNode) {
+                            IFunctionCallNode functionCallNode = (IFunctionCallNode) parentNode;
+                            if (IASKeywordConstants.SUPER.equals(functionCallNode.getFunctionName())) {
+                                expressionToResolve = (IExpressionNode) languageIdentifierNode;
+                                IClassDefinition classDefinition = classNode.getDefinition();
+                                if (classDefinition != null) {
+                                    IClassDefinition baseClassDefinition = classDefinition
+                                            .resolveBaseClass(projectData.project);
+                                    if (baseClassDefinition != null) {
+                                        definition = baseClassDefinition.getConstructor();
+                                    }
+                                }
+                            }
+                        }
+                        if (definition == null && expressionToResolve == null) {
+                            expressionToResolve = classNode.getBaseClassExpressionNode();
+                        }
                     }
                     break;
                 }
                 default:
             }
-            if (expressionToResolve != null) {
+            if (definition == null && expressionToResolve != null) {
                 definition = expressionToResolve.resolve(projectData.project);
             }
         }

diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/HoverProvider.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 
 import org.apache.royale.compiler.common.ISourceLocation;
+import org.apache.royale.compiler.constants.IASKeywordConstants;
 import org.apache.royale.compiler.constants.IMetaAttributeConstants;
 import org.apache.royale.compiler.definitions.IClassDefinition;
 import org.apache.royale.compiler.definitions.IDefinition;
@@ -242,13 +243,29 @@ private Hover actionScriptHover(IASNode offsetNode, ILspProject project) {
                 case SUPER: {
                     IClassNode classNode = (IClassNode) offsetNode.getAncestorOfType(IClassNode.class);
                     if (classNode != null) {
-                        expressionToResolve = classNode.getBaseClassExpressionNode();
+                        if (parentNode instanceof IFunctionCallNode) {
+                            IFunctionCallNode functionCallNode = (IFunctionCallNode) parentNode;
+                            if (IASKeywordConstants.SUPER.equals(functionCallNode.getFunctionName())) {
+                                expressionToResolve = (IExpressionNode) languageIdentifierNode;
+                                IClassDefinition classDefinition = classNode.getDefinition();
+                                if (classDefinition != null) {
+                                    IClassDefinition baseClassDefinition = classDefinition
+                                            .resolveBaseClass(project);
+                                    if (baseClassDefinition != null) {
+                                        definition = baseClassDefinition.getConstructor();
+                                    }
+                                }
+                            }
+                        }
+                        if (definition == null && expressionToResolve == null) {
+                            expressionToResolve = classNode.getBaseClassExpressionNode();
+                        }
                     }
                     break;
                 }
                 default:
             }
-            if (expressionToResolve != null) {
+            if (definition == null && expressionToResolve != null) {
                 definition = expressionToResolve.resolve(project);
             }
         }