This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 34ceceed3e basic auto completion for maven version properties.
new 5cb46cf145 Merge pull request #5823 from
mbien/maven-version-property-completion
34ceceed3e is described below
commit 34ceceed3e9ef5fcf45986cee9a622db5d589537
Author: Michael Bien <[email protected]>
AuthorDate: Thu Apr 13 21:10:05 2023 +0200
basic auto completion for maven version properties.
It is somewhat common to use properties for artifact versions, esp
when several artifacts share the same version.
This implements basic auto completion for properties which are used
as version field.
In contrast to hints, completion is implemented in the grammar
and doesn't have the full context. This will only take properties
into account which are in the same pom file as their usage.
---
.../modules/maven/grammar/MavenProjectGrammar.java | 149 ++++++++++++++++++++-
.../modules/maven/grammar/POM-abbreviations.xml | 2 +-
2 files changed, 147 insertions(+), 4 deletions(-)
diff --git
a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
index b5076c3474..6bd648ffe2 100644
---
a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
+++
b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
@@ -33,13 +33,16 @@ import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
@@ -464,6 +467,80 @@ public class MavenProjectGrammar extends
AbstractSchemaBasedGrammar {
return Collections.enumeration(elems);
}
}
+ // version property completion
+ String propXPath = "/project/properties/"; //NOI18N
+ if (path.startsWith(propXPath) && path.indexOf("/",
propXPath.length()) == -1) { //NOI18N
+ String propName = path.substring(propXPath.length());
+ String decorated = "${"+propName+"}"; //NOI18N
+
+ Set<ArtifactInfoHolder> usages = new HashSet<>();
+
+ NodeList pomNodes;
+ if (virtualTextCtx.getCurrentPrefix().isEmpty()) {
+ pomNodes =
virtualTextCtx.getParentNode().getParentNode().getChildNodes();
+ } else {
+ pomNodes =
virtualTextCtx.getParentNode().getParentNode().getParentNode().getChildNodes();
+ }
+
+ for (Node node : iterate(pomNodes)) {
+ if ("dependencies".equals(node.getNodeName())) { //NOI18N
+ collectArtifacts("dependency", node, decorated, usages);
//NOI18N
+ } else if ("dependencyManagement".equals(node.getNodeName()))
{ //NOI18N
+ for (Node dmChild : iterate(node.getChildNodes())) {
+ if ("dependencies".equals(dmChild.getNodeName())) {
//NOI18N
+ collectArtifacts("dependency", dmChild, decorated,
usages); //NOI18N
+ break;
+ }
+ }
+ } else if ("build".equals(node.getNodeName())) { //NOI18N
+ for (Node buildChild : iterate(node.getChildNodes())) {
+ if ("plugins".equals(buildChild.getNodeName())) {
//NOI18N
+ collectArtifacts("plugin", buildChild, decorated,
usages); //NOI18N
+ } else if
("pluginManagement".equals(buildChild.getNodeName())) { //NOI18N
+ for (Node pmChild :
iterate(buildChild.getChildNodes())) {
+ if ("plugins".equals(pmChild.getNodeName())) {
//NOI18N
+ collectArtifacts("plugin", pmChild,
decorated, usages); //NOI18N
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // intersection set; make sure all usages support the suggested
versions
+ Set<String> versions = new LinkedHashSet<>();
+ boolean first = true;
+ boolean partial = false;
+ for (ArtifactInfoHolder artifact : usages) {
+ Result<NBVersionInfo> versionInfo =
RepositoryQueries.getVersionsResult(artifact.getGroupId(),
artifact.getArtifactId(), null);
+ partial |= versionInfo.isPartial();
+
+ List<String> list = versionInfo.getResults().stream()
+
.map(NBVersionInfo::getVersion)
+
.collect(Collectors.toList());
+ if (first) {
+ versions.addAll(list);
+ first = false;
+ } else {
+ versions.retainAll(list);
+ }
+ }
+
+ List<GrammarResult> completionItems = new ArrayList<>();
+ for (String version : versions) {
+ if (version.startsWith(virtualTextCtx.getCurrentPrefix())) {
+ completionItems.add(new MyTextElement(version,
virtualTextCtx.getCurrentPrefix()));
+ }
+ }
+
+ if (partial) {
+ completionItems.add(new PartialTextElement());
+ }
+
+ return Collections.enumeration(completionItems);
+ }
+
if (path.endsWith("dependencies/dependency/groupId") || //NOI18N
path.endsWith("extensions/extension/groupId")) { //NOI18N
Result<String> result =
RepositoryQueries.getGroupsResult(RepositoryPreferences.getInstance().getRepositoryInfos());
@@ -682,6 +759,38 @@ public class MavenProjectGrammar extends
AbstractSchemaBasedGrammar {
}
return null;
}
+
+ // NodeList isn't iterable for some reason
+ private static Iterable<Node> iterate(NodeList list) {
+ return () -> new Iterator<Node>() {
+ int current = 0;
+ @Override public boolean hasNext() {
+ return current < list.getLength();
+ }
+ @Override public Node next() {
+ return list.item(current++);
+ }
+ };
+ }
+
+ private void collectArtifacts(String artifactTag, Node parent, String
decoratedProperty, Set<ArtifactInfoHolder> usages) {
+ for (Node child : iterate(parent.getChildNodes())) {
+ if (artifactTag.equals(child.getNodeName())) {
+ ArtifactInfoHolder artifact = new ArtifactInfoHolder();
+ artifact.setGroupId("org.apache.maven.plugins"); //NOI18N
+ for (Node attr : iterate(child.getChildNodes())) {
+ if (attr.getNodeName() != null) switch
(attr.getNodeName()) {
+ case "groupId":
artifact.setGroupId(attr.getFirstChild().getNodeValue()); break; //NOI18N
+ case "artifactId":
artifact.setArtifactId(attr.getFirstChild().getNodeValue()); break; //NOI18N
+ case "version":
artifact.setVersion(attr.getFirstChild().getNodeValue()); break; //NOI18N
+ }
+ }
+ if (artifact.getGroupId() != null && artifact.getArtifactId()
!= null && decoratedProperty.equals(artifact.getVersion())) {
+ usages.add(artifact);
+ }
+ }
+ }
+ }
private Enumeration<GrammarResult> collectGoals(Document pluginDoc,
HintContext virtualTextCtx) {
@SuppressWarnings("unchecked")
@@ -737,7 +846,6 @@ public class MavenProjectGrammar extends
AbstractSchemaBasedGrammar {
}
-
private static class ArtifactInfoHolder {
private String artifactId;
private String groupId;
@@ -766,6 +874,41 @@ public class MavenProjectGrammar extends
AbstractSchemaBasedGrammar {
public void setVersion(String version) {
this.version = version;
}
-
- }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 67 * hash + Objects.hashCode(this.artifactId);
+ hash = 67 * hash + Objects.hashCode(this.groupId);
+ hash = 67 * hash + Objects.hashCode(this.version);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
}
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final ArtifactInfoHolder other = (ArtifactInfoHolder) obj;
+ if (!Objects.equals(this.artifactId, other.artifactId)) {
+ return false;
+ }
+ if (!Objects.equals(this.groupId, other.groupId)) {
+ return false;
+ }
+ return Objects.equals(this.version, other.version);
+ }
+
+ @Override
+ public String toString() {
+ return "ArtifactInfoHolder{" + "artifactId=" + artifactId + ",
groupId=" + groupId + ", version=" + version + '}'; //NOI18N
+ }
+
+ }
+}
diff --git
a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/POM-abbreviations.xml
b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/POM-abbreviations.xml
index a7f2129f10..3f7775e33a 100644
---
a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/POM-abbreviations.xml
+++
b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/POM-abbreviations.xml
@@ -41,7 +41,7 @@
<codetemplate abbreviation="rep" xml:space="preserve">
<code><![CDATA[<repository>
<id>${ID newVarName default="repo"}</id>
- <url>${URL newVarName default="http://"}</url>${cursor}
+ <url>${URL newVarName default="https://"}</url>${cursor}
</repository>]]></code>
</codetemplate>
<codetemplate abbreviation="exec" xml:space="preserve">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
