Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Maven Property refactorings #420

Merged
merged 1 commit into from
Jun 22, 2023
Merged

Fix Maven Property refactorings #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 36 additions & 5 deletions lemminx-maven/src/main/java/org/eclipse/lemminx/extensions/maven/MavenLemminxExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ public class MavenLemminxExtension implements IXMLExtension {
XMLMavenSettings settings = new XMLMavenSettings();
private URIResolverExtensionManager resolverExtensionManager;
private List<WorkspaceFolder> initialWorkspaceFolders = List.of();

private LinkedHashSet<URI> currentWorkspaceFolders = new LinkedHashSet<>();

@Override
public void doSave(ISaveContext context) {
if (context.getType() == SaveContextType.SETTINGS) {
Expand Down Expand Up @@ -445,8 +446,14 @@ public URIResolverExtensionManager getUriResolveExtentionManager() {
return resolverExtensionManager;
}

public LinkedHashSet<URI> getCurrentWorkspaceFolders() {
return currentWorkspaceFolders;
}

public void didChangeWorkspaceFolders(URI[] added, URI[] removed) {
initialize();
currentWorkspaceFolders.addAll(List.of(added != null? added : new URI[0]));
currentWorkspaceFolders.removeAll(List.of(removed != null ? removed : new URI[0]));
WorkspaceReader workspaceReader = mavenRequest.getWorkspaceReader();
if (workspaceReader instanceof MavenLemminxWorkspaceReader reader) {
Collection<URI> projectsToAdd = computeAddedWorkspaceProjects(added != null? added : new URI[0]);
Expand Down Expand Up @@ -516,18 +523,42 @@ private static DOMDocument createDOMDocument(URI uri) {
return null;
}

private static String key(Dependency artifact) {
/**
* Creates a GAV key for a given Artifact
*
* @param artifact
* @return GAV key string
*/
public static String key(Dependency artifact) {
return Optional.ofNullable(artifact.getGroupId()).orElse("") + ':'
+ Optional.ofNullable(artifact.getArtifactId()).orElse("") + ':'
+ Optional.ofNullable(artifact.getVersion()).orElse("");
}

private static String key(Parent parent) {

/**
* Creates a GAV key for a given Parent
*
* @param artifact
* @return GAV key string
*/
public static String key(Parent parent) {
return Optional.ofNullable(parent.getGroupId()).orElse("") + ':'
+ Optional.ofNullable(parent.getArtifactId()).orElse("") + ':'
+ Optional.ofNullable(parent.getVersion()).orElse("");
}


/**
* Creates a GAV key for a given Maven Project
*
* @param artifact
* @return GAV key string
*/
public static String key(MavenProject project) {
return Optional.ofNullable(project.getGroupId()).orElse("") + ':'
+ Optional.ofNullable(project.getArtifactId()).orElse("") + ':'
+ Optional.ofNullable(project.getVersion()).orElse("");
}

private void adUrisdParentFirst(String artifactKey,
LinkedHashMap<String, String> parentByDep,
HashMap<String, URI> uriByDep,
Expand Down
Loading