-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Quickfix to close open tag doesn't deal with attributes
Fixes #646 Signed-off-by: azerr <[email protected]>
- Loading branch information
1 parent
84d2689
commit bab7449
Showing
6 changed files
with
376 additions
and
212 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
136 changes: 136 additions & 0 deletions
136
...pse/lemminx/extensions/contentmodel/participants/codeactions/CloseStartTagCodeAction.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,136 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2019 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.extensions.contentmodel.participants.codeactions; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import org.eclipse.lemminx.commons.BadLocationException; | ||
| import org.eclipse.lemminx.commons.CodeActionFactory; | ||
| import org.eclipse.lemminx.dom.DOMDocument; | ||
| import org.eclipse.lemminx.dom.DOMElement; | ||
| import org.eclipse.lemminx.dom.DOMNode; | ||
| import org.eclipse.lemminx.dom.LineIndentInfo; | ||
| import org.eclipse.lemminx.services.extensions.ICodeActionParticipant; | ||
| import org.eclipse.lemminx.services.extensions.IComponentProvider; | ||
| import org.eclipse.lemminx.settings.SharedSettings; | ||
| import org.eclipse.lsp4j.CodeAction; | ||
| import org.eclipse.lsp4j.Diagnostic; | ||
| import org.eclipse.lsp4j.Position; | ||
| import org.eclipse.lsp4j.Range; | ||
|
|
||
| /** | ||
| * Code action to fix close start tag element. | ||
| * | ||
| */ | ||
| public class CloseStartTagCodeAction implements ICodeActionParticipant { | ||
|
|
||
| @Override | ||
| public void doCodeAction(Diagnostic diagnostic, Range range, DOMDocument document, List<CodeAction> codeActions, | ||
| SharedSettings sharedSettings, IComponentProvider componentProvider) { | ||
| Range diagnosticRange = diagnostic.getRange(); | ||
| try { | ||
| int startOffset = document.offsetAt(diagnosticRange.getStart()); | ||
| DOMNode node = document.findNodeAt(startOffset); | ||
| if (node != null && node.isElement()) { | ||
| int diagnosticEndOffset = startOffset | ||
| + (diagnosticRange.getEnd().getCharacter() - diagnosticRange.getStart().getCharacter()); | ||
| DOMElement element = (DOMElement) node; | ||
| boolean startTagClosed = element.isStartTagClosed(); | ||
| char c = document.getText().charAt(diagnosticEndOffset - 1); | ||
| if (c != '/') { | ||
| if (startTagClosed) { | ||
| // ex : <foo attr="" > | ||
| // // Close with '</$tag> | ||
| String tagName = element.getTagName(); | ||
| if (tagName != null) { | ||
| String label = "</" + tagName + ">"; | ||
| String insertText = label; | ||
| Position endPosition = null; | ||
| if (!element.hasChildNodes()) { | ||
| int endOffset = element.getStartTagCloseOffset() + 1; | ||
| endPosition = document.positionAt(endOffset); | ||
| } else { | ||
| String text = document.getText(); | ||
| // the element have some children(Text node, Element node, etc) | ||
| int endOffset = element.getLastChild().getEnd() - 1; | ||
| if (endOffset < text.length()) { | ||
| // remove new line | ||
| char ch = text.charAt(endOffset); | ||
| while (ch == '\r' || ch == '\n') { | ||
| endOffset--; | ||
| ch = text.charAt(endOffset); | ||
| } | ||
| } | ||
| endOffset++; | ||
| endPosition = document.positionAt(endOffset); | ||
| if (hasElements(element)) { | ||
| // The element have element node as children | ||
| // the </foo> must be inserted with a new line and indent | ||
| LineIndentInfo indentInfo = document | ||
| .getLineIndentInfo(diagnosticRange.getStart().getLine()); | ||
| insertText = indentInfo.getLineDelimiter() + indentInfo.getWhitespacesIndent() | ||
| + insertText; | ||
| } | ||
| } | ||
| CodeAction closeEndTagAction = CodeActionFactory.insert("Close with '" + label + "'", | ||
| endPosition, insertText, document.getTextDocument(), diagnostic); | ||
| codeActions.add(closeEndTagAction); | ||
| } | ||
|
|
||
| } else { | ||
| // ex : <foo attr=" | ||
| // Close with '/> | ||
| CodeAction autoCloseAction = CodeActionFactory.insert("Close with '/>'", | ||
| diagnosticRange.getEnd(), "/>", document.getTextDocument(), diagnostic); | ||
| codeActions.add(autoCloseAction); | ||
| // // Close with '></$tag> | ||
| String tagName = element.getTagName(); | ||
| if (tagName != null) { | ||
| String insertText = "></" + tagName + ">"; | ||
| CodeAction closeEndTagAction = CodeActionFactory.insert("Close with '" + insertText + "'", | ||
| diagnosticRange.getEnd(), insertText, document.getTextDocument(), diagnostic); | ||
| codeActions.add(closeEndTagAction); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!startTagClosed) { | ||
| // Close with '> | ||
| CodeAction closeAction = CodeActionFactory.insert("Close with '>'", diagnosticRange.getEnd(), ">", | ||
| document.getTextDocument(), diagnostic); | ||
| codeActions.add(closeAction); | ||
| } | ||
| } | ||
| } catch (BadLocationException e) { | ||
| // do nothing | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if the given element has elements as children and false | ||
| * otherwise. | ||
| * | ||
| * @param element the DOM element. | ||
| * | ||
| * @return true if the given element has elements as children and false | ||
| * otherwise. | ||
| */ | ||
| private static boolean hasElements(DOMElement element) { | ||
| for (DOMNode node : element.getChildren()) { | ||
| if (node.isElement()) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.