Feature completion fix (#315)

* correcting copyrights Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * fixing feature completion issue for repeating same feature Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * fixing feature completion issue for repeating same feature Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> --------- Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>
OpenLiberty · Oct 22, 2024 · d79adf1 · d79adf1
1 parent d0c888e
commit d79adf1
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 3 deletions.
diff --git a/...y/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyCompletionParticipant.java b/...y/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyCompletionParticipant.java
@@ -165,7 +165,7 @@ private List<CompletionItem> buildCompletionItems(DOMElement featureElement, DOM
             String featureNameLowerCase = featureName.toLowerCase();
 
             // strip off version number after the - so that we can provide all possible valid versions of a feature for completion
-            String featureNameToCompare = LibertyUtils.stripVersion(featureNameLowerCase);
+            String featureNameToCompare = featureNameLowerCase.contains("-") ? featureNameLowerCase.substring(0, featureNameLowerCase.lastIndexOf("-")+1) : featureNameLowerCase;
 
             List<Feature> completionFeatures = FeatureService.getInstance().getFeatureReplacements(featureNameToCompare, featureMgrNode, libertyVersion, libertyRuntime, requestDelay, domDocument.getDocumentURI());
             return getFeatureCompletionItems(featureElement, domDocument, completionFeatures);

diff --git a/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java b/...iberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java
@@ -299,7 +299,7 @@ public List<Feature> getFeatureReplacements(String featureName, DOMNode featureM
      */
     public List<String> collectExistingFeatures(DOMNode featureManager, String currentFeatureName) {
         List<String> includedFeatures = new ArrayList<>();
-
+        boolean alreadyIgnoredOnce = false;
         if (featureManager == null) {
             return includedFeatures;
         }
@@ -311,7 +311,10 @@ public List<String> collectExistingFeatures(DOMNode featureManager, String curre
             if (featureNode.getNodeName().equals(LibertyConstants.FEATURE_ELEMENT) && featureTextNode != null) {
                 String featureName = featureTextNode.getTextContent();
                 String featureNameLowerCase = featureName.toLowerCase();
-                if (currentFeatureName == null || (currentFeatureName != null && !featureNameLowerCase.equalsIgnoreCase(currentFeatureName))) {
+                // if same feature is repeated, ignore it first time, but add for second time onwards
+                if (featureNameLowerCase.equalsIgnoreCase(currentFeatureName) && !alreadyIgnoredOnce) {
+                    alreadyIgnoredOnce = true;
+                } else {
                     includedFeatures.add(featureNameLowerCase);
                 }
             }

diff --git a/lemminx-liberty/src/test/java/io/openliberty/LibertyCompletionTest.java b/lemminx-liberty/src/test/java/io/openliberty/LibertyCompletionTest.java
@@ -159,4 +159,69 @@ public void testPlatformCompletionItem() throws BadLocationException {
                 XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, 8);
         }
 
+        // Tests the feature completion for same feature repetition
+        @Test
+        public void testFeatureRepetitionCompletionItem() throws BadLocationException {
+                String serverXML = String.join(newLine, //
+                        "<server description=\"Sample Liberty server\">", //
+                        "       <featureManager>", //
+                        "               <feature>servlet</feature>", //
+                        "               <feature>servlet|</feature>", //
+                        "       </featureManager>", //
+                        "</server>" //
+                );
+
+                // total number of available completion items
+                // 1 for sipServlet-1.1
+                // one for CDATA and one for <-
+                CompletionItem sipServletCompletionItem = c("sipServlet-1.1", "sipServlet-1.1");
+                XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, 3, sipServletCompletionItem);
+
+                serverXML = String.join(newLine, //
+                        "<server description=\"Sample Liberty server\">", //
+                        "       <featureManager>", //
+                        "               <feature>servlet-|</feature>", //
+                        "               <feature>servlet</feature>", //
+                        "       </featureManager>", //
+                        "</server>" //
+                );
+
+                // total number of available completion items
+                // 1 for sipServlet-1.1
+                // one for CDATA and one for <-
+                sipServletCompletionItem = c("sipServlet-1.1", "sipServlet-1.1");
+                XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, 3, sipServletCompletionItem);
+
+                serverXML = String.join(newLine, //
+                        "<server description=\"Sample Liberty server\">", //
+                        "       <featureManager>", //
+                        "               <feature>servlet-3.1</feature>", //
+                        "               <feature>servlet|</feature>", //
+                        "       </featureManager>", //
+                        "</server>" //
+                );
+
+                // total number of available completion items
+                // 1 for sipServlet-1.1
+                // one for CDATA and one for <-
+                sipServletCompletionItem = c("sipServlet-1.1", "sipServlet-1.1");
+                XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, 3, sipServletCompletionItem);
+
+                serverXML = String.join(newLine, //
+                        "<server description=\"Sample Liberty server\">", //
+                        "       <featureManager>", //
+                        "               <feature>servlet-</feature>", //
+                        "               <feature>servlet</feature>", //
+                        "               <feature>servlet|</feature>", //
+                        "       </featureManager>", //
+                        "</server>" //
+                );
+
+                // total number of available completion items
+                // 1 for sipServlet-1.1
+                // one for CDATA and one for <-
+                sipServletCompletionItem = c("sipServlet-1.1", "sipServlet-1.1");
+                XMLAssert.testCompletionFor(serverXML, null, serverXMLURI, 3, sipServletCompletionItem);
+        }
+
 }