language-server: fix missing MXML root tags inside fx:Component root

BowlerHatLLC · Nov 6, 2024 · ec5b637 · ec5b637
1 parent 6b82141
commit ec5b637
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java b/language-server/src/main/java/com/as3mxml/vscode/providers/CompletionProvider.java
@@ -896,26 +896,30 @@ private CompletionList mxmlCompletion(IMXMLTagData offsetTag, Path path, int cur
                                 .getFileSpecification(offsetUnit.getAbsoluteFilename());
                         MXMLNamespace fxNS = MXMLNamespaceUtils.getMXMLLanguageNamespace(fileSpec,
                                 project.getWorkspace());
-                        IMXMLData mxmlParent = offsetTag.getParent();
-                        if (mxmlParent != null && parentTag.equals(mxmlParent.getRootTag())) {
+                        if (fxNS != null) {
+                            IMXMLTagData gpTag = parentTag.getParentTag();
+                            IMXMLData mxmlParent = offsetTag.getParent();
+                            if ((mxmlParent != null && parentTag.equals(mxmlParent.getRootTag()))
+                                    || (gpTag != null && fxNS.uri.equals(gpTag.getURI()))) {
+                                if (offsetPrefix.length() == 0) {
+                                    // this tag doesn't have a prefix
+                                    addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix, true,
+                                            includeOpenTagBracket, result);
+                                } else if (offsetPrefix.equals(fxNS.prefix)) {
+                                    // this tag has a prefix
+                                    addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix, false, false, result);
+                                }
+                            }
                             if (offsetPrefix.length() == 0) {
                                 // this tag doesn't have a prefix
-                                addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix, true,
-                                        includeOpenTagBracket, result);
+                                addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix,
+                                        includeOpenTagBracket, true, result);
                             } else if (offsetPrefix.equals(fxNS.prefix)) {
                                 // this tag has a prefix
-                                addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix, false, false, result);
+                                addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix, false,
+                                        false, result);
                             }
                         }
-                        if (offsetPrefix.length() == 0) {
-                            // this tag doesn't have a prefix
-                            addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix,
-                                    includeOpenTagBracket, true, result);
-                        } else if (offsetPrefix.equals(fxNS.prefix)) {
-                            // this tag has a prefix
-                            addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix, false,
-                                    false, result);
-                        }
                         String defaultPropertyName = classDefinition.getDefaultPropertyName(project);
                         // if [DefaultProperty] is set, then we can instantiate
                         // types as child elements
@@ -982,11 +986,15 @@ private CompletionList mxmlCompletion(IMXMLTagData offsetTag, Path path, int cur
                 IMXMLData mxmlParent = offsetTag.getParent();
                 IFileSpecification fileSpec = fileTracker.getFileSpecification(offsetUnit.getAbsoluteFilename());
                 MXMLNamespace fxNS = MXMLNamespaceUtils.getMXMLLanguageNamespace(fileSpec, project.getWorkspace());
-                if (mxmlParent != null && offsetTag.equals(mxmlParent.getRootTag())) {
-                    addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix, true, includeOpenTagBracket, result);
+                if (fxNS != null) {
+                    if ((mxmlParent != null && offsetTag.equals(mxmlParent.getRootTag()))
+                            || (parentTag != null && fxNS.uri.equals(parentTag.getURI()))) {
+                        addRootMXMLLanguageTagsToAutoComplete(offsetTag, fxNS.prefix,
+                                true, includeOpenTagBracket, result);
+                    }
+                    addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix,
+                            includeOpenTagBracket, true, result);
                 }
-                addMXMLLanguageTagToAutoComplete(IMXMLLanguageConstants.COMPONENT, fxNS.prefix, includeOpenTagBracket,
-                        true, result);
                 String defaultPropertyName = classDefinition.getDefaultPropertyName(project);
                 // if [DefaultProperty] is set, then we can instantiate
                 // types as child elements