forked from eclipse/lemminx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
IRenameParticipant.doRename() is not conform with LSP-defined rename …
…result eclipse#1521
- Loading branch information
Showing
14 changed files
with
214 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
org.eclipse.lemminx/src/main/java/org/eclipse/lemminx/services/RenameResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2023 Red Hat Inc. and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Red Hat Inc. - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.lemminx.services; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.eclipse.lemminx.services.extensions.IRenameResponse; | ||
| import org.eclipse.lsp4j.ResourceOperation; | ||
| import org.eclipse.lsp4j.TextDocumentEdit; | ||
| import org.eclipse.lsp4j.TextEdit; | ||
| import org.eclipse.lsp4j.VersionedTextDocumentIdentifier; | ||
| import org.eclipse.lsp4j.jsonrpc.messages.Either; | ||
|
|
||
| /** | ||
| * Rename response object to store the rename operation results | ||
| */ | ||
| class RenameResponse implements IRenameResponse { | ||
| private List<Either<TextDocumentEdit, ResourceOperation>> documentChanges = new ArrayList<>(); | ||
|
|
||
| @Override | ||
| public void addTextDocumentEdit(TextDocumentEdit textDocumentEdit) { | ||
| if (textDocumentEdit == null) { | ||
| return; | ||
| } | ||
|
|
||
| String documentURI = textDocumentEdit.getTextDocument().getUri(); | ||
| Optional<TextDocumentEdit> change = documentChanges.stream().filter(Either::isLeft) | ||
| .filter(e -> documentURI.equals(e.getLeft().getTextDocument().getUri())) | ||
| .map(Either::getLeft).findFirst(); | ||
| if(change.isPresent()) { | ||
| TextDocumentEdit existingTextDocumentEdit = change.get(); | ||
| List<TextEdit> edits = new ArrayList<>(); | ||
| edits.addAll(existingTextDocumentEdit.getEdits()); | ||
| textDocumentEdit.getEdits().stream().forEach(te -> { | ||
| if (!edits.contains(te)) { | ||
| edits.add(te); | ||
| } | ||
| }); | ||
| existingTextDocumentEdit.setEdits(edits); | ||
| } else { | ||
| documentChanges.add(Either.forLeft(textDocumentEdit)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void addResourceOperation(ResourceOperation resourceOperation) { | ||
| documentChanges.add(Either.forRight(resourceOperation)); | ||
| } | ||
|
|
||
| public List<Either<TextDocumentEdit, ResourceOperation>> getDocumentChanges() { | ||
| return documentChanges; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2019 Red Hat Inc. and others. | ||
| * Copyright (c) 2019, 2023 Red Hat Inc. and others. | ||
| * All rights reserved. This program and the accompanying materials | ||
| * which accompanies this distribution, and is available at | ||
| * http://www.eclipse.org/legal/epl-v20.html | ||
|
|
@@ -11,6 +11,8 @@ | |
| *******************************************************************************/ | ||
| package org.eclipse.lemminx.services; | ||
|
|
||
| import static org.eclipse.lemminx.utils.TextEditUtils.creatTextDocumentEdit; | ||
| import static org.eclipse.lemminx.utils.TextEditUtils.createWorkspaceEdit; | ||
| import static org.eclipse.lemminx.utils.XMLPositionUtility.covers; | ||
| import static org.eclipse.lemminx.utils.XMLPositionUtility.doesTagCoverPosition; | ||
| import static org.eclipse.lemminx.utils.XMLPositionUtility.getTagNameRange; | ||
|
|
@@ -47,7 +49,7 @@ | |
| * | ||
| * Author: Nikolas Komonen - [email protected] | ||
| */ | ||
| public class XMLRename { | ||
| class XMLRename { | ||
|
|
||
| private static final Logger LOGGER = Logger.getLogger(XMLRename.class.getName()); | ||
|
|
||
|
|
@@ -76,14 +78,14 @@ public WorkspaceEdit doRename(DOMDocument xmlDocument, Position position, String | |
| if (node == null || (!node.isAttribute() && !node.isElement() && !node.isText()) | ||
| || (node.isElement() && !((DOMElement) node).hasTagName())) { | ||
|
|
||
| return createWorkspaceEdit(xmlDocument.getDocumentURI(), Collections.emptyList()); | ||
| cancelChecker.checkCanceled(); | ||
| return createWorkspaceEdit(Collections.emptyList()); | ||
| } | ||
|
|
||
| List<TextEdit> textEdits = new ArrayList<>(); | ||
|
|
||
| RenameResponse renameResponse = new RenameResponse(); | ||
| for (IRenameParticipant participant : extensionsRegistry.getRenameParticipants()) { | ||
| try { | ||
| participant.doRename(renameRequest, textEdits, cancelChecker); | ||
| participant.doRename(renameRequest, renameResponse, cancelChecker); | ||
| } catch (CancellationException e) { | ||
| throw e; | ||
| } catch (Exception e) { | ||
|
|
@@ -93,11 +95,12 @@ public WorkspaceEdit doRename(DOMDocument xmlDocument, Position position, String | |
| } | ||
| } | ||
|
|
||
| textEdits.addAll(getRenameTextEdits(xmlDocument, node, position, newText)); | ||
| cancelChecker.checkCanceled(); | ||
| renameResponse.addTextDocumentEdit(creatTextDocumentEdit( | ||
| xmlDocument, getRenameTextEdits(xmlDocument, node, position, newText))); | ||
|
|
||
| cancelChecker.checkCanceled(); | ||
|
|
||
| return createWorkspaceEdit(xmlDocument.getDocumentURI(), textEdits); | ||
| return createWorkspaceEdit(renameResponse.getDocumentChanges()); | ||
| } | ||
|
|
||
| private List<TextEdit> getRenameTextEdits(DOMDocument xmlDocument, DOMNode node, Position position, | ||
|
|
@@ -279,12 +282,6 @@ private List<TextEdit> getXmlnsAttrRenameTextEdits(DOMDocument xmlDocument, DOME | |
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| private WorkspaceEdit createWorkspaceEdit(String documentURI, List<TextEdit> textEdits) { | ||
| Map<String, List<TextEdit>> changes = new HashMap<>(); | ||
| changes.put(documentURI, textEdits); | ||
| return new WorkspaceEdit(changes); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a list of start and end tag rename's. | ||
| * | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.