Versionless feature 1.0 (#299)

* Versionless feature changes. Added platform component Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. Added hover for platform component Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. modified diagnostics Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. modified diagnostics Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. adding more diagnostic scenarios Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature 1.0 (#296) * Versionless feature changes. Added platform component Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. Added hover for platform component Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. modified diagnostics Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. modified diagnostics Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. adding more diagnostic scenarios Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> --------- Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. code changes based on review comments Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes. code changes based on review comments Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes - More tests Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes - More tests Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes -adding a scenario to check only single common platform Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes -adding new 24.0.0.8 featurelist xml into test inputs Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes -more review comments Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes -more review comments Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> * Versionless feature changes -changed message Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com> --------- Signed-off-by: Arun Venmany <Arun.Kumar.V.N@ibm.com>
OpenLiberty · Aug 28, 2024 · 5c63a4f · 5c63a4f
1 parent 656e5a8
commit 5c63a4f
Show file tree

Hide file tree

Showing 23 changed files with 211,690 additions and 14,887 deletions.
diff --git a/lemminx-liberty/src/it/schema-gen-ol-it/pom.xml b/lemminx-liberty/src/it/schema-gen-ol-it/pom.xml
@@ -84,7 +84,7 @@
                     <runtimeArtifact>
                         <groupId>io.openliberty</groupId>
                         <artifactId>openliberty-runtime</artifactId>
-                        <version>22.0.0.12</version>
+                        <version>24.0.0.8</version>
                     </runtimeArtifact>
                 </configuration>
                 <executions>

diff --git a/lemminx-liberty/src/it/schema-gen-ol-it/src/test/java/LibertyWorkspaceIT.java b/lemminx-liberty/src/it/schema-gen-ol-it/src/test/java/LibertyWorkspaceIT.java
@@ -39,7 +39,7 @@ public void testWorkspace() throws BadLocationException, IOException, URISyntaxE
         testWorkspaceFolders.add(testWorkspace);
         LibertyProjectsManager.getInstance().setWorkspaceFolders(testWorkspaceFolders);
 
-        String schemaFileName = "ol-22.0.0.12.xsd";
+        String schemaFileName = "ol-24.0.0.8.xsd";
         File schemaFile = new File(LibertyUtils.getTempDir(LibertyProjectsManager.getInstance().getWorkspaceFolder(serverXmlFile.toURI().toString())), schemaFileName);
         String serverGenXSDURI = schemaFile.toPath().toUri().toString().replace("///", "/");
 
@@ -79,8 +79,8 @@ public void testGetFeatures() throws BadLocationException {
 
         CompletionItem jaxrsCompletion = c("jaxrs-2.1", "jaxrs-2.1");
 
-        // would be 228 if mpConfig-1.4 was not already specified - this is using ol-22.0.0.12
-        final int TOTAL_ITEMS = 227; // total number of available completion items
+        // would be 337 if mpConfig-1.4 was not already specified - this is using ol-24.0.0.8
+        final int TOTAL_ITEMS = 337; // total number of available completion items
 
         XMLAssert.testCompletionFor(serverXML, null, serverXmlFile.toURI().toString(), TOTAL_ITEMS, jaxrsCompletion);
 
@@ -89,7 +89,7 @@ public void testGetFeatures() throws BadLocationException {
         XMLAssert.testCompletionFor(serverXML, null, serverXmlFile.toURI().toString(), TOTAL_ITEMS, websocket);
 
         // Verify that a feature list was NOT generated. It should have downloaded the features.json from Maven Central.
-        String featureListName = "featurelist-ol-22.0.0.12.xml";
+        String featureListName = "featurelist-ol-24.0.0.8.xml";
         File featurelistFile = new File(LibertyUtils.getTempDir(LibertyProjectsManager.getInstance().getWorkspaceFolder(serverXmlFile.toURI().toString())), featureListName);
 
         org.junit.jupiter.api.Assertions.assertFalse(featurelistFile.exists(), "Found unexpected generated featurelist file: "+featureListName);

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
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2020, 2023 IBM Corporation and others.
+* Copyright (c) 2020, 2024 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -15,6 +15,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import org.eclipse.lemminx.commons.BadLocationException;
 import org.eclipse.lemminx.dom.DOMDocument;
@@ -71,9 +73,65 @@ public void onXMLContent(ICompletionRequest request, ICompletionResponse respons
             List<CompletionItem> featureCompletionItems = buildCompletionItems(parentElement, request.getXMLDocument(),
                     existingFeatures, featureName, featureMgrNode);
             featureCompletionItems.stream().forEach(item -> response.addCompletionItem(item));
+        } else if (parentElement.getTagName().equals(LibertyConstants.PLATFORM_ELEMENT)) {
+            DOMNode platformTextNode = (DOMNode) parentElement.getChildNodes().item(0);
+            String currentPlatformName = platformTextNode != null ? platformTextNode.getTextContent() : "";
+            String currentPlatformNameWithoutVersion = LibertyUtils.stripVersion(currentPlatformName);
+            // collect existing platforms
+            List<String> existingPlatforms = new ArrayList<>();
+            if (parentElement.getParentNode() != null
+                    && parentElement.getParentNode().getNodeName().equals(LibertyConstants.FEATURE_MANAGER_ELEMENT)) {
+                DOMNode featureMgrNode = parentElement.getParentNode();
+                List<DOMNode> features = featureMgrNode.getChildren();
+                for (DOMNode featureNode : features) {
+                    DOMNode featureTextNode = (DOMNode) featureNode.getChildNodes().item(0);
+                    // skip nodes that do not have any text value (ie. comments)
+                    if (featureNode.getNodeName().equals(LibertyConstants.PLATFORM_ELEMENT) && featureTextNode != null) {
+                        String platformName = featureTextNode.getTextContent();
+                        String platformWithoutVersion = LibertyUtils.stripVersion(platformName);
+                        if (!platformWithoutVersion.equalsIgnoreCase(currentPlatformNameWithoutVersion)) {
+                            existingPlatforms.add(platformWithoutVersion.toLowerCase());
+                        }
+                    }
+                }
+            }
+            this.buildPlatformCompletionItems(request, response, parentElement, existingPlatforms);
         }
     }
 
+    /**
+     * build completion items for platforms
+     *
+     * @param request           request
+     * @param response          response
+     * @param parentElement     parent element xml dom
+     * @param existingPlatforms
+     */
+    private void buildPlatformCompletionItems(ICompletionRequest request, ICompletionResponse response, DOMElement parentElement, List<String> existingPlatforms) {
+        DOMNode platformTextNode = (DOMNode) parentElement.getChildNodes().item(0);
+        String platformName = platformTextNode != null ? platformTextNode.getTextContent() : null;
+        LibertyRuntime runtimeInfo = LibertyUtils.getLibertyRuntimeInfo(request.getXMLDocument());
+        String libertyVersion =  runtimeInfo == null ? null : runtimeInfo.getRuntimeVersion();
+        String libertyRuntime =  runtimeInfo == null ? null : runtimeInfo.getRuntimeType();
+
+        final int requestDelay = SettingsService.getInstance().getRequestDelay();
+        //get all platforms
+        Set<String> platforms = FeatureService.getInstance().getAllPlatforms(libertyVersion, libertyRuntime, requestDelay,
+                request.getXMLDocument().getDocumentURI());
+        platforms.stream().filter(it->(Objects.isNull(platformName) || it.contains(platformName)))
+                .filter(p -> !existingPlatforms.contains(LibertyUtils.stripVersion(p).toLowerCase()))
+                .forEach(platformItem -> {
+                    Range range = XMLPositionUtility.createRange(parentElement.getStartTagCloseOffset() + 1,
+                            parentElement.getEndTagOpenOffset(), request.getXMLDocument());
+                    Either<TextEdit, InsertReplaceEdit> edit = Either.forLeft(new TextEdit(range, platformItem));
+                    CompletionItem completionItem = new CompletionItem();
+                    completionItem.setLabel(platformItem);
+                    completionItem.setTextEdit(edit);
+                    completionItem.setDocumentation(LibertyUtils.getPlatformDescription(platformItem));
+                    response.addCompletionItem(completionItem);
+                });
+    }
+
     private CompletionItem buildFeatureCompletionItem(Feature feature, DOMElement featureElement,
             DOMDocument document) {
         String featureName = feature.getWlpInformation().getShortName();
@@ -107,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 = featureNameLowerCase.contains("-") ? featureNameLowerCase.substring(0, featureNameLowerCase.lastIndexOf("-")+1) : featureNameLowerCase;
+            String featureNameToCompare = LibertyUtils.stripVersion(featureNameLowerCase);
 
             List<Feature> completionFeatures = FeatureService.getInstance().getFeatureReplacements(featureNameToCompare, featureMgrNode, libertyVersion, libertyRuntime, requestDelay, domDocument.getDocumentURI());
             return getFeatureCompletionItems(featureElement, domDocument, completionFeatures);