forked from eclipse-wildwebdeveloper/wildwebdeveloper
-
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.
Fixes eclipse-wildwebdeveloper#143 Signed-off-by: azerr <azerr@redhat.com>
- Loading branch information
1 parent
3703333
commit bc11965
Showing
9 changed files
with
492 additions
and
1 deletion.
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
15 changes: 15 additions & 0 deletions
15
...dwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/XMLLanguageServerAPI.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,15 @@ | ||
| package org.eclipse.wildwebdeveloper.xml.internal; | ||
|
|
||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import org.eclipse.lsp4j.TextDocumentPositionParams; | ||
| import org.eclipse.lsp4j.jsonrpc.services.JsonRequest; | ||
| import org.eclipse.lsp4j.services.LanguageServer; | ||
| import org.eclipse.wildwebdeveloper.xml.internal.lsp.AutoCloseTagResponse; | ||
|
|
||
| public interface XMLLanguageServerAPI extends LanguageServer { | ||
|
|
||
| @JsonRequest("xml/closeTag") | ||
| CompletableFuture<AutoCloseTagResponse> closeTag(TextDocumentPositionParams params); | ||
|
|
||
| } |
17 changes: 17 additions & 0 deletions
17
...developer.xml/src/org/eclipse/wildwebdeveloper/xml/internal/lsp/AutoCloseTagResponse.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,17 @@ | ||
| package org.eclipse.wildwebdeveloper.xml.internal.lsp; | ||
|
|
||
| import org.eclipse.lsp4j.Range; | ||
|
|
||
| public class AutoCloseTagResponse { | ||
| public String snippet; | ||
| public Range range; | ||
|
|
||
| public AutoCloseTagResponse(String snippet, Range range) { | ||
| this.snippet = snippet; | ||
| this.range = range; | ||
| } | ||
|
|
||
| public AutoCloseTagResponse(String snippet) { | ||
| this.snippet = snippet; | ||
| } | ||
| } |
180 changes: 180 additions & 0 deletions
180
...oper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/lsp/XMLAutoCloseTagReconciler.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,180 @@ | ||
| package org.eclipse.wildwebdeveloper.xml.internal.lsp; | ||
|
|
||
| import java.net.URI; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.CompletableFuture; | ||
|
|
||
| import org.eclipse.jface.text.BadLocationException; | ||
| import org.eclipse.jface.text.DocumentEvent; | ||
| import org.eclipse.jface.text.IDocument; | ||
| import org.eclipse.jface.text.IDocumentListener; | ||
| import org.eclipse.jface.text.ITextInputListener; | ||
| import org.eclipse.jface.text.ITextViewer; | ||
| import org.eclipse.jface.text.reconciler.IReconciler; | ||
| import org.eclipse.jface.text.reconciler.IReconcilingStrategy; | ||
| import org.eclipse.lsp4e.LSPEclipseUtils; | ||
| import org.eclipse.lsp4e.LanguageServiceAccessor; | ||
| import org.eclipse.lsp4e.LanguageServiceAccessor.LSPDocumentInfo; | ||
| import org.eclipse.lsp4j.Position; | ||
| import org.eclipse.lsp4j.Range; | ||
| import org.eclipse.lsp4j.TextDocumentIdentifier; | ||
| import org.eclipse.lsp4j.TextDocumentPositionParams; | ||
| import org.eclipse.swt.widgets.Display; | ||
| import org.eclipse.wildwebdeveloper.xml.internal.XMLLanguageServerAPI; | ||
|
|
||
| public class XMLAutoCloseTagReconciler implements IReconciler { | ||
|
|
||
| private IDocument document; | ||
|
|
||
| private ITextViewer viewer; | ||
|
|
||
| private Listener listener; | ||
|
|
||
| private void autoInsert(DocumentEvent event) { | ||
| if (event == null || viewer == null) { | ||
| return; | ||
| } | ||
| IDocument document = event.getDocument(); | ||
| if (document == null || event == null || event.getLength() != 0 || event.getText().length() != 1) { | ||
| return; | ||
| } | ||
|
|
||
| int offset = event.getOffset() + 1; | ||
| char c = event.getText().charAt(0); | ||
| if (c != '>' && c != '/') { | ||
| return; | ||
| } | ||
| URI uri = LSPEclipseUtils.toUri(document); | ||
| if (uri == null) { | ||
| return; | ||
| } | ||
|
|
||
| TextDocumentIdentifier identifier = new TextDocumentIdentifier(uri.toString()); | ||
| Optional<LSPDocumentInfo> info = LanguageServiceAccessor | ||
| .getLSPDocumentInfosFor(document, (capabilities) -> true).stream() | ||
| .filter(doc -> (doc.getLanguageClient() instanceof XMLLanguageServerAPI)).findAny(); | ||
| if (!info.isEmpty()) { | ||
| // The document is bound with XML language server, consumes the xml/closeTag | ||
| final Display display = viewer.getTextWidget().getDisplay(); | ||
| CompletableFuture.supplyAsync(() -> { | ||
| try { | ||
| // Wait for textDocument/didChange | ||
| Thread.sleep(100); | ||
| } catch (InterruptedException ex) { | ||
| Thread.interrupted(); | ||
| } | ||
| try { | ||
| TextDocumentPositionParams params = LSPEclipseUtils.toTextDocumentPosistionParams(uri, offset, | ||
| document); | ||
| // consumes xml/closeTag from XML language server | ||
| ((XMLLanguageServerAPI) info.get().getLanguageClient()).closeTag(params).thenAccept(r -> { | ||
| if (r != null) { | ||
| display.asyncExec(() -> { | ||
| try { | ||
| // we receive a text like | ||
| // $0</foo> | ||
| // $0 should be used for set the cursor. | ||
| String text = r.snippet.replace("$0", ""); | ||
| int replaceLength = getReplaceLength(r.range, document); | ||
| document.replace(offset, replaceLength, text); | ||
| } catch (BadLocationException e) { | ||
| // Do nothing | ||
| } | ||
| }); | ||
|
|
||
| } | ||
| }); | ||
| } catch (BadLocationException e) { | ||
| // Do nothing | ||
| } | ||
| return null; | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| private static int getReplaceLength(Range range, IDocument document) throws BadLocationException { | ||
| if (range == null) { | ||
| return 0; | ||
| } | ||
| Position start = range.getStart(); | ||
| Position end = range.getEnd(); | ||
| if (start.getLine() == end.getLine()) { | ||
| return end.getCharacter() - start.getCharacter(); | ||
| } | ||
| int startOffset = LSPEclipseUtils.toOffset(start, document); | ||
| int endOffset = LSPEclipseUtils.toOffset(end, document); | ||
| return endOffset - startOffset; | ||
| } | ||
|
|
||
| /** | ||
| * Internal document listener and text input listener. | ||
| */ | ||
| class Listener implements IDocumentListener, ITextInputListener { | ||
|
|
||
| /* | ||
| * @see IDocumentListener#documentAboutToBeChanged(DocumentEvent) | ||
| */ | ||
| @Override | ||
| public void documentAboutToBeChanged(DocumentEvent e) { | ||
| } | ||
|
|
||
| /* | ||
| * @see IDocumentListener#documentChanged(DocumentEvent) | ||
| */ | ||
| @Override | ||
| public void documentChanged(DocumentEvent e) { | ||
| autoInsert(e); | ||
| } | ||
|
|
||
| /* | ||
| * @see ITextInputListener#inputDocumentAboutToBeChanged(IDocument, IDocument) | ||
| */ | ||
| @Override | ||
| public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) { | ||
| if (oldInput == document) { | ||
| if (document != null) { | ||
| document.removeDocumentListener(this); | ||
| } | ||
| document = null; | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * @see ITextInputListener#inputDocumentChanged(IDocument, IDocument) | ||
| */ | ||
| @Override | ||
| public void inputDocumentChanged(IDocument oldInput, IDocument newInput) { | ||
| document = newInput; | ||
| if (document == null) { | ||
| return; | ||
| } | ||
| document.addDocumentListener(this); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void install(ITextViewer viewer) { | ||
| this.viewer = viewer; | ||
| listener = new Listener(); | ||
| viewer.addTextInputListener(listener); | ||
| } | ||
|
|
||
| @Override | ||
| public void uninstall() { | ||
| if (listener != null) { | ||
| viewer.removeTextInputListener(listener); | ||
| if (document != null) { | ||
| document.removeDocumentListener(listener); | ||
| } | ||
| listener = null; | ||
| } | ||
| this.viewer = null; | ||
| } | ||
|
|
||
| @Override | ||
| public IReconcilingStrategy getReconcilingStrategy(String contentType) { | ||
| return null; | ||
| } | ||
|
|
||
| } |
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
51 changes: 51 additions & 0 deletions
51
org.eclipse.wildwebdeveloper/src/org/eclipse/wildwebdeveloper/html/AutoInsertParams.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,51 @@ | ||
| package org.eclipse.wildwebdeveloper.html; | ||
|
|
||
| import org.eclipse.lsp4j.Position; | ||
| import org.eclipse.lsp4j.TextDocumentIdentifier; | ||
|
|
||
| /** | ||
| * | ||
| * @author azerr | ||
| * @see <a href= | ||
| * "https://github.com/microsoft/vscode/blob/9b80ed652434a6e82b3ac28c1a9a01132c8faea3/extensions/html-language-features/client/src/htmlClient.ts#L31">https://github.com/microsoft/vscode/blob/9b80ed652434a6e82b3ac28c1a9a01132c8faea3/extensions/html-language-features/client/src/htmlClient.ts#L31</a> | ||
| */ | ||
| public class AutoInsertParams { | ||
|
|
||
| /** | ||
| * The auto insert kind | ||
| */ | ||
| private String kind; // 'autoQuote' | 'autoClose'; | ||
| /** | ||
| * The text document. | ||
| */ | ||
| private TextDocumentIdentifier textDocument; | ||
| /** | ||
| * The position inside the text document. | ||
| */ | ||
| private Position position; | ||
|
|
||
| public String getKind() { | ||
| return kind; | ||
| } | ||
|
|
||
| public void setKind(String kind) { | ||
| this.kind = kind; | ||
| } | ||
|
|
||
| public TextDocumentIdentifier getTextDocument() { | ||
| return textDocument; | ||
| } | ||
|
|
||
| public void setTextDocument(TextDocumentIdentifier textDocument) { | ||
| this.textDocument = textDocument; | ||
| } | ||
|
|
||
| public Position getPosition() { | ||
| return position; | ||
| } | ||
|
|
||
| public void setPosition(Position position) { | ||
| this.position = position; | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.