You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/01/12 18:59:23 UTC
[GitHub] matthiasblaesing closed pull request #357: [NETBEANS-250] Code-complete corrupts pom.xml when updating dependency version
matthiasblaesing closed pull request #357: [NETBEANS-250] Code-complete corrupts pom.xml when updating dependency version
URL: https://github.com/apache/incubator-netbeans/pull/357
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java
index c9ccf3eb2..d8ed132e2 100644
--- a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java
@@ -410,7 +410,8 @@ private List queryElements(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupp
return result;
}
- private String shouldCloseTagLocked(TokenSequence ts) {
+ private static String shouldCloseTagLocked(TokenSequence ts) {
+ int offset = ts.offset();
if (!ts.movePrevious()) {
return null;
}
@@ -424,7 +425,7 @@ private String shouldCloseTagLocked(TokenSequence ts) {
// closing brace of a tag, iterate towards tag's begin, skip attributes and their values.
boolean ok;
- while (ok = !ts.movePrevious()) {
+ while (ok = ts.movePrevious()) {
previous = ts.token();
if (previous.id() == XMLTokenId.TAG) {
break;
@@ -444,7 +445,7 @@ private String shouldCloseTagLocked(TokenSequence ts) {
}
// tag name does not include end sharp brace
tagName = tagName.substring(1, tagName.length()).trim();
- if (isClosingEndTagFoundAfter(ts.offset(), ts, tagName)) {
+ if (isClosingEndTagFoundAfter(offset, ts, tagName)) {
// I know, there may be multiple levels of the same tag name, and the innermost may
// be missing...
return null;
@@ -452,10 +453,9 @@ private String shouldCloseTagLocked(TokenSequence ts) {
return tagName;
}
- private String shouldCloseTag(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupport sup) {
- Token<XMLTokenId> ti = helper.getToken();
+ static String shouldCloseTag(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupport sup) {
try {
- return sup.runWithSequence(helper.getTokenOffset(), this::shouldCloseTagLocked);
+ return sup.runWithSequence(helper.getOffset(), XMLCompletionQuery::shouldCloseTagLocked);
} catch (BadLocationException ex) {
Exceptions.printStackTrace(ex);
}
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/XMLCompletionQueryTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/XMLCompletionQueryTest.java
new file mode 100644
index 000000000..9fc012f90
--- /dev/null
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/XMLCompletionQueryTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.xml.text.completion;
+
+import java.io.IOException;
+import javax.swing.text.BadLocationException;
+import org.junit.Test;
+import org.netbeans.editor.BaseDocument;
+import org.netbeans.editor.Finder;
+import org.netbeans.editor.FinderFactory;
+import org.netbeans.modules.xml.text.AbstractTestCase;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
+
+public class XMLCompletionQueryTest extends AbstractTestCase {
+
+ public XMLCompletionQueryTest(String testName) {
+ super(testName);
+ }
+
+ @Test
+ public void testShouldCloseTag() throws IOException, BadLocationException, Exception {
+ BaseDocument doc = getDocument("/org/netbeans/modules/xml/text/completion/res/docResourceUnclosed.html");
+ XMLSyntaxSupport xss = XMLSyntaxSupport.getSyntaxSupport((BaseDocument)doc);
+ // ##IP1## and ##IP2## mark the positions in the document
+ // which will be checked fif at that point the tag should be closed
+ Finder ip1Finder = new FinderFactory.StringFwdFinder("##IP1##", true);
+ Finder ip2Finder = new FinderFactory.StringFwdFinder("##IP2##", true);
+ int insertPos1 = doc.find(ip1Finder, doc.getStartPosition().getOffset(), doc.getEndPosition().getOffset());
+ int insertPos2 = doc.find(ip2Finder, doc.getStartPosition().getOffset(), doc.getEndPosition().getOffset());
+ // The first position is a caret position behind a <a> Element, that
+ // has a closing tag => shouldCloseTag needs to return NULL here to
+ // indicate, that inserted content should be inserted without the
+ // closing tag.
+ SyntaxQueryHelper sqh = new SyntaxQueryHelper(xss, insertPos1);
+ assertNull("XMLCompletionQuery#shouldCloseTag should return NULL if closing tag is present",
+ XMLCompletionQuery.shouldCloseTag(sqh, doc, xss));
+ // The second position is a caret position behind a <a> Element without
+ // a matching end tag.
+ SyntaxQueryHelper sqh2 = new SyntaxQueryHelper(xss, insertPos2);
+ assertEquals("XMLCompletionQuery#shouldCloseTag should return tagname if no closing tag is present",
+ "a", XMLCompletionQuery.shouldCloseTag(sqh2, doc, xss));
+ }
+}
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResourceUnclosed.html b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResourceUnclosed.html
new file mode 100644
index 000000000..c29c4ef33
--- /dev/null
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/completion/res/docResourceUnclosed.html
@@ -0,0 +1,22 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+This is an URL resource with <a href="relativeLink1.html">##IP1##relative link</a> and
+<div><a href="http://www.seznam.cz">##IP2##</div>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists