Working Completions with Testing #20
Merged
Conversation
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
Signed-off-by: Nikolas Komonen <nikolaskomonen@gmail.com>
Signed-off-by: Nikolas Komonen <nikolaskomonen@gmail.com>
fbricon
reviewed
Jul 17, 2018
| @@ -108,6 +118,30 @@ public XMLDocument parse(String text, String uri, boolean full) { | |||
| } | |||
| break; | |||
| } | |||
|
|
|||
| case CDATATagOpen: { | |||
| Node cdataNode = new Node(scanner.getTokenOffset(), text.length(), new ArrayList<>(), curr, xmlDocument);//TODO: might need arraylist | |||
fbricon
reviewed
Jul 17, 2018
| @@ -183,7 +189,7 @@ private CompletionList collectAutoCloseTagSuggestion(int tagCloseEnd, String tag | |||
| item.setLabel("</" + tag + ">"); | |||
| item.setKind(CompletionItemKind.Property); | |||
| item.setFilterText("</" + tag + ">"); | |||
| item.setTextEdit(new TextEdit(new Range(pos, pos), "$0</" + tag + ">")); | |||
| item.setTextEdit(new TextEdit(new Range(pos, pos), "$0</" + tag + ">")); //"\n\t$0\n</" + tag + ">" | |||
There was a problem hiding this comment.
be careful, not all clients support snippets. You should open a ticket to not return $number placeholders if client capabilities do not support snippets
fbricon
reviewed
Jul 17, 2018
| XMLDocument xmlDocument = completionRequest.getXMLDocument(); | ||
| List<CompletionItem> list= new ArrayList<CompletionItem>(); | ||
| if(xmlDocument.children.size() > 0){ | ||
| Position start,end; |
fbricon
reviewed
Jul 17, 2018
| XMLDocument xmlDocument = completionRequest.getXMLDocument(); | ||
| List<CompletionItem> list= new ArrayList<CompletionItem>(); | ||
| if(xmlDocument.children.size() > 0){ | ||
| Position start,end; |
fbricon
reviewed
Jul 17, 2018
| //Tags that look like '<{CHARS}' | ||
| private CompletionList collectOpenTagSuggestions(int tokenOffset, int tokenEnd, String tag) { | ||
| XMLDocument xmlDocument = completionRequest.getXMLDocument(); | ||
| List<CompletionItem> list= new ArrayList<CompletionItem>(); |
There was a problem hiding this comment.
declare that list right before using it (L310), else it might be useless resource allocation
fbricon
reviewed
Jul 17, 2018
| start = xmlDocument.positionAt(tokenOffset); | ||
| end = xmlDocument.positionAt(tokenEnd); | ||
|
|
||
| } catch (Exception e) { |
fbricon
reviewed
Jul 17, 2018
| // TODO Auto-generated method stub | ||
| return null; | ||
| XMLDocument xmlDocument = completionRequest.getXMLDocument(); | ||
| List<CompletionItem> list= new ArrayList<CompletionItem>(); |
There was a problem hiding this comment.
declare that list right before using it (L336), else it might be useless resource allocation
fbricon
reviewed
Jul 17, 2018
| @@ -308,6 +352,53 @@ private static int scanNextForEndPos(int offset, Scanner scanner, TokenType next | |||
| return offset; | |||
| } | |||
|
|
|||
| private void collectAllTags(List<CompletionItem> list, Node node, Range range, XMLDocument xmlDocument) { | |||
| if(node.tag == null) return; | |||
fbricon
reviewed
Jul 17, 2018
| private void collectAllTags(List<CompletionItem> list, Node node, Range range, XMLDocument xmlDocument) { | ||
| if(node.tag == null) return; | ||
| CompletionItem item = createCompletionItem(node.tag, range); | ||
| if(!list.contains(item)) list.add(item); |
fbricon
reviewed
Jul 17, 2018
| if(node.tag != null) { | ||
| if(node.tag.regionMatches(0, tag, 0, len)){ | ||
| CompletionItem item = createCompletionItem(node.tag, range); | ||
| if(!list.contains(item)) list.add(item); |
fbricon
reviewed
Jul 17, 2018
| item.setKind(CompletionItemKind.Property); | ||
| item.setFilterText("![CDATA[]]"); | ||
| item.setTextEdit(new TextEdit(range, "![CDATA[$0]]>")); | ||
| item.setInsertTextFormat(InsertTextFormat.Snippet); |
There was a problem hiding this comment.
again, need to eventually check for snippet support (in a future commit)
fbricon
reviewed
Jul 17, 2018
| tempRange = new Range(startPos, endPos); | ||
|
|
||
| } catch (BadLocationException e) { | ||
| e.printStackTrace(); |
There was a problem hiding this comment.
use a logger to trace errors
fbricon
reviewed
Jul 17, 2018
| } | ||
|
|
||
| @Test | ||
| public void testSelfClosingCompex() { |
fbricon
reviewed
Jul 17, 2018
| } | ||
|
|
||
| @Test | ||
| public void testEmptyTagT() { |
fbricon
reviewed
Jul 17, 2018
| @Test | ||
| public void unneededEndTagCompletion() { | ||
| assertEndTagCompletion("<a><a>|</a>", 6, "$0</a>"); | ||
| assertEndTagCompletion("<a><b>|</b></a>", 6, "$0</b>"); |
There was a problem hiding this comment.
could we avoid completing with </b> here, as that'd would unbalance the xml document?
There was a problem hiding this comment.
With this example, , the parser considers the 2nd and 3rd as a complete element and the 1st tag as incomplete so its hard to determine with this current implementation which tag is incomplete.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current Completions include the Closing End Tag completion and also Tag Name suggestions with closing.