token = null;
+
+ private int tokenOffset;
private String preText = "";
@@ -91,10 +97,16 @@
/** Creates a new instance of SyntaxQueryHelper */
public SyntaxQueryHelper(XMLSyntaxSupport sup, int offset) throws BadLocationException, IllegalStateException {
+ this.support = sup;
tunedOffset = offset;
- token = sup.getPreviousToken( tunedOffset);
+ sup.runWithSequence(tunedOffset, (TokenSequence seq) -> {
+ token = sup.getPreviousToken(tunedOffset);
+ tokenOffset = seq.offset();
+ return null;
+ });
+
if( token != null ) { // inside document
- tokenBoundary = token.getOffset() + token.getImage().length() == tunedOffset;
+ tokenBoundary = tokenOffset + token.length() == tunedOffset;
} else {
//??? start of document no choice now, but should be prolog if not followed by it
throw new BadLocationException("No token found at current position", offset); // NOI18N
@@ -102,17 +114,17 @@
// find out last typed chars that can hint
- int itemOffset = token.getOffset();
+ int itemOffset = tokenOffset;
preText = "";
erase = 0;
int eraseRight = 0;
- int id = token.getTokenID().getNumericID();
+ XMLTokenId id = token.id();
// determine last typed text, prefix text
if ( tokenBoundary == false ) {
- preText = token.getImage().substring( 0, tunedOffset - token.getOffset() );
+ preText = token.text().toString().substring( 0, tunedOffset - tokenOffset);
if ("".equals(preText)) throw new IllegalStateException("Cannot get token prefix at " + tunedOffset);
// manipulate tunedOffset to delete rest of an old name
@@ -121,11 +133,11 @@
if (sup.lastTypedChar() != '<' && sup.lastTypedChar() != '&') {
switch (id) {
- case XMLDefaultTokenContext.TAG_ID:
- case XMLDefaultTokenContext.CHARACTER_ID:
- case XMLDefaultTokenContext.ARGUMENT_ID:
+ case TAG:
+ case CHARACTER:
+ case ARGUMENT:
- int i = token.getImage().length();
+ int i = token.length();
int tail = i - (tunedOffset - itemOffset);
tunedOffset += tail;
eraseRight = tail;
@@ -134,12 +146,12 @@
}
} else {
switch (id) {
- case XMLDefaultTokenContext.TEXT_ID:
- case XMLDefaultTokenContext.TAG_ID:
- case XMLDefaultTokenContext.ARGUMENT_ID:
- case XMLDefaultTokenContext.CHARACTER_ID:
- case XMLCompletionQuery.PI_CONTENT_ID:
- preText = token.getImage();
+ case TEXT:
+ case TAG:
+ case ARGUMENT:
+ case CHARACTER:
+ case PI_CONTENT:
+ preText = token.text().toString();
break;
}
}
@@ -147,18 +159,18 @@
// adjust how much do you want to erase from the preText
switch (id) {
- case XMLDefaultTokenContext.TAG_ID:
+ case TAG:
// do not erase start delimiters
erase = preText.length() - 1 + eraseRight;
break;
- case XMLDefaultTokenContext.CHARACTER_ID:
+ case CHARACTER:
//entity references
erase = preText.length() + -1 + eraseRight;
break;
- case XMLDefaultTokenContext.ARGUMENT_ID:
+ case ARGUMENT:
erase = preText.length() + eraseRight;
break;
- case XMLDefaultTokenContext.VALUE_ID:
+ case VALUE:
erase = preText.length();
if (erase > 0 && (preText.charAt(0) == '\'' || preText.charAt(0) == '"')) {
// Because of attribute values, preText is adjusted in initContext
@@ -172,14 +184,18 @@
if (element == null) throw new IllegalStateException("There exists a token therefore a syntax element must exist at " + offset + ", too.");
// completion request originates from area covered by DOM,
- if (element instanceof SyntaxNode && ((SyntaxNode)element).getNodeType() != Node.DOCUMENT_TYPE_NODE) {
- completionType = initContext();
+ if (element.getType() != SyntaxElement.NODE_ERROR && element.getType() != Node.DOCUMENT_TYPE_NODE) {
+ completionType = support.runLocked(this::initContext);
} else {
// prolog, internal DTD no completition yet
completionType = COMPLETION_TYPE_DTD;
}
}
+ public int getTokenOffset() {
+ return tokenOffset;
+ }
+
/**
* Find out what to complete: attribute, value, element, entity or notation?
*
@@ -207,12 +223,11 @@
* COMPLETION_TYPE_ENTITY = 4,
* COMPLETION_TYPE_NOTATION = 5.
*/
- private int initContext() {
- int id = token.getTokenID().getNumericID();
- SyntaxNode syntaxNode = (SyntaxNode)element;
-
+ private int initContext() throws BadLocationException {
+ XMLTokenId id = token.id();
+ final Node syntaxNode = element.getNode();
switch ( id) {
- case XMLDefaultTokenContext.TEXT_ID:
+ case TEXT:
if ( preText.endsWith("<" ) || preText.endsWith("")) {
+ if (token.text().toString().endsWith(">")) {
ctx.init(syntaxNode, preText);
return COMPLETION_TYPE_VALUE;
} else {
@@ -253,25 +267,25 @@
ctx.init(syntaxNode, preText.substring(1));
return COMPLETION_TYPE_ELEMENT;
}
- } else if(EndTag.class.equals(syntaxNode.getClass()) && preText.startsWith("")) {
+ if ("".equals(preText) && token.text().toString().endsWith(">")) {
ctx.init(syntaxNode, preText);
return COMPLETION_TYPE_VALUE;
}
}
break;
- case XMLDefaultTokenContext.VALUE_ID:
+ case VALUE:
if (preText.endsWith("&")) {
ctx.init(syntaxNode, "");
return COMPLETION_TYPE_ENTITY;
} else if ("".equals(preText)) { //??? improve check to addres inner '"'
- String image = token.getImage();
+ String image = token.text().toString();
char ch = image.charAt(image.length()-1);
// findout if it is closing '
@@ -283,23 +297,33 @@
return COMPLETION_TYPE_UNKNOWN;
}
- boolean closing = false;
- TokenItem prev = token.getPrevious();
+ int res = support.runWithSequence(tokenOffset, (TokenSequence seq) -> {
+ Token prev = support.getPreviousToken(tokenOffset);
+ boolean closing = false;
- while (prev != null) {
- int tid = prev.getTokenID().getNumericID();
- if (tid == XMLDefaultTokenContext.VALUE_ID) {
- closing = true;
- break;
- } else if (tid == XMLDefaultTokenContext.CHARACTER_ID) {
- prev = prev.getPrevious();
+ while (prev != null) {
+ XMLTokenId tid = prev.id();
+ if (tid == XMLTokenId.VALUE) {
+ closing = true;
+ break;
+ } else if (tid == XMLTokenId.CHARACTER) {
+ if (!seq.movePrevious()) {
+ return COMPLETION_TYPE_UNKNOWN;
+ }
+ prev = seq.token();
+ } else {
+ break;
+ }
+ }
+ if (closing == false) {
+ ctx.init(syntaxNode, preText);
+ return COMPLETION_TYPE_VALUE;
} else {
- break;
+ return COMPLETION_TYPE_UNKNOWN;
}
- }
- if (closing == false) {
- ctx.init(syntaxNode, preText);
- return COMPLETION_TYPE_VALUE;
+ });
+ if (res != COMPLETION_TYPE_UNKNOWN) {
+ return res;
}
} else {
ctx.init(syntaxNode, preText);
@@ -312,11 +336,11 @@
int maxOffsetLessThanCurrent = -1;
Node curAttrNode = null;
for (int ind = 0; ind < attrs.getLength(); ind++) {
- AttrImpl attr = (AttrImpl)attrs.item(ind);
- int attrTokOffset = attr.getFirstToken().getOffset();
- if (attrTokOffset > maxOffsetLessThanCurrent && attrTokOffset < token.getOffset()) {
+ SyntaxElement attr = (SyntaxElement)attrs.item(ind);
+ int attrTokOffset = attr.getElementOffset();
+ if (attrTokOffset > maxOffsetLessThanCurrent && attrTokOffset < tokenOffset) {
maxOffsetLessThanCurrent = attrTokOffset;
- curAttrNode = attr;
+ curAttrNode = (Node)attr;
}
}
@@ -333,19 +357,18 @@
}
break;
- case XMLDefaultTokenContext.OPERATOR_ID:
+ case OPERATOR:
if ("".equals(preText)) {
- if ("=".equals(token.getImage())) {
+ if ("=".equals(token.text())) {
ctx.init(syntaxNode, "");
return COMPLETION_TYPE_VALUE;
}
}
break;
- case XMLDefaultTokenContext.WS_ID:
- if ((StartTag.class.equals(syntaxNode.getClass())
- || EmptyTag.class.equals(syntaxNode.getClass()))
- && !token.getImage().startsWith("/")) {
+ case WS:
+ if (support.isNormalTag(element)
+ && !token.text().toString().startsWith("/")) {
ctx.init((Element)syntaxNode, ""); // GrammarQuery.v2 takes Element ctx
return COMPLETION_TYPE_ATTRIBUTE;
} else {
@@ -354,15 +377,14 @@
}
// break;
- case XMLDefaultTokenContext.ARGUMENT_ID:
- if (StartTag.class.equals(syntaxNode.getClass())
- || EmptyTag.class.equals(syntaxNode.getClass())) {
+ case ARGUMENT:
+ if (support.isStartTag(element)
+ || support.isEmptyTag(element)) {
//try to find the current attribute
- Tag tag = (Tag)syntaxNode;
- NamedNodeMap nnm = tag.getAttributes();
+ NamedNodeMap nnm = syntaxNode.getAttributes();
for(int i = 0; i < nnm.getLength(); i++) {
- AttrImpl attrNode = (AttrImpl)nnm.item(i);
- if(attrNode.getFirstToken().getOffset() == token.getOffset()) {
+ Attr attrNode = (Attr)nnm.item(i);
+ if(support.getNodeOffset(attrNode) == tokenOffset) {
ctx.init(attrNode, preText);
}
}
@@ -373,7 +395,7 @@
}
break;
- case XMLDefaultTokenContext.CHARACTER_ID: // entity reference
+ case CHARACTER: // entity reference
if (preText.startsWith("&#")) {
// character ref, ignore
return COMPLETION_TYPE_UNKNOWN;
@@ -384,7 +406,7 @@
ctx.init(syntaxNode, preText.substring(1));
return COMPLETION_TYPE_ENTITY;
} else if ("".equals(preText)) {
- if (token.getImage().endsWith(";")) {
+ if (token.text().toString().endsWith(";")) {
ctx.init(syntaxNode, preText);
return COMPLETION_TYPE_VALUE;
}
@@ -408,7 +430,7 @@
}
/** Current token or previous one if at token boundary. */
- public TokenItem getToken() {
+ public Token getToken() {
return token;
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java
--- a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionProvider.java
@@ -49,19 +49,20 @@
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.completion.Completion;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.SyntaxSupport;
-import org.netbeans.editor.TokenItem;
-import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
-import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
-import org.netbeans.editor.Utilities;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.editor.ext.ExtSyntaxSupport;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionResultSet;
import org.netbeans.spi.editor.completion.support.AsyncCompletionQuery;
import org.netbeans.spi.editor.completion.support.AsyncCompletionTask;
import org.netbeans.spi.editor.completion.CompletionProvider;
import org.netbeans.spi.editor.completion.CompletionTask;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
@@ -80,16 +81,116 @@
@Override
public int getAutoQueryTypes(JTextComponent component, String typedText) {
- SyntaxSupport support = Utilities.getDocument(component).getSyntaxSupport();
+ XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(component.getDocument());
if( (support == null) || !(support instanceof XMLSyntaxSupport))
return 0;
- int type = ((XMLSyntaxSupport)support).checkCompletion(component, typedText, false);
+ int type = checkCompletion(support, component, typedText, false);
if(type == ExtSyntaxSupport.COMPLETION_POPUP)
return COMPLETION_QUERY_TYPE;
return 0;
}
+
+ /** Schedule content update making completion visible. */
+ public static final int COMPLETION_POPUP = 0;
+ /** Cancel request without changing completion visibility. */
+ public static final int COMPLETION_CANCEL = 1;
+ /** Update content immediatelly if it's currently visible. */
+ public static final int COMPLETION_REFRESH = 2;
+ /** Schedule content update if it's currently visible. */
+ public static final int COMPLETION_POST_REFRESH = 3;
+ /** Hide completion. */
+ public static final int COMPLETION_HIDE = 4;
+
+ private int checkCompletion(XMLSyntaxSupport support, JTextComponent target, String typedText, boolean visible ) {
+
+ if( !visible ) {
+ int retVal = COMPLETION_CANCEL;
+ switch( typedText.charAt( typedText.length()-1 ) ) {
+ case '/':
+ int dotPos = target.getCaret().getDot();
+ BaseDocument doc = (BaseDocument)target.getDocument();
+ if (dotPos >= 2) { // last char before inserted slash
+ try {
+ String txtBeforeSpace = doc.getText(dotPos-2, 2);
+ if( txtBeforeSpace.equals("':
+ dotPos = target.getCaret().getDot();
+ try {
+ SyntaxElement sel = support.getElementChain(dotPos);
+ if(support.isStartTag(sel)) {
+ retVal = COMPLETION_POPUP;
+ }
+ } catch (BadLocationException e) {
+ //ignore
+ }
+ break;
+ }
+ if(noCompletion(support, target))
+ return COMPLETION_HIDE;
+ return retVal;
+ } else { // the pane is already visible
+ switch (typedText.charAt(0)) {
+ case '>':
+ case ';':
+ return COMPLETION_HIDE;
+ }
+ //requestedAutoCompletion = true;
+ return COMPLETION_POST_REFRESH; //requery it
+ }
+ }
+
+ /**
+ * No completion inside PI, CDATA, comment section.
+ * True only inside PI or CDATA section, false otherwise.
+ * @param target
+ */
+ boolean noCompletion(XMLSyntaxSupport support, JTextComponent target) {
+ if(target == null || target.getCaret() == null)
+ return false;
+ int offset = target.getCaret().getDot();
+ if(offset < 0)
+ return false;
+ //no completion inside CDATA or comment section
+ try {
+ return support.runWithSequence(offset, (TokenSequence ts) -> {
+ Token token = ts.token();
+ if (token == null) {
+ ts.moveNext();
+ token = ts.token();
+ if (token == null) {
+ return false;
+ }
+ }
+ if (token.id() == XMLTokenId.CDATA_SECTION
+ || token.id() == XMLTokenId.BLOCK_COMMENT
+ || token.id() == XMLTokenId.PI_START
+ || token.id() == XMLTokenId.PI_END
+ || token.id() == XMLTokenId.PI_CONTENT
+ || token.id() == XMLTokenId.PI_TARGET) {
+ return true;
+ }
+ return false;
+ });
+ } catch (BadLocationException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ return false;
+ }
@Override
public CompletionTask createTask(int queryType, JTextComponent component) {
@@ -112,16 +213,14 @@
@Override
protected void query(CompletionResultSet resultSet, Document doc, int caretOffset) {
- SyntaxSupport syntaxSupport = Utilities.getSyntaxSupport(component); // fix for issue #185876
- XMLSyntaxSupport support = (syntaxSupport instanceof XMLSyntaxSupport ?
- (XMLSyntaxSupport) syntaxSupport : null);
+ XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(doc);
if (!ENABLED || support == null) {
resultSet.finish();
return;
}
resultSet.setWaitText(NbBundle.getMessage(XMLCompletionProvider.class, "MSG_loading_dtd"));
- List items = QUERY.query(component, caretOffset, support);
+ List items = QUERY.query(component, caretOffset, XMLSyntaxSupport.getSyntaxSupport((BaseDocument)doc));
if(items != null) resultSet.addAllItems(items);
resultSet.finish();
}
@@ -166,10 +265,10 @@
//test whether we are just in text and eventually close the opened completion
//this is handy after end tag autocompletion when user doesn't complete the
//end tag and just types a text
- XMLSyntaxSupport sup = (XMLSyntaxSupport)doc.getSyntaxSupport().get(XMLSyntaxSupport.class);
+ XMLSyntaxSupport sup = XMLSyntaxSupport.getSyntaxSupport(doc);
try {
- TokenItem ti = sup.getTokenChain(caretOffset <= 0 ? 0 : caretOffset - 1, caretOffset);
- if(ti != null && ti.getTokenID() == XMLDefaultTokenContext.TEXT && !ti.getImage().startsWith("<") && !ti.getImage().startsWith("&")) {
+ Token ti = sup.getNextToken(caretOffset <= 0 ? 1 : caretOffset - 1);
+ if(ti != null && ti.id()== XMLTokenId.TEXT && !ti.text().toString().startsWith("<") && !ti.text().toString().startsWith("&")) {
hideCompletion();
}
}catch(BadLocationException e) {
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
--- a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLCompletionQuery.java
@@ -52,7 +52,6 @@
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import org.netbeans.api.lexer.Token;
-import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenId;
import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
@@ -62,12 +61,13 @@
import org.netbeans.editor.*;
import org.openide.ErrorManager;
-import org.netbeans.modules.xml.text.syntax.*;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.api.model.*;
import org.netbeans.modules.xml.spi.dom.UOException;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.netbeans.modules.xml.text.bracematch.XMLBraceMatcher;
-import org.netbeans.modules.xml.text.syntax.dom.SyntaxNode;
import org.netbeans.spi.editor.completion.CompletionItem;
+import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/**
@@ -83,7 +83,7 @@
* @version 1.01
*/
-public class XMLCompletionQuery implements XMLTokenIDs {
+public class XMLCompletionQuery {
// the name of a property indentifing cached query
public static final String DOCUMENT_GRAMMAR_BINDING_PROP = "doc-bind-query";
@@ -103,11 +103,9 @@
* @param support syntax-support that will be used during resolving of the query.
* @return result of the query or null if there's no result.
*/
- public List query(JTextComponent component, int offset, SyntaxSupport support) {
+ public List query(JTextComponent component, int offset, XMLSyntaxSupport sup) {
BaseDocument doc = (BaseDocument)component.getDocument();
if (doc == null) return null;
- XMLSyntaxSupport sup = (XMLSyntaxSupport)support.get(XMLSyntaxSupport.class);
- if( sup == null ) return null;// No SyntaxSupport for us, no hint for user
try {
SyntaxQueryHelper helper = new SyntaxQueryHelper(sup, offset);
@@ -165,7 +163,7 @@
***************************************************************/
if (list.isEmpty() && helper.getPreText().startsWith("";
}
- } else if (helper.getToken().getTokenID() == XMLTokenIDs.VALUE) {
- String c = helper.getToken().getImage();
+ } else if (helper.getToken().id() == XMLTokenId.VALUE) {
+ String c = helper.getToken().text().toString();
delLen = c.length();
if (c.charAt(0) == '"' ||
c.charAt(0) == '\'') {
@@ -363,7 +361,7 @@
if (c.charAt(l) == '"' || c.charAt(l) == '\'') {
delLen--;
}
- } else if (helper.getToken().getTokenID() == XMLTokenIDs.TAG) {
+ } else if (helper.getToken().id() == XMLTokenId.TAG) {
String tagName = shouldCloseTag(helper, doc, sup);
if (tagName != null) {
suffix = "";
@@ -437,25 +435,31 @@
return result;
}
- private String shouldCloseTag(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupport sup) {
- TokenItem ti = helper.getToken();
- TokenItem previous = ti.getPrevious();
- if (previous == null || previous.getTokenID() != XMLTokenIDs.TAG) {
+ private String shouldCloseTagLocked(TokenSequence ts) {
+ if (!ts.movePrevious()) {
+ return null;
+ }
+ Token previous = ts.token();
+ if (previous.id() != XMLTokenId.TAG) {
// preceded by something else than tag name, i.e. argument, operator...
return null;
}
- String tagName = previous.getImage();
+ String tagName = previous.text().toString();
if (tagName.equals(">")) { // NOI18N
// closing brace of a tag, iterate towards tag's begin, skip attributes and their values.
- previous = previous.getPrevious();
- while (previous != null && previous.getTokenID() != XMLTokenIDs.TAG) {
- previous = previous.getPrevious();
+ boolean ok;
+
+ while (ok = !ts.movePrevious()) {
+ previous = ts.token();
+ if (previous.id() == XMLTokenId.TAG) {
+ break;
+ }
}
- if (previous == null) {
+ if (!ok) {
return null;
}
// got tagname.
- tagName = previous.getImage();
+ tagName = previous.text().toString();
}
if (tagName.startsWith(END_TAG_PREFIX)) {
// traversal through preceding tags, counting end-start pairs not implemented.
@@ -465,8 +469,7 @@
}
// tag name does not include end sharp brace
tagName = tagName.substring(1, tagName.length()).trim();
- TokenSequence s = (TokenSequence)TokenHierarchy.get(doc).tokenSequence();
- if (isClosingEndTagFoundAfter(ti.getOffset(), s, tagName)) {
+ if (isClosingEndTagFoundAfter(ts.offset(), ts, tagName)) {
// I know, there may be multiple levels of the same tag name, and the innermost may
// be missing...
return null;
@@ -474,6 +477,16 @@
return tagName;
}
+ private String shouldCloseTag(SyntaxQueryHelper helper, Document doc, XMLSyntaxSupport sup) {
+ Token ti = helper.getToken();
+ try {
+ return sup.runWithSequence(helper.getTokenOffset(), this::shouldCloseTagLocked);
+ } catch (BadLocationException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ return null;
+ }
+
public static final String
TAG_FIRST_CHAR = "<", //NOI18N
TAG_LAST_CHAR = ">", //NOI18N
@@ -583,14 +596,17 @@
* @param prefix that is prepended to created ElementResult e.g. ' findStartTag(SyntaxNode text, String prefix) {
+ private static List findStartTag(SyntaxElement text, String prefix) {
//if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug("XMLCompletionQuery.findStartTag: text=" + text);
- Node parent = text.getParentNode();
+ SyntaxElement parentEl = text.getParentElement();
+ if (parentEl == null) {
+ return Collections.EMPTY_LIST;
+ }
+ Node parent = parentEl.getNode();
if (parent == null) {
return Collections.EMPTY_LIST;
}
-
String name = parent.getNodeName();
//if ( Util.THIS.isLoggable() ) Util.THIS.debug(" name=" + name);
if ( name == null ) {
@@ -606,7 +622,7 @@
return list;
}
- private static List findStartTag(SyntaxNode text) {
+ private static List findStartTag(SyntaxElement text) {
return findStartTag(text, "");
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLResultItem.java b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLResultItem.java
--- a/xml.text/src/org/netbeans/modules/xml/text/completion/XMLResultItem.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/completion/XMLResultItem.java
@@ -62,11 +62,13 @@
import javax.swing.JLabel;
import javax.swing.UIManager;
import org.netbeans.api.editor.completion.Completion;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.queries.FileEncodingQuery;
+import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.api.model.GrammarResult;
import org.netbeans.modules.xml.api.model.DescriptionSource;
-import org.netbeans.modules.xml.text.api.XMLDefaultTokenContext;
-import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.spi.editor.completion.CompletionDocumentation;
import org.netbeans.spi.editor.completion.CompletionItem;
import org.netbeans.spi.editor.completion.CompletionResultSet;
@@ -240,23 +242,19 @@
}
return true;
}
-
- //+++ fix for issues #166462, #173122
- // (http://www.netbeans.org/issues/show_bug.cgi?id=166462)
- // (http://www.netbeans.org/issues/show_bug.cgi?id=173122)
- private boolean isTextRemovingAllowable(JTextComponent component,
- BaseDocument doc, String replaceToText, int offset) throws BadLocationException {
- XMLSyntaxSupport support = (XMLSyntaxSupport)
- org.netbeans.editor.Utilities.getSyntaxSupport(component);
- TokenItem tokenItem = support.getTokenChain(offset, doc.getLength());
- boolean isTextRemovingAllowable = (tokenItem == null);
- if (! isTextRemovingAllowable) {
- String tokenItemImage = tokenItem.getImage();
+
+ private boolean isRemovingAvailableLocked(TokenSequence ts, Document doc, int offset, String replaceToText) {
+ ts.move(position);
+ boolean isTextRemovingAllowable = true;
+
+ while (ts.moveNext() && isTextRemovingAllowable) {
+ Token tokenItem = ts.token();
+ String tokenItemImage = tokenItem.text().toString();
if ((tokenItemImage != null) && (tokenItemImage.length() > 0)) {
// See also issue #228865. In this case, the token also may include a prefix
// of the replacement value
String replaceInclPrefix;
- int offs = Math.max(0, offset - tokenItem.getOffset());
+ int offs = Math.max(0, offset - ts.offset());
replaceInclPrefix = tokenItemImage.substring(0, offs) + replaceToText;
int diffPos = getFirstDiffPosition(tokenItemImage, replaceInclPrefix);
diffPos = diffPos == 0 ? 1 : diffPos;
@@ -268,10 +266,8 @@
strText = replaceInclPrefix.length() >= diffPos ?
replaceInclPrefix.substring(0, diffPos) : replaceInclPrefix;
- TokenID tokenID = tokenItem.getTokenID();
- int id = (tokenID != null ? tokenID.getNumericID() : -1);
-
- isTextRemovingAllowable = (id == XMLDefaultTokenContext.TAG_ID ?
+ XMLTokenId id = tokenItem.id();
+ isTextRemovingAllowable = (id == XMLTokenId.TAG ?
! strImg.startsWith(strText) /* <= for tags */ :
strImg.startsWith(strText) /* <= for attributes */);
}
@@ -280,6 +276,15 @@
return isTextRemovingAllowable;
}
+ //+++ fix for issues #166462, #173122
+ // (http://www.netbeans.org/issues/show_bug.cgi?id=166462)
+ // (http://www.netbeans.org/issues/show_bug.cgi?id=173122)
+ private boolean isTextRemovingAllowable(JTextComponent component,
+ BaseDocument doc, String replaceToText, int offset) throws BadLocationException {
+ XMLSyntaxSupport support = XMLSyntaxSupport.getSyntaxSupport(component.getDocument());
+ return support.runWithSequence(offset, (TokenSequence ts) -> isRemovingAvailableLocked(ts, doc, offset, replaceToText));
+ }
+
/**
* Calculates the index of the first difference between two strings.
* If they are differenent starting the first character, then 0 is returned.
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/Attr.java b/xml.text/src/org/netbeans/modules/xml/text/dom/AttrImpl.java
rename from xml.text/src/org/netbeans/modules/xml/text/dom/Attr.java
rename to xml.text/src/org/netbeans/modules/xml/text/dom/AttrImpl.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/Attr.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/AttrImpl.java
@@ -44,13 +44,25 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.util.*;
+import javax.swing.text.BadLocationException;
+import org.netbeans.api.editor.document.AtomicLockDocument;
+import org.netbeans.api.editor.document.LineDocument;
+import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.spi.dom.AbstractNode;
import org.netbeans.modules.xml.spi.dom.NodeListImpl;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
+import org.netbeans.modules.xml.text.api.XMLTextUtils;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport.SequenceCallable;
+import org.openide.util.Exceptions;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
@@ -65,23 +77,27 @@
* @author Petr Kuzel
* @author asgeir@dimonsoftware.com
*/
-public class Attr extends AbstractNode implements org.w3c.dom.Attr {
+public class AttrImpl extends AbstractNode implements org.w3c.dom.Attr, SyntaxElement {
+ private Token first;
+ private SyntaxElement parent;
+ private XMLSyntaxSupport syntax; // that produced us
+ private int index;
- private Token first;
-
- private Element parent;
-
- private XMLSyntaxSupport syntax; // that produced us
-
- Attr(XMLSyntaxSupport syntax, Token first, Element parent) {
+ AttrImpl(XMLSyntaxSupport syntax, Token first, SyntaxElement parent, int index) {
this.parent = parent;
this.first = first;
this.syntax = syntax;
+ this.index = index;
}
public Token getFirstToken() {
return first;
}
+
+ @Override
+ public SyntaxElement getParentElement() {
+ return parent;
+ }
/**
* @return list of child nodes (Text or EntityReference), never null
@@ -97,6 +113,52 @@
return new NodeListImpl(list);
}
+
+ @Override
+ public SyntaxElement getNext() {
+ if (parent == null) {
+ return null;
+ }
+ NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
+ if (index < attrs.getLength() - 1) {
+ return (SyntaxElement)attrs.item(index + 1);
+ } else {
+ return parent.getNext();
+ }
+ }
+
+ @Override
+ public SyntaxElement getPrevious() {
+ if (parent == null) {
+ return null;
+ }
+ NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
+ if (index > 0) {
+ return (SyntaxElement)attrs.item(index - 1);
+ } else {
+ return parent.getPrevious();
+ }
+ }
+
+ @Override
+ public int getElementLength() {
+ return getLength();
+ }
+
+ @Override
+ public int getElementOffset() {
+ return first.offset(null);
+ }
+
+ @Override
+ public int getType() {
+ return Node.ATTRIBUTE_NODE;
+ }
+
+ @Override
+ public Node getNode() {
+ return this;
+ }
/**
* Get next sibling for non syntax element text.
@@ -120,39 +182,67 @@
}
public Node getNextSibling() {
- return null; //according to DOM-1spec
+ if (parent == null) {
+ return null;
+ }
+ NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
+ if (index < attrs.getLength() - 1) {
+ return attrs.item(index + 1);
+ } else {
+ return null;
+ }
}
public Node getPreviousSibling() {
- return null; //according to DOM-1 spec
+ if (parent == null) {
+ return null;
+ }
+ NamedNodeMap attrs = ((Element)parent.getNode()).getAttributes();
+ if (index > 0) {
+ return attrs.item(index - 1);
+ } else {
+ return null;
+ }
+ }
+
+ private Node getFirstChildLocked(TokenSequence ts) {
+ while (ts.moveNext()) {
+ Token t = ts.token();
+ if (t.id() == XMLTokenId.VALUE) {
+ // fuzziness to relax minor tokenization changes
+ CharSequence image = t.text();
+ if (image.length() == 1) {
+ char test = image.charAt(0);
+ if (test == '"' || test == '\'') {
+ if (ts.moveNext()) {
+ t = ts.token();
+ } else {
+ return null;
+ }
+ }
+ }
+
+ if (t.id() == XMLTokenId.VALUE) {
+ return new TextImpl(syntax, t, ts.offset(), ts.offset() + t.length(), this);
+ } else {
+ return null;
+ }
+ }
+ }
+ return null;
}
public Node getFirstChild() {
-// TokenItem next = first;
-// for (; next != null; next = next.getNext()) {
-// if (next.getTokenID() == VALUE) {
-// // fuzziness to relax minor tokenization changes
-// String image = next.getImage();
-// if (image.length() == 1) {
-// char test = image.charAt(0);
-// if (test == '"' || test == '\'') {
-// next = next.getNext();
-// }
-// }
-// break; // we are after opening "'"
-// }
-// }
-// if (next == null) return null;
-// if (next.getTokenID() == VALUE) {
-// return new TextImpl(syntax, next, this); //!!! strip out ending "'", return standalone "'" token
-// } else {
-// throw new RuntimeException("Not recognized yet: " + next.getTokenID());
-// }
- return null;
+ try {
+ return syntax.runWithSequence(first, this::getFirstChildLocked);
+ } catch (BadLocationException ex) {
+ Exceptions.printStackTrace(ex);
+ return null;
+ }
}
public Node getLastChild() {
- throw new RuntimeException("Not implemented yet");
+ return getFirstChild();
}
public String getNodeName() {
@@ -160,8 +250,7 @@
}
public String getName() {
- //return first.getImage();
- return null;
+ return first.text().toString();
}
public boolean getSpecified() {
@@ -169,82 +258,106 @@
}
public void setValue(String value) {
-// // Initialize oldValueStartPos and oldValueLength parameters
-// int oldValueStartPos = -1;
-// int oldValueLength = 0;
-// boolean notClosed = false;
-// char firstChar = '"';
-// char lastChar = '\0';
-// TokenItem next = first;
-// for (; next != null; next = next.getNext()) {
-// TokenID nextId = next.getTokenID();
-//
-// if (oldValueStartPos != -1 && nextId != VALUE && nextId != CHARACTER) {
-// break;
-// }
-//
-// String nextImage = next.getImage();
-//
-// String actualImage = Util.actualAttributeValue(nextImage);
-// if (!nextImage.equals(actualImage)) {
-// notClosed = true;
-// nextImage = actualImage;
-// }
-//
-// if (nextId == VALUE && oldValueStartPos == -1 && nextImage.length() > 0) {
-// oldValueStartPos = next.getOffset();
-// if (nextImage.charAt(0) == '"' || nextImage.charAt(0) == '\'') {
-// firstChar = nextImage.charAt(0);
-// oldValueStartPos++;
-// oldValueLength--;
-// }
-// }
-//
-// if (oldValueStartPos != -1 && nextImage.length() > 0) {
-// oldValueLength += nextImage.length();
-// lastChar = nextImage.charAt(nextImage.length()-1);
-// }
-//
-// if (notClosed) {
-// break;
-// }
-// }
-//
-// if (lastChar == firstChar) {
-// oldValueLength--;
-// }
-//
-// // Replace known entities
-// value = Util.replaceCharsWithEntityStrings(value);
-//
-// // Close the attribute if it was non-closed
-// if (notClosed) {
-// value += firstChar;
-// }
-//
-// // Replace the text in the document
-// BaseDocument doc = (BaseDocument)syntax.getDocument();
-// doc.atomicLock();
-// try {
-// doc.remove(oldValueStartPos, oldValueLength);
-// doc.insertString(oldValueStartPos, value, null);
-// doc.invalidateSyntaxMarks();
-// } catch( BadLocationException e ) {
-// throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());
-// } finally {
-// doc.atomicUnlock();
-// }
-//
-// // Update the status of this object
-// try {
-// int endOffset = oldValueStartPos + oldValueLength;
-// if (endOffset > doc.getLength()) {
-// endOffset = doc.getLength();
-// }
-// first = syntax.getTokenChain(first.getOffset(), endOffset);
-// } catch (BadLocationException e) {
-// throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());
-// }
+ class H implements SequenceCallable {
+ int oldValueStartPos = -1;
+ int oldValueLength = 0;
+ boolean notClosed = false;
+ char firstChar = '"';
+ char lastChar = '\0';
+
+ @Override
+ public Object call(TokenSequence ts) throws BadLocationException {
+ Token next = first;
+ while (ts.moveNext()) {
+ next = ts.token();
+ XMLTokenId nextId = next.id();
+
+ if (oldValueStartPos != -1 && nextId != XMLTokenId.VALUE && nextId != XMLTokenId.CHARACTER) {
+ break;
+ }
+
+ String nextImage = next.text().toString();
+
+ String actualImage = XMLTextUtils.actualAttributeValue(nextImage);
+ if (!nextImage.equals(actualImage)) {
+ notClosed = true;
+ nextImage = actualImage;
+ }
+
+ if (nextId == XMLTokenId.VALUE && oldValueStartPos == -1 && nextImage.length() > 0) {
+ oldValueStartPos = ts.offset();
+ if (nextImage.charAt(0) == '"' || nextImage.charAt(0) == '\'') {
+ firstChar = nextImage.charAt(0);
+ oldValueStartPos++;
+ oldValueLength--;
+ }
+ }
+
+ if (oldValueStartPos != -1 && nextImage.length() > 0) {
+ oldValueLength += nextImage.length();
+ lastChar = nextImage.charAt(nextImage.length()-1);
+ }
+
+ if (notClosed) {
+ break;
+ }
+ }
+ if (lastChar == firstChar) {
+ oldValueLength--;
+ }
+
+ return null;
+ }
+ }
+ H h = new H();
+ try {
+ syntax.runWithSequence(first.offset(null), h);
+ } catch (BadLocationException ex) {
+ throw new DOMException(DOMException.INVALID_STATE_ERR , ex.getMessage());
+ }
+
+ // Replace known entities
+ value = XMLTextUtils.replaceCharsWithEntityStrings(value);
+
+ // Close the attribute if it was non-closed
+ if (h.notClosed) {
+ value += h.firstChar;
+ }
+
+ // Replace the text in the document
+ final LineDocument doc = syntax.getDocument();
+ AtomicLockDocument ald = LineDocumentUtils.asRequired(doc, AtomicLockDocument.class);
+ final BadLocationException[] ex = new BadLocationException[1];
+ final int fOldValStartPos = h.oldValueStartPos;
+ final int fOldValLen = h.oldValueLength;
+ final String fValue = value;
+ ald.runAtomic(() -> {;
+ try {
+ doc.remove(fOldValStartPos, fOldValLen);
+ doc.insertString(fOldValStartPos, fValue, null);
+ //doc.invalidateSyntaxMarks();
+ } catch( BadLocationException e ) {
+ ex[0] = e;
+ }
+ });
+ if (ex[0] != null) {
+ throw new DOMException(DOMException.INVALID_STATE_ERR , ex[0].getMessage());
+ }
+
+ // Update the status of this object
+ try {
+ int endOffset = fOldValStartPos + fOldValLen;
+ if (endOffset > doc.getLength()) {
+ endOffset = doc.getLength();
+ }
+ syntax.runWithSequence(first.offset(null),
+ (TokenSequence ts) -> {
+ first = ts.token();
+ return null;
+ });
+ } catch (BadLocationException e) {
+ throw new DOMException(DOMException.INVALID_STATE_ERR , e.getMessage());
+ }
}
public void setNodeValue(String value) {
@@ -259,42 +372,56 @@
return getValue();
}
+ private String getValueLocked(TokenSequence ts) {
+ StringBuilder sb = new StringBuilder();
+ boolean valStarted = false;
+ V: while (ts.moveNext()) {
+ Token t = ts.token();
+ switch (t.id()) {
+ case CHARACTER:
+ if (!valStarted) {
+ return null;
+ }
+ // fall through
+ case VALUE: {
+ String image = t.text().toString();
+ String actual = XMLTextUtils.actualAttributeValue(image);
+ valStarted = true;
+ if (!image.equals(actual)) {
+ sb.append(actual);
+ break;
+ } else {
+ sb.append(image);
+ }
+ break;
+ }
+ case WS:
+ case OPERATOR:
+ break;
+ default:
+ break V;
+ }
+ }
+ // Remove " and ' around the attribute value
+ if (sb.length() > 0) {
+ char firstChar = sb.charAt(0);
+ if (firstChar == '"' || firstChar == '\'') {
+ sb.deleteCharAt(0);
+ if (sb.length() > 0 && sb.charAt(sb.length()-1) == firstChar) {
+ sb.deleteCharAt(sb.length()-1);
+ }
+ }
+ }
+ return XMLTextUtils.replaceEntityStringsWithChars(sb.toString());
+ }
+
public String getValue() {
-// // Find the first value token. Should be after "name="
-// TokenItem next = first;
-// for (; next != null; next = next.getNext()) {
-// if (next.getTokenID() == VALUE) {
-// break;
-// }
-// }
-//
-// // Add values of all value and character entity
-// StringBuffer buf = new StringBuffer();
-// while (next != null && (next.getTokenID() == VALUE || next.getTokenID() == CHARACTER)) {
-// String image = next.getImage();
-// String actual = Util.actualAttributeValue(image);
-// if (!image.equals(actual)) {
-// buf.append(actual);
-// break;
-// } else {
-// buf.append(image);
-// }
-// next = next.getNext();
-// }
-//
-// // Remove " and ' around the attribute value
-// if (buf.length() > 0) {
-// char firstChar = buf.charAt(0);
-// if (firstChar == '"' || firstChar == '\'') {
-// buf.deleteCharAt(0);
-// if (buf.length() > 0 && buf.charAt(buf.length()-1) == firstChar) {
-// buf.deleteCharAt(buf.length()-1);
-// }
-// }
-// }
-//
-// return Util.replaceEntityStringsWithChars(buf.toString());
- return null;
+ try {
+ return syntax.runWithSequence(first, this::getValueLocked);
+ } catch (BadLocationException ex) {
+ Exceptions.printStackTrace(ex);
+ return null;
+ }
}
public short getNodeType() {
@@ -307,7 +434,10 @@
public Element getOwnerElement() {
// ((Tag)parent).retokenizeObject();
- return parent;
+ if (parent == null) {
+ return null;
+ }
+ return (Element)parent.getNode();
}
/**
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxElement.java b/xml.text/src/org/netbeans/modules/xml/text/dom/BaseSyntaxElement.java
rename from xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxElement.java
rename to xml.text/src/org/netbeans/modules/xml/text/dom/BaseSyntaxElement.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxElement.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/BaseSyntaxElement.java
@@ -46,10 +46,13 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.lang.ref.WeakReference;
import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
+import org.w3c.dom.Node;
/**
@@ -64,19 +67,19 @@
*
* @version 1.0
*/
-public abstract class SyntaxElement {
+public abstract class BaseSyntaxElement implements org.netbeans.modules.xml.text.api.dom.SyntaxElement {
protected XMLSyntaxSupport support;
private WeakReference first; //a weak reference to the fist TokenItem of this SE
- private WeakReference previous; // WR to the cached previous element
- private WeakReference next; // WR to the cached next element
+ private WeakReference previous; // WR to the cached previous element
+ private WeakReference next; // WR to the cached next element
// let it be visible by static inner classes extending us
protected int offset; // original position in document
protected int length; // original lenght in document
/** Creates new SyntaxElement */
- SyntaxElement(XMLSyntaxSupport support, Token token, int start, int end) {
+ BaseSyntaxElement(XMLSyntaxSupport support, Token token, int start, int end) {
this.support = support;
this.offset = start;
this.length = end-start;
@@ -118,11 +121,11 @@
return length;
}
- void setNext(SyntaxElement se) {
+ void setNext(BaseSyntaxElement se) {
next = new WeakReference(se);
}
- void setPrevious(SyntaxElement se) {
+ void setPrevious(BaseSyntaxElement se) {
previous = new WeakReference(se);
}
@@ -131,8 +134,8 @@
* @return previous SyntaxElement or null at document begining
* or illegal location.
*/
- public SyntaxElement getPrevious() {
- SyntaxElement cached_previous = (previous == null) ? null : previous.get();
+ public BaseSyntaxElement getPrevious() {
+ BaseSyntaxElement cached_previous = (previous == null) ? null : previous.get();
if( cached_previous != null )
return cached_previous;
try {
@@ -141,7 +144,7 @@
return null;
}
//data not inialized yet or GC'ed already - we need to parse again
- SyntaxElement new_previous = support.getElementChain( getElementOffset() - 1 );
+ BaseSyntaxElement new_previous = (BaseSyntaxElement)support.getElementChain( getElementOffset() - 1 );
if( new_previous != null ) {
setPrevious(new_previous); //weakly cache the element
new_previous.setNext(this);
@@ -160,13 +163,13 @@
* @return next SyntaxElement or null at document end
* or illegal location.
*/
- public SyntaxElement getNext() {
- SyntaxElement cached_next = next == null ? null : next.get();
+ public BaseSyntaxElement getNext() {
+ BaseSyntaxElement cached_next = next == null ? null : next.get();
if( cached_next != null )
return cached_next;
try {
//data not inialized yet or GC'ed already - we need to parse again
- SyntaxElement new_next = support.getElementChain( offset+length);
+ BaseSyntaxElement new_next = (BaseSyntaxElement)support.getElementChain( offset+length + 1);
if( new_next != null ) {
setNext(new_next); //weakly cache the element
new_next.setPrevious(this);
@@ -179,7 +182,7 @@
return null;
}
}
-
+
/**
* Print element content for debug purposes.
*/
@@ -199,16 +202,20 @@
* DOM Node equals. It's not compatible with Object's equals specs!
*/
public boolean equals(Object obj) {
- if (obj instanceof SyntaxElement) {
- if (((SyntaxElement)obj).offset == offset) return true;
+ if (obj instanceof BaseSyntaxElement) {
+ if (((BaseSyntaxElement)obj).offset == offset) return true;
}
return false;
}
+ public String getName() {
+ return null;
+ }
+
/**
* It may stop some DOM traversing. //!!!
*/
- public static class Error extends SyntaxElement {
+ public static class Error extends BaseSyntaxElement {
public Error( XMLSyntaxSupport support, Token first, int start, int end ) {
super( support, first, start, end);
}
@@ -216,6 +223,25 @@
public String toString() {
return "Error" + super.toString(); // NOI18N
}
+
+ @Override
+ public int getType() {
+ return NODE_ERROR;
+ }
+
+ @Override
+ public Node getNode() {
+ return null;
+ }
+
+ @Override
+ public SyntaxElement getParentElement() {
+ BaseSyntaxElement x = this;
+ while (x != null && x.getType() != Node.ELEMENT_NODE) {
+ x = x.getPrevious();
+ }
+ return x;
+ }
}
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/CDATASection.java b/xml.text/src/org/netbeans/modules/xml/text/dom/CDATASection.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/CDATASection.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/CDATASection.java
@@ -44,27 +44,48 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
+import org.w3c.dom.Node;
/**
* CDATA section representation.
*/
-public class CDATASection extends Text {
+public class CDATASection extends TextImpl implements org.w3c.dom.CDATASection {
/**
* Create content text node.
*/
- CDATASection(XMLSyntaxSupport support, Token from, int start, int end) {
+ public CDATASection(XMLSyntaxSupport support, Token from, int start, int end) {
super( support, from, start, end);
}
+ @Override
+ public String getNodeValue() {
+ String text = first().text().toString();
+ int start = 0;
+ int end = text.length();
+ if (text.startsWith("")) {
+ end = text.length() - 3;
+ }
+ return text.substring(start, end);
+ }
+
// /**
// * Create attribute text node.
// */
// CDATASection(XMLSyntaxSupport syntax, Token from, Attr parent) {
// super( syntax, from, parent);
// }
+
+ @Override
+ public short getNodeType() {
+ return Node.CDATA_SECTION_NODE;
+ }
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/Comment.java b/xml.text/src/org/netbeans/modules/xml/text/dom/Comment.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/Comment.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/Comment.java
@@ -44,6 +44,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.spi.dom.ROException;
@@ -57,7 +58,7 @@
*/
public class Comment extends SyntaxNode implements org.w3c.dom.Comment {
- Comment(XMLSyntaxSupport support, Token from, int start, int end) {
+ public Comment(XMLSyntaxSupport support, Token from, int start, int end) {
super( support, from, start, end);
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/Document.java b/xml.text/src/org/netbeans/modules/xml/text/dom/Document.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/Document.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/Document.java
@@ -45,12 +45,13 @@
package org.netbeans.modules.xml.text.dom;
import org.netbeans.modules.xml.spi.dom.*;
+import org.w3c.dom.DOMException;
public class Document extends AbstractNode implements org.w3c.dom.Document {
- SyntaxElement syntax;
+ BaseSyntaxElement syntax;
- Document(SyntaxElement element) {
+ Document(BaseSyntaxElement element) {
syntax = element;
}
@@ -273,6 +274,5 @@
}
}
-
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/DocumentType.java b/xml.text/src/org/netbeans/modules/xml/text/dom/DocumentType.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/DocumentType.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/DocumentType.java
@@ -44,6 +44,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.spi.dom.*;
@@ -55,7 +56,7 @@
*/
public class DocumentType extends SyntaxNode implements org.w3c.dom.DocumentType {
- DocumentType(XMLSyntaxSupport syntax, Token first, int start, int end) {
+ public DocumentType(XMLSyntaxSupport syntax, Token first, int start, int end) {
super (syntax, first, start, end);
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/EmptyTag.java b/xml.text/src/org/netbeans/modules/xml/text/dom/EmptyTag.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/EmptyTag.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/EmptyTag.java
@@ -45,6 +45,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.w3c.dom.*;
@@ -52,10 +53,10 @@
public class EmptyTag extends Tag {
- EmptyTag(XMLSyntaxSupport support, Token from, int start, int end) {
- super( support, from, start, end);
+ public EmptyTag(XMLSyntaxSupport support, Token from, int start, int end) {
+ super( support, from, start, end, from.text().toString().substring(1));
}
-
+
public boolean hasChildNodes() {
return false;
}
@@ -64,13 +65,28 @@
return NodeListImpl.EMPTY;
}
- protected Tag getEndTag() {
+ public Tag getEndTag() {
return this;
}
- protected Tag getStartTag() {
+ public Tag getStartTag() {
return this;
}
+
+ @Override
+ public boolean isStart() {
+ return false;
+ }
+
+ @Override
+ public boolean isEnd() {
+ return false;
+ }
+
+ @Override
+ public boolean isSelfClosing() {
+ return true;
+ }
public String toString() {
StringBuffer ret = new StringBuffer( "EmptyTag(\"" + name + "\" " );
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/EndTag.java b/xml.text/src/org/netbeans/modules/xml/text/dom/EndTag.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/EndTag.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/EndTag.java
@@ -44,6 +44,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.util.*;
import org.netbeans.api.lexer.Token;
@@ -57,9 +58,11 @@
*/
public class EndTag extends Tag {
- EndTag(XMLSyntaxSupport support, Token from, int start, int end) {
- super( support, from, start, end);
- this.name = from.text().toString();
+ public EndTag(XMLSyntaxSupport support, Token from, int start, int end) {
+ super(support, from, start, end, from.text().toString().substring(2));
+ if (name.equals("")) { // NOI18N
+ // self-closing tag ? -- TODO
+ }
}
/**
@@ -75,7 +78,7 @@
}
public boolean hasChildNodes() {
- SyntaxElement prev = getPrevious();
+ BaseSyntaxElement prev = getPrevious();
if (prev == null) return false;
if (prev instanceof EndTag && ((EndTag)prev).getStartTag() == null) return false;
if (prev instanceof StartTag) return false;
@@ -95,7 +98,7 @@
return new NodeListImpl(list);
}
- protected Tag getStartTag() {
+ public Tag getStartTag() {
SyntaxNode prev = findPrevious();
@@ -121,9 +124,25 @@
return null;
}
- protected Tag getEndTag() {
+ public Tag getEndTag() {
return this;
}
+
+ @Override
+ public boolean isStart() {
+ return false;
+ }
+
+ @Override
+ public boolean isEnd() {
+ return true;
+ }
+
+ @Override
+ public boolean isSelfClosing() {
+ return false;
+ }
+
public String toString() {
return "EndTag(\"" + name + "\") " + first();
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/EntityReference.java b/xml.text/src/org/netbeans/modules/xml/text/dom/EntityReference.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/EntityReference.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/EntityReference.java
@@ -44,6 +44,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.w3c.dom.Node;
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/ProcessingInstruction.java b/xml.text/src/org/netbeans/modules/xml/text/dom/ProcessingInstruction.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/ProcessingInstruction.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/ProcessingInstruction.java
@@ -44,6 +44,7 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
@@ -56,13 +57,13 @@
*
* @author Petr Kuzel
*/
-public final class ProcessingInstruction extends SyntaxNode {
+public final class ProcessingInstruction extends SyntaxNode implements org.w3c.dom.ProcessingInstruction {
private String target;
private String content;
/** Creates a new instance of ProcessingInstructionImpl */
- ProcessingInstruction(XMLSyntaxSupport syntax, Token first,
+ public ProcessingInstruction(XMLSyntaxSupport syntax, Token first,
int start, int end, String target, String content) {
super(syntax, first, start, end);
this.target = target;
@@ -90,5 +91,14 @@
public void setData(String data) throws DOMException {
throw new ROException();
}
-
+
+ @Override
+ public String getTarget() {
+ return getNodeName();
+ }
+
+ @Override
+ public String getData() {
+ return getNodeValue();
+ }
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/StartTag.java b/xml.text/src/org/netbeans/modules/xml/text/dom/StartTag.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/StartTag.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/StartTag.java
@@ -44,22 +44,23 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import java.util.*;
import org.netbeans.api.lexer.Token;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.modules.xml.spi.dom.NodeListImpl;
+import org.netbeans.modules.xml.text.api.dom.TagElement;
import org.w3c.dom.*;
public class StartTag extends Tag {
- StartTag(XMLSyntaxSupport support, Token from, int start, int end) {
- super( support, from, start, end);
- this.name = from.text().toString();
+ public StartTag(XMLSyntaxSupport support, Token from, int start, int end) {
+ super( support, from, start, end, from.text().toString().substring(1));
}
public boolean hasChildNodes() {
- SyntaxElement next = getNext();
+ BaseSyntaxElement next = getNext();
if (next == null) return false;
// if not well-formed
if (next instanceof StartTag && ((StartTag)next).getEndTag() == null) return false;
@@ -80,11 +81,11 @@
return new NodeListImpl(list);
}
- protected Tag getStartTag() {
+ public Tag getStartTag() {
return this;
}
- protected Tag getEndTag() {
+ public Tag getEndTag() {
SyntaxNode next = findNext();
@@ -116,5 +117,16 @@
return ret.toString() + " " + first() + ")";
}
+ public boolean isStart() {
+ return true;
+ }
+
+ public boolean isEnd() {
+ return false;
+ }
+
+ public boolean isSelfClosing() {
+ return false;
+ }
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxNode.java b/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxNode.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxNode.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/SyntaxNode.java
@@ -44,10 +44,13 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.spi.dom.*;
import org.netbeans.api.lexer.Token;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.Text;
import org.w3c.dom.TypeInfo;
import org.w3c.dom.UserDataHandler;
@@ -67,13 +70,22 @@
* @version 1.0
*/
-public abstract class SyntaxNode extends SyntaxElement implements org.w3c.dom.Node {
+public abstract class SyntaxNode extends BaseSyntaxElement implements org.w3c.dom.Node {
/** Creates new SyntaxNode */
SyntaxNode(XMLSyntaxSupport support, Token first, int start, int end) {
super( support, first, start, end);
}
+ @Override
+ public int getType() {
+ return getNodeType();
+ }
+
+ @Override
+ public Node getNode() {
+ return this;
+ }
/**
* Default implementation returning first previous SyntaxNode
* or null. It is StartTag aware.
@@ -92,8 +104,8 @@
/**
* Find previous SyntaxNode instance or null.
*/
- static SyntaxNode findPrevious(SyntaxElement el) {
- SyntaxElement prev = el.getPrevious();
+ static SyntaxNode findPrevious(BaseSyntaxElement el) {
+ BaseSyntaxElement prev = el.getPrevious();
while ((prev instanceof SyntaxNode) == false) {
if (prev == null) return null;
prev = prev.getPrevious();
@@ -125,8 +137,8 @@
/**
* Find previous SyntaxNode instance or null.
*/
- static SyntaxNode findNext(SyntaxElement el) {
- SyntaxElement next = el.getNext();
+ static SyntaxNode findNext(BaseSyntaxElement el) {
+ BaseSyntaxElement next = el.getNext();
while ((next instanceof SyntaxNode) == false) {
if (next == null) return null;
next = next.getNext();
@@ -141,6 +153,11 @@
return findNext(this);
}
+ public SyntaxElement getParentElement() {
+ Node n = getParentNode();
+ return n instanceof SyntaxElement ? (SyntaxElement)n : null;
+ }
+
/**
* First previous start tag at higher level is my parent.
* Skip all end-tag start-tag pairs at the same level.
@@ -338,5 +355,4 @@
public void setIdAttributeNode(org.w3c.dom.Attr a, boolean b) {
throw new UOException ();
}
-
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/Tag.java b/xml.text/src/org/netbeans/modules/xml/text/dom/Tag.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/Tag.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/Tag.java
@@ -44,10 +44,19 @@
package org.netbeans.modules.xml.text.dom;
-import java.util.Collection;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import javax.swing.text.BadLocationException;
import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.api.xml.lexer.XMLTokenId;
+import org.netbeans.modules.xml.spi.dom.NamedNodeMapImpl;
import org.netbeans.modules.xml.spi.dom.ROException;
import org.netbeans.modules.xml.spi.dom.UOException;
+import org.netbeans.modules.xml.text.api.dom.TagElement;
+import org.openide.util.Exceptions;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -61,14 +70,15 @@
* equals. The equals is used for syntax element
* purposes.
*/
-public abstract class Tag extends SyntaxNode implements org.w3c.dom.Element {
+public abstract class Tag extends SyntaxNode implements org.w3c.dom.Element, TagElement {
protected NamedNodeMap domAttributes;
protected String name;
- Tag(XMLSyntaxSupport support, Token from, int start, int end) {
+ Tag(XMLSyntaxSupport support, Token from, int start, int end, String name) {
super(support, from, start, end);
+ this.name = name;
}
public final short getNodeType() {
@@ -83,54 +93,84 @@
return name;
}
+ private Map parseAttributes(TokenSequence ts) {
+ HashMap map = new LinkedHashMap(3);
+
+ int index = 0;
+ SCAN_LOOP:
+ while (ts.moveNext()) {
+ Token next = ts.token();
+ XMLTokenId id = next.id();
+ String name;
+ String value;
+ if (id == XMLTokenId.ARGUMENT) {
+ Token attributeStart = next;
+ name = next.text().toString();
+ while (next.id() != XMLTokenId.VALUE) {
+ if (!ts.moveNext()) {
+ break SCAN_LOOP;
+ }
+ next = ts.token();
+ if (next.id() == XMLTokenId.ERROR) {
+ break SCAN_LOOP;
+ }
+ }
+
+ // fuzziness to relax minor tokenization changes
+ String image = next.text().toString();
+ char test = image.charAt(0);
+ if (image.length() == 1) {
+ if (test == '"' || test == '\'') {
+ if (!ts.moveNext()) {
+ break SCAN_LOOP;
+ }
+ next = ts.token();
+ }
+ }
+
+ value = next.text().toString();
+
+ Object key = NamedNodeMapImpl.createKey(name);
+ map.put(key, new AttrImpl(support, attributeStart, this, index++));
+
+ next = skipAttributeValue(ts, test);
+ if (next == null) {
+ break SCAN_LOOP;
+ }
+ } else if (id == XMLTokenId.WS) {
+ // just skip
+ } else {
+ break; // end of element markup
+ }
+ }
+ return map;
+ }
+
+ private static Token skipAttributeValue(TokenSequence ts, char delim) {
+ do {
+ Token t = ts.token();
+ if (t.text().charAt(t.length() - 1) == delim) {
+ return ts.moveNext() ? ts.token() : null;
+ }
+ } while (ts.moveNext());
+ return null;
+ }
+
/**
* Create properly bound attributes and cache results.
* Parse attributes from first token.
*/
public synchronized NamedNodeMap getAttributes() {
-
-// HashMap map = new LinkedHashMap(3);
-//
-// SCAN_LOOP:
-// for (TokenItem next = first().getNext(); next != null; next = next.getNext()) {
-// TokenID id = next.getTokenID();
-// String name;
-// String value;
-// if (id == ARGUMENT) {
-// TokenItem attributeStart = next;
-// name = next.getImage();
-// while (next.getTokenID() != VALUE) {
-// next = next.getNext();
-// if (next == null || next.getTokenID() == ERROR) break SCAN_LOOP;
-// }
-//
-// // fuzziness to relax minor tokenization changes
-// String image = next.getImage();
-// char test = image.charAt(0);
-// if (image.length() == 1) {
-// if (test == '"' || test == '\'') {
-// next = next.getNext();
-// }
-// }
-//
-// if (next == null) break SCAN_LOOP;
-// value = next.getImage();
-//
-// Object key = NamedNodeMapImpl.createKey(name);
-// map.put(key, new AttrImpl(support, attributeStart, this));
-//
-// next = Util.skipAttributeValue(next, test);
-// if (next == null) break SCAN_LOOP;
-// } else if (id == WS) {
-// // just skip
-// } else {
-// break; // end of element markup
-// }
-// }
-//
-// // domAttributes = new NamedNodeMapImpl(map);
-// return new NamedNodeMapImpl(map);
- return null;
+ try {
+ return new NamedNodeMapImpl(
+ support.runWithSequence(offset, (TokenSequence ts) -> {
+ return parseAttributes(ts);
+ })
+ );
+ } catch (BadLocationException ex) {
+ Exceptions.printStackTrace(ex);
+ return null;
+ }
}
public String getAttribute(String name) {
@@ -276,9 +316,9 @@
return list.item(list.getLength());
}
- protected abstract Tag getStartTag();
+ public abstract Tag getStartTag();
- protected abstract Tag getEndTag();
+ public abstract Tag getEndTag();
// unsupported DOM level 2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
public String getAttributeNS(String namespaceURI, String localName) {
diff --git a/xml.text/src/org/netbeans/modules/xml/text/dom/Text.java b/xml.text/src/org/netbeans/modules/xml/text/dom/TextImpl.java
rename from xml.text/src/org/netbeans/modules/xml/text/dom/Text.java
rename to xml.text/src/org/netbeans/modules/xml/text/dom/TextImpl.java
--- a/xml.text/src/org/netbeans/modules/xml/text/dom/Text.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/dom/TextImpl.java
@@ -44,10 +44,10 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.api.lexer.Token;
import org.w3c.dom.*;
import org.netbeans.modules.xml.spi.dom.*;
-import org.netbeans.editor.*;
/**
* DOM Text implementation. Note that it is automatically
@@ -58,22 +58,22 @@
*
* @author Petr Kuzel
*/
-public class Text extends SyntaxNode implements org.w3c.dom.Text {
+public class TextImpl extends SyntaxNode implements org.w3c.dom.Text {
// if attribute text node then parent otherwise null
- private Attr parent;
+ private AttrImpl parent;
/**
* Create content text node.
*/
- Text(XMLSyntaxSupport support, Token from, int start, int end) {
+ public TextImpl(XMLSyntaxSupport support, Token from, int start, int end) {
super( support, from, start, end);
}
/**
* Create attribute text node.
*/
- Text(XMLSyntaxSupport syntax, Token from, int start, int end, Attr parent) {
+ public TextImpl(XMLSyntaxSupport syntax, Token from, int start, int end, AttrImpl parent) {
super( syntax, from, start, end);
if (parent == null) throw new IllegalArgumentException();
this.parent = parent;
@@ -108,7 +108,7 @@
return getData();
}
- public Text splitText(int offset) {
+ public TextImpl splitText(int offset) {
throw new ROException();
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/folding/XmlFoldManager.java b/xml.text/src/org/netbeans/modules/xml/text/folding/XmlFoldManager.java
--- a/xml.text/src/org/netbeans/modules/xml/text/folding/XmlFoldManager.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/folding/XmlFoldManager.java
@@ -68,9 +68,9 @@
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.Utilities;
+import org.netbeans.modules.xml.text.api.XMLTextUtils;
import org.netbeans.modules.xml.text.folding.TokenElement.Token;
import org.netbeans.modules.xml.text.folding.TokenElement.TokenType;
-import org.netbeans.modules.xml.text.syntax.XMLKit;
/**
* This class is an implementation of @see org.netbeans.spi.editor.fold.FoldManager
@@ -93,7 +93,7 @@
private Preferences prefs;
public XmlFoldManager() {
- prefs = MimeLookup.getLookup(XMLKit.MIME_TYPE).lookup(Preferences.class);
+ prefs = MimeLookup.getLookup(XMLTextUtils.XML_MIME).lookup(Preferences.class);
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatter.java b/xml.text/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatter.java
--- a/xml.text/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatter.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatter.java
@@ -45,12 +45,12 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.LinkedList;
import java.util.List;
import java.util.Stack;
import java.util.logging.Logger;
import javax.swing.text.BadLocationException;
-import javax.swing.text.Element;
+import org.netbeans.api.editor.document.LineDocument;
+import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.lexer.LanguagePath;
import org.netbeans.api.lexer.TokenHierarchy;
import org.netbeans.api.lexer.TokenSequence;
@@ -104,7 +104,7 @@
});
}
- public BaseDocument doReformat(BaseDocument doc, int startOffset, int endOffset) {
+ public LineDocument doReformat(LineDocument doc, int startOffset, int endOffset) {
spacesPerTab = IndentUtils.indentLevelSize(doc);
try {
List tags = getTags(doc, startOffset, endOffset);
@@ -125,7 +125,7 @@
return doc;
}
- private void changePrettyText(BaseDocument doc, TokenIndent tag) throws BadLocationException {
+ private void changePrettyText(LineDocument doc, TokenIndent tag) throws BadLocationException {
//i expected the call IndentUtils.createIndentString() to return
//the correct string for the indent level, but it doesn't.
//so this is just a workaround.
@@ -137,11 +137,11 @@
noNewline = tag.isNoNewline();
String newIndentText = IndentUtils.createIndentString(doc, spaces);
//String newIndentText = formatter.getIndentString(doc, tag.getIndentLevel());
- int previousEndOffset = Utilities.getFirstNonWhiteBwd(doc, so) + 1;
+ int previousEndOffset = LineDocumentUtils.getPreviousNonWhitespace(doc, so) + 1;
CharSequence temp = org.netbeans.lib.editor.util.swing.DocumentUtilities.getText(doc, previousEndOffset, so - previousEndOffset);
if(noNewline || so == 0 || CharSequences.indexOf(temp, "\n") != -1){ // NOI18N
- int i = Utilities.getRowFirstNonWhite(doc, so);
- int rowStart = Utilities.getRowStart(doc, so);
+ int i = LineDocumentUtils.getLineFirstNonWhitespace(doc, so);
+ int rowStart = LineDocumentUtils.getLineStart(doc, so);
String currentIndent = doc.getText(rowStart, i - rowStart);
if (!currentIndent.equals(newIndentText)) {
@@ -202,7 +202,7 @@
/**
* The processed document
*/
- private BaseDocument basedoc;
+ private LineDocument basedoc;
private void outsideAttributes() {
firstAttributeIndent = -1;
@@ -258,9 +258,9 @@
} else {
try {
// align with the actual tag:
- indentLevel = Utilities.getVisualColumn(basedoc,
- Utilities.getFirstNonWhiteFwd(basedoc,
- Utilities.getRowStart(basedoc, tokenSequence.offset())));
+ indentLevel = Utilities.getVisualColumn((BaseDocument)basedoc,
+ LineDocumentUtils.getNextNonWhitespace(basedoc,
+ LineDocumentUtils.getLineStart(basedoc, tokenSequence.offset())));
if (!increase) {
indentLevel = Math.max(- spacesPerTab, indentLevel - spacesPerTab);
}
@@ -322,7 +322,7 @@
if (!indent) {
if (!selfClosed && onlyTags) {
indent = true;
- int start = Utilities.getRowStart(basedoc, tokenSequence.offset());
+ int start = LineDocumentUtils.getLineStart(basedoc, tokenSequence.offset());
// do not indent closing tags, if the start & end tag will end up on the same line:
if (myIndent != null) {
int openStart = myIndent.getStartOffset();
@@ -370,7 +370,7 @@
} else {
// align one space after the tagname:
TokenIndent tagIndent = stack.peek();
- int current = Utilities.getVisualColumn(basedoc, tokenSequence.offset());
+ int current = Utilities.getVisualColumn((BaseDocument)basedoc, tokenSequence.offset());
if (tagIndent == null) {
// fallback
firstAttributeIndent = current;
@@ -438,7 +438,7 @@
if (lastNewline == -1 || preserveWhitespace || !intersectsWithRange) {
// even if outside selection range, we do not update indent; text will not affect following tags
// we have to set the 'newLine' flag, if the last text line only contains whitespaces.
- int nonWhitePos = Utilities.getFirstNonWhiteFwd(basedoc, currentOffset + Math.max(0, lastNewline), currentOffset + image.length());
+ int nonWhitePos = LineDocumentUtils.getNextNonWhitespace(basedoc, currentOffset + Math.max(0, lastNewline), currentOffset + image.length());
contentPresent |= nonWhitePos > -1;
wasNewline &= nonWhitePos == -1;
onlyTags &= nonWhitePos == -1;
@@ -451,7 +451,7 @@
while (lno < lineCount) {
currentOffset += lno == 0 ? 0 : lineSizes[lno - 1] + 1; // add 1 for newline
int lineEnd = currentOffset + lineSizes[lno];
- nonWhiteStart = Utilities.getFirstNonWhiteFwd(basedoc, currentOffset, lineEnd);
+ nonWhiteStart = LineDocumentUtils.getNextNonWhitespace(basedoc, currentOffset, lineEnd);
// implies a check for nonWhitestart > -1
if (nonWhiteStart >= startOffset && nonWhiteStart <= endOffset) {
// emit a tag at this position
@@ -520,7 +520,7 @@
* XML and the use of the xml:space attribute. Together they are used to
* calculate how much each token should be indented by.
*/
- private List getTags(BaseDocument basedoc, int startOffset, int endOffset)
+ private List getTags(LineDocument basedoc, int startOffset, int endOffset)
throws BadLocationException, IOException {
@@ -530,183 +530,201 @@
// this is that 1st PI or tag will increment the level to 0
indentLevel = -spacesPerTab;
- basedoc.readLock();
- try {
- TokenHierarchy tokenHierarchy = TokenHierarchy.get(basedoc);
- tokenSequence = tokenHierarchy.tokenSequence();
+ List[] result = new List[1];
+ Exception[] ble = new Exception[1];
+ basedoc.render(() -> {
+ try {
+ result[0] = getTagsLocked(startOffset, endOffset);
+ } catch (BadLocationException | IOException ex) {
+ ble[0] = ex;
+ }
+ });
+ if (ble[0] != null) {
+ if (ble[0] instanceof BadLocationException) {
+ throw (BadLocationException)ble[0];
+ }
+ if (ble[0] instanceof IOException) {
+ throw (IOException)ble[0];
+ } else {
+ throw new IOException(ble[0]);
+ }
+ }
+ return result[0];
+ }
+
+ private List getTagsLocked(int startOffset, int endOffset) throws BadLocationException, IOException {
+ TokenHierarchy tokenHierarchy = TokenHierarchy.get(basedoc);
+ tokenSequence = tokenHierarchy.tokenSequence();
+ token = tokenSequence.token();
+ // Add the text token, if any, before xml declaration to document node
+ if (token != null && token.id() == XMLTokenId.TEXT) {
+ if (tokenSequence.moveNext()) {
+ token = tokenSequence.token();
+ }
+ }
+ currentTokensSize = 0;
+
+
+ // will be set to indent of 1st attribute of a tag. Will be reset to -1 by start tag
+ firstAttributeIndent = -1;
+ wasNewline = false;
+
+ while (tokenSequence.moveNext()) {
+ int indentLineStart = 1;
token = tokenSequence.token();
- // Add the text token, if any, before xml declaration to document node
- if (token != null && token.id() == XMLTokenId.TEXT) {
- if (tokenSequence.moveNext()) {
- token = tokenSequence.token();
- }
+ XMLTokenId tokenId = token.id();
+ CharSequence image = token.text();
+ if (tokenSequence.offset() > endOffset) {
+ break;
}
- currentTokensSize = 0;
-
-
- // will be set to indent of 1st attribute of a tag. Will be reset to -1 by start tag
- firstAttributeIndent = -1;
- wasNewline = false;
-
- while (tokenSequence.moveNext()) {
- int indentLineStart = 1;
- token = tokenSequence.token();
- XMLTokenId tokenId = token.id();
- CharSequence image = token.text();
- if (tokenSequence.offset() > endOffset) {
+ tokenInSelectionRange = tokenSequence.offset() >= startOffset || tokenSequence.offset() + token.length() > endOffset;
+ switch (tokenId) {
+ case TAG: { // Tag is encountered and the required level of indenting determined.
+ // The tokens are only assessed if they are in the selection
+ // range, which is the whole document if no text is selected.
+ int len = image.length();
+ firstAttributeIndent = -1;
+ if (image.charAt(len - 1) == '>') {// '/>' // NOI18N
+ if (len == 2) {
+ endTag(image, true);
+ } else {
+ // end tag name marker
+ tagClose(image);
+ }
+ } else {
+ if (startsWith(image, "= startOffset || tokenSequence.offset() + token.length() > endOffset;
- switch (tokenId) {
- case TAG: { // Tag is encountered and the required level of indenting determined.
- // The tokens are only assessed if they are in the selection
- // range, which is the whole document if no text is selected.
- int len = image.length();
- firstAttributeIndent = -1;
- if (image.charAt(len - 1) == '>') {// '/>' // NOI18N
- if (len == 2) {
- endTag(image, true);
- } else {
- // end tag name marker
- tagClose(image);
- }
- } else {
- if (startsWith(image, " -1) {
+ // we cannot indent comment start, will not touch even the rest of the comment.
break;
}
- /**
- * Block comments are aligned as follows:
- * - if there is some preceeding non-whitespace, do not format anything. E.g. comments after element. Skip entire comment from formatting
- * - align 1st and last line at the appropriate indent level
- * - compute "shift" from the last line & indent level
- * - shift INTERIOR of the comment by the computed shift
- *
- * This algorithm tries to preserve internal formatting of the comment
- */
- case BLOCK_COMMENT: {
- int currentOffset = tokenSequence.offset();
+ int lastLineStart = LineDocumentUtils.getLineStart(basedoc, currentOffset + token.length() - 1);
+ int lastIndent = IndentUtils.lineIndent(basedoc, lastLineStart);
- splitLines(image);
+ // align 1st and last row here:
+ int baseIndent = indentLevel + spacesPerTab;
+ // shift the rest of lines by this offset
+ int indentShift = baseIndent - lastIndent;
- int lineStart = Utilities.getRowStart(basedoc, currentOffset);
+ // how much to shift the interior of the comment
- if (lineStart < currentOffset &&
- Utilities.getFirstNonWhiteBwd(basedoc, currentOffset, lineStart) > -1) {
- // we cannot indent comment start, will not touch even the rest of the comment.
- break;
+ for (int lno = 0; lno < lineCount; lno++) {
+ // indent 1st comment line, as if it was text:
+ int lineEnd = LineDocumentUtils.getLineEnd(basedoc, currentOffset);
+
+ int desiredIndent;
+ if (lno == 0 || lno == lineCount -1) {
+ desiredIndent = baseIndent;
+ } else {
+ desiredIndent = IndentUtils.lineIndent(basedoc, currentOffset) + indentShift;
}
-
- int lastLineStart = Utilities.getRowStart(basedoc, currentOffset + token.length() - 1);
- int lastIndent = IndentUtils.lineIndent(basedoc, lastLineStart);
- // align 1st and last row here:
- int baseIndent = indentLevel + spacesPerTab;
- // shift the rest of lines by this offset
- int indentShift = baseIndent - lastIndent;
+ if ((currentOffset >= startOffset || currentOffset + lineSizes[lno] > endOffset) && currentOffset < endOffset) {
+ tags.add(new TokenIndent(
+ false,
+ currentOffset, Math.max(0, desiredIndent)
+ ));
+ }
+ currentOffset += lineSizes[lno] + 1;
+ }
+ break;
+ }
- // how much to shift the interior of the comment
-
- for (int lno = 0; lno < lineCount; lno++) {
- // indent 1st comment line, as if it was text:
- int lineEnd = Utilities.getRowEnd(basedoc, currentOffset);
-
- int desiredIndent;
- if (lno == 0 || lno == lineCount -1) {
- desiredIndent = baseIndent;
- } else {
- desiredIndent = IndentUtils.lineIndent(basedoc, currentOffset) + indentShift;
- }
-
- if ((currentOffset >= startOffset || currentOffset + lineSizes[lno] > endOffset) && currentOffset < endOffset) {
- tags.add(new TokenIndent(
- false,
- currentOffset, Math.max(0, desiredIndent)
- ));
- }
- currentOffset += lineSizes[lno] + 1;
- }
- break;
- }
-
- case CDATA_SECTION: {
- // always form a non-empty content
- contentPresent = true;
- onlyTags = false;
- wasNewline = false;
- }
- case CHARACTER:
- case OPERATOR:
- case PI_TARGET:
- case DECLARATION:
- break; //Do nothing for above case's
- case ARGUMENT: //attribute of an element
- attributeName();
- break;
- case VALUE:
- attributeValue();
- break;
-
- case ERROR:
- case EOL:
- default:
- throw new IOException("Invalid token found in document: "
- + "Please use the text editor to resolve the issues...");
- }
- currentTokensSize += image.length();
- if (tokenId != XMLTokenId.WS && tokenId != XMLTokenId.TEXT && tokenId != XMLTokenId.PI_CONTENT) {
- // clear indicator of the newline
+ case CDATA_SECTION: {
+ // always form a non-empty content
+ contentPresent = true;
+ onlyTags = false;
wasNewline = false;
}
+ case CHARACTER:
+ case OPERATOR:
+ case PI_TARGET:
+ case DECLARATION:
+ break; //Do nothing for above case's
+ case ARGUMENT: //attribute of an element
+ attributeName();
+ break;
+ case VALUE:
+ attributeValue();
+ break;
+
+ case ERROR:
+ case EOL:
+ default:
+ throw new IOException("Invalid token found in document: "
+ + "Please use the text editor to resolve the issues...");
}
- } finally {
- basedoc.readUnlock();
+ currentTokensSize += image.length();
+ if (tokenId != XMLTokenId.WS && tokenId != XMLTokenId.TEXT && tokenId != XMLTokenId.PI_CONTENT) {
+ // clear indicator of the newline
+ wasNewline = false;
+ }
}
return tags;
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/navigator/NavigatorTreeCellRenderer.java b/xml.text/src/org/netbeans/modules/xml/text/navigator/NavigatorTreeCellRenderer.java
--- a/xml.text/src/org/netbeans/modules/xml/text/navigator/NavigatorTreeCellRenderer.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/navigator/NavigatorTreeCellRenderer.java
@@ -52,7 +52,7 @@
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreeCellRenderer;
import org.netbeans.modules.editor.structure.api.DocumentElement;
-import org.netbeans.modules.xml.text.structure.XMLDocumentModelProvider;
+import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.openide.awt.HtmlRenderer;
import org.openide.util.ImageUtilities;
import org.openide.util.Utilities;
@@ -100,14 +100,14 @@
boolean containsError = tna.getChildrenErrorCount() > 0;
//normal icons
- if(de.getType().equals(XMLDocumentModelProvider.XML_TAG)
- || de.getType().equals(XMLDocumentModelProvider.XML_EMPTY_TAG)) {
+ if(de.getType().equals(XML_TAG)
+ || de.getType().equals(XML_EMPTY_TAG)) {
setIcon(TAG_ICON, containsError);
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_PI)) {
+ } else if(de.getType().equals(XML_PI)) {
setIcon(PI_ICON, containsError);
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_DOCTYPE)) {
+ } else if(de.getType().equals(XML_DOCTYPE)) {
setIcon(DOCTYPE_ICON, containsError);
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_CDATA)) {
+ } else if(de.getType().equals(XML_CDATA)) {
setIcon(CDATA_ICON, containsError);
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/navigator/TreeNodeAdapter.java b/xml.text/src/org/netbeans/modules/xml/text/navigator/TreeNodeAdapter.java
--- a/xml.text/src/org/netbeans/modules/xml/text/navigator/TreeNodeAdapter.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/navigator/TreeNodeAdapter.java
@@ -47,21 +47,17 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
-import java.util.HashMap;
import java.util.Iterator;
import javax.swing.JTree;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
-import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.structure.api.DocumentElement;
import org.netbeans.modules.editor.structure.api.DocumentElementEvent;
import org.netbeans.modules.editor.structure.api.DocumentElementListener;
-import org.netbeans.modules.xml.text.folding.XmlFoldTypes;
-import org.netbeans.modules.xml.text.structure.XMLDocumentModelProvider;
+import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
import org.openide.ErrorManager;
/**
@@ -181,8 +177,8 @@
}
public String getText(boolean html) {
- if(de.getType().equals(XMLDocumentModelProvider.XML_TAG)
- || de.getType().equals(XMLDocumentModelProvider.XML_EMPTY_TAG)) {
+ if(de.getType().equals(XML_TAG)
+ || de.getType().equals(XML_EMPTY_TAG)) {
//XML TAG text
String attribsVisibleText = "";
AttributeSet attribs = getDocumentElement().getAttributes();
@@ -220,17 +216,17 @@
return text.toString();
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_PI)) {
+ } else if(de.getType().equals(XML_PI)) {
//PI text
String documentText = getPIText();
documentText = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;
return documentText;
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_DOCTYPE)) {
+ } else if(de.getType().equals(XML_DOCTYPE)) {
//limit the text length
String documentText = getDoctypeText();
String visibleText = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;
return visibleText;
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_CDATA)) {
+ } else if(de.getType().equals(XML_CDATA)) {
//limit the text length
String documentText = getCDATAText();
String visibleText = documentText.length() > TEXT_MAX_LEN ? documentText.substring(0,TEXT_MAX_LEN) + "..." : documentText;
@@ -241,14 +237,14 @@
}
public String getToolTipText() {
- if(de.getType().equals(XMLDocumentModelProvider.XML_TAG)
- || de.getType().equals(XMLDocumentModelProvider.XML_EMPTY_TAG)) {
+ if(de.getType().equals(XML_TAG)
+ || de.getType().equals(XML_EMPTY_TAG)) {
return getAttribsText() + " " + getDocumentContent();
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_PI)) {
+ } else if(de.getType().equals(XML_PI)) {
return getPIText();
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_DOCTYPE)) {
+ } else if(de.getType().equals(XML_DOCTYPE)) {
return getDoctypeText();
- } else if(de.getType().equals(XMLDocumentModelProvider.XML_CDATA)) {
+ } else if(de.getType().equals(XML_CDATA)) {
return getCDATAText();
}
return "";
@@ -323,15 +319,15 @@
DocumentElement ade = e.getChangedChild();
if(debug) System.out.println(">>> +EVENT called on " + hashCode() + " - " + de + ": element " + ade + " is going to be added");
- if(ade.getType().equals(XMLDocumentModelProvider.XML_CONTENT)) {
+ if(ade.getType().equals(XML_CONTENT)) {
//create a text node listener
textElements.add(new TextElementWrapper(ade));
//update text text content of the node
childTextElementChanged();
- } else if(ade.getType().equals(XMLDocumentModelProvider.XML_ERROR)) {
+ } else if(ade.getType().equals(XML_ERROR)) {
//handle error element
markNodeAsError(this);
- } else if(ade.getType().equals(XMLDocumentModelProvider.XML_COMMENT)) {
+ } else if(ade.getType().equals(XML_COMMENT)) {
//do nothing for comments
} else {
TreeNode tn = new TreeNodeAdapter(ade, tm, tree, this);
@@ -416,9 +412,9 @@
if(child.equals(de)) return index;
//skip text and error tokens
- if(!child.getType().equals(XMLDocumentModelProvider.XML_CONTENT)
- && !child.getType().equals(XMLDocumentModelProvider.XML_ERROR)
- && !child.getType().equals(XMLDocumentModelProvider.XML_COMMENT)) index++;
+ if(!child.getType().equals(XML_CONTENT)
+ && !child.getType().equals(XML_ERROR)
+ && !child.getType().equals(XML_COMMENT)) index++;
}
return -1;
}
@@ -428,7 +424,7 @@
if(debug) System.out.println(">>> -EVENT on " + hashCode() + " - " + de + ": element " + rde + " is going to be removed ");
- if(rde.getType().equals(XMLDocumentModelProvider.XML_CONTENT)) {
+ if(rde.getType().equals(XML_CONTENT)) {
if(debug) System.out.println(">>> removing CONTENT element");
//remove the text eleemnt listener
Iterator i = textElements.iterator();
@@ -440,9 +436,9 @@
textElements.removeAll(toRemove);
//update text text content of the node
childTextElementChanged();
- } else if(rde.getType().equals(XMLDocumentModelProvider.XML_ERROR)) {
+ } else if(rde.getType().equals(XML_ERROR)) {
unmarkNodeAsError(this);
- } else if(rde.getType().equals(XMLDocumentModelProvider.XML_COMMENT)) {
+ } else if(rde.getType().equals(XML_COMMENT)) {
//do nothing for comments
} else {
if(debug) System.out.println(">>> removing tag element");
@@ -494,13 +490,13 @@
boolean textElementAdded = false;
while(i.hasNext()) {
DocumentElement chde = (DocumentElement)i.next();
- if(chde.getType().equals(XMLDocumentModelProvider.XML_CONTENT)) {
+ if(chde.getType().equals(XML_CONTENT)) {
//create a text node listener
textElements.add(new TextElementWrapper(chde));
textElementAdded = true;
- } else if(chde.getType().equals(XMLDocumentModelProvider.XML_ERROR)) {
+ } else if(chde.getType().equals(XML_ERROR)) {
markNodeAsError(this);
- } else if(chde.getType().equals(XMLDocumentModelProvider.XML_COMMENT)) {
+ } else if(chde.getType().equals(XML_COMMENT)) {
//do nothing for comments
} else {
//add the adapter only when there isn't any
@@ -529,7 +525,7 @@
//System.out.println("childTextElementChanged(): " + getDocumentElement() + " has these children:");
while(children.hasNext()) {
DocumentElement del = (DocumentElement)children.next();
- if(del.getType().equals(XMLDocumentModelProvider.XML_CONTENT)) {
+ if(del.getType().equals(XML_CONTENT)) {
try {
//the endoffset if increased by +1 due to still not yet resolved issue with element boundaries
//should be removed once it is properly fixed. On the other hand the issue has no user impact now.
diff --git a/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml b/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml
--- a/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml
+++ b/xml.text/src/org/netbeans/modules/xml/text/resources/DTDEditor-preferences.xml
@@ -46,7 +46,6 @@
-
diff --git a/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml b/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml
--- a/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml
+++ b/xml.text/src/org/netbeans/modules/xml/text/resources/XMLEditor-preferences.xml
@@ -47,7 +47,6 @@
-
diff --git a/xml.text/src/org/netbeans/modules/xml/text/structure/XMLConstants.java b/xml.text/src/org/netbeans/modules/xml/text/structure/XMLConstants.java
new file mode 100644
--- /dev/null
+++ b/xml.text/src/org/netbeans/modules/xml/text/structure/XMLConstants.java
@@ -0,0 +1,58 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2016 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.xml.text.structure;
+
+/**
+ *
+ * @author sdedic
+ */
+public class XMLConstants {
+ public static final String XML_TAG = "tag";
+ public static final String XML_EMPTY_TAG = "empty_tag";
+ public static final String XML_CONTENT = "content";
+ public static final String XML_PI = "pi";
+ public static final String XML_CDATA = "cdata";
+ public static final String XML_DOCTYPE = "doctype";
+ public static final String XML_COMMENT = "comment";
+
+ public static final String XML_ERROR = "error";
+}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/structure/XMLDocumentModelProvider.java b/xml.text/src/org/netbeans/modules/xml/text/structure/XMLDocumentModelProvider.java
--- a/xml.text/src/org/netbeans/modules/xml/text/structure/XMLDocumentModelProvider.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/structure/XMLDocumentModelProvider.java
@@ -56,8 +56,10 @@
import java.util.TreeSet;
import javax.swing.text.AttributeSet;
import javax.swing.text.BadLocationException;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.TokenItem;
import org.netbeans.modules.editor.structure.api.DocumentElement;
import org.netbeans.modules.editor.structure.api.DocumentModel;
import org.netbeans.modules.editor.structure.api.DocumentModel.DocumentChange;
@@ -65,20 +67,15 @@
import org.netbeans.modules.editor.structure.api.DocumentModelException;
import org.netbeans.modules.editor.structure.api.DocumentModelUtils;
import org.netbeans.modules.editor.structure.spi.DocumentModelProvider;
-import org.netbeans.modules.xml.text.syntax.SyntaxElement;
-import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
-import org.netbeans.modules.xml.text.syntax.XMLTokenIDs;
-import org.netbeans.modules.xml.text.syntax.dom.AttrImpl;
-import org.netbeans.modules.xml.text.syntax.dom.CDATASectionImpl;
-import org.netbeans.modules.xml.text.syntax.dom.CommentImpl;
-import org.netbeans.modules.xml.text.syntax.dom.DocumentTypeImpl;
-import org.netbeans.modules.xml.text.syntax.dom.EmptyTag;
-import org.netbeans.modules.xml.text.syntax.dom.EndTag;
-import org.netbeans.modules.xml.text.syntax.dom.ProcessingInstructionImpl;
-import org.netbeans.modules.xml.text.syntax.dom.StartTag;
-import org.netbeans.modules.xml.text.syntax.dom.Tag;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.openide.ErrorManager;
+import static org.netbeans.modules.xml.text.structure.XMLConstants.*;
+import org.w3c.dom.Attr;
+import org.w3c.dom.DocumentType;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
/**
*
@@ -96,169 +93,39 @@
if(debug) System.out.println("\n\n\n\n\n");
if(debug) DocumentModelUtils.dumpElementStructure(model.getRootElement());
+ XMLSyntaxSupport sup = XMLSyntaxSupport.getSyntaxSupport(model.getDocument());
+ if (sup == null) {
+ return;
+ }
ArrayList regenerate = new ArrayList(); //used to store elements to be regenerated
for(int i = 0; i < changes.length; i++) {
DocumentChange dch = changes[i];
+ int changeOffset = dch.getChangeStart().getOffset();
+ Exception[] thrown = new Exception[1];
- int changeOffset = dch.getChangeStart().getOffset();
- int changeLength = dch.getChangeLength();
-
- //find an element in which the change happened
- DocumentElement leaf = model.getLeafElementForOffset(changeOffset);
- DocumentElement toRegenerate = leaf;
-
- if(debug) System.out.println("");
- if(debug) System.out.println(dch);
try {
- if(debug) System.out.println("inserted text:'" + model.getDocument().getText(changeOffset, changeLength) + "'");
- }catch(BadLocationException e) {
- ;
- }
- if(debug) System.out.println("leaf = " + leaf);
-
- //parse the document context
- XMLSyntaxSupport sup = (XMLSyntaxSupport)((BaseDocument)model.getDocument()).getSyntaxSupport();
-
- boolean textOnly = false;
- boolean attribsOnly = false;
- try {
- //scan the inserted text - if it contains only text set textOnly flag
- TokenItem ti = sup.getTokenChain(changeOffset, changeOffset + 1);
- while(ti != null && ti.getOffset() < (changeOffset + changeLength)) {
- if(ti.getTokenID() == XMLTokenIDs.TEXT
- || ti.getTokenID() == XMLTokenIDs.DECLARATION
- || ti.getTokenID() == XMLTokenIDs.BLOCK_COMMENT
- || ti.getTokenID() == XMLTokenIDs.PI_CONTENT
- || ti.getTokenID() == XMLTokenIDs.CDATA_SECTION) {
- textOnly = true;
- break;
+ sup.runWithSequence(changeOffset,
+ (TokenSequence s) -> {
+ try {
+ updateModelLocked(sup, regenerate, dtm, model, dch, s);
+ } catch (DocumentModelException | DocumentModelTransactionCancelledException ex) {
+ thrown[0] = ex;
+ }
+ return null;
+ }
+ );
+ if (thrown[0] != null) {
+ if (thrown[0] instanceof DocumentModelException) {
+ throw (DocumentModelException)thrown[0];
}
- if(ti.getTokenID() == XMLTokenIDs.ARGUMENT
- || ti.getTokenID() == XMLTokenIDs.OPERATOR
- || ti.getTokenID() == XMLTokenIDs.VALUE) {
- attribsOnly = true;
- break;
- }
- ti = ti.getNext();
- }
- }catch(BadLocationException e) {
- ErrorManager.getDefault().notify(ErrorManager.WARNING, e);
- }
-
- if(textOnly &&
- ( leaf.getType().equals(XML_CONTENT)
- || leaf.getType().equals(XML_DOCTYPE)
- || leaf.getType().equals(XML_PI)
- || leaf.getType().equals(XML_COMMENT)
- || leaf.getType().equals(XML_CDATA))){
- //just a text written into a text element simply fire document element change event and do not regenerate anything
- //add the element update request into transaction
- if(debug) System.out.println("ONLY CONTENT UPDATE!!!");
- dtm.updateDocumentElementText(leaf);
-
- //do not scan the context tag if the change is only insert or remove of one character into a text (typing text perf. optimalization)
- if(dch.getChangeLength() == 1) {
- continue;
- }
- }
-
- if((attribsOnly || dch.getChangeType() == DocumentChange.REMOVE)
- && (leaf.getType().equals(XML_TAG)
- || leaf.getType().equals(XML_EMPTY_TAG))) {
- if(debug) System.out.println("POSSIBLE ATTRIBS UPDATE!!!");
- //we need to parse the tag element attributes and set them according to the new values
- try {
- SyntaxElement sel = sup.getElementChain(leaf.getStartOffset() + 1);
- if(sel instanceof Tag || sel instanceof EmptyTag) {
- //test whether the attributes changed
- Map newAttrs = createAttributesMap((Tag)sel);
- AttributeSet existing = leaf.getAttributes();
- boolean update = false;
- if(existing.getAttributeCount() == newAttrs.size()) {
- Iterator itr = newAttrs.keySet().iterator();
- while (itr.hasNext()) {
- String attrName = (String) itr.next();
- String attrValue = (String)newAttrs.get(attrName);
- if(attrName != null && attrValue != null
- && !existing.containsAttribute(attrName, attrValue)) {
- update = true;
- break;
- }
-
- }
- } else update = true;
-
- if(update) {
- dtm.updateDocumentElementAttribs(leaf, newAttrs);
- }
- }
- }catch(BadLocationException ble) {
- ErrorManager.getDefault().notify(ErrorManager.WARNING, ble);
- }
- }
-
- //if one or more elements are deleted get correct paret to regenerate
- if((leaf.getStartOffset() == leaf.getEndOffset())
- || (changeOffset == leaf.getStartOffset())
- || (changeOffset == leaf.getEndOffset()))
- toRegenerate = leaf.getParentElement();
- else {
- //user written a tag or something what is not a text
- //we need to get the element's parent. Simple leaf.getParent() is not enought
- //since when an element is deleted then a wrong parent can be choosen
- if(leaf.getType().equals(XML_CONTENT)) {
- do {
- toRegenerate = toRegenerate.getParentElement();
- } while(toRegenerate != null && toRegenerate.getType().equals(XML_CONTENT));
-
- if(toRegenerate == null) {
- //no suitable parent found - the element is either a root or doesn't have any xml_tag ancestor => use root
- toRegenerate = model.getRootElement();
+ if (thrown[0] instanceof DocumentModelTransactionCancelledException) {
+ throw (DocumentModelTransactionCancelledException)thrown[0];
}
}
+ } catch (BadLocationException ex) {
}
-
- if(toRegenerate == null) toRegenerate = model.getRootElement(); //root element is empty
-
- //now regenerate all sub-elements inside parent of the affected element
-
- //check if the element is not a descendant a one of the elements
- //which are going to be regenerated
- Iterator itr = regenerate.iterator();
- boolean hasAncestor = false;
- while(itr.hasNext()) {
- DocumentElement de = (DocumentElement)itr.next();
- if(de.equals(toRegenerate) || model.isDescendantOf(de, toRegenerate)) {
- hasAncestor = true;
- break;
- }
- }
-
- if(!hasAncestor) {
- //check whether the element is not an ancestor of one or more element
- //which are going to be regenerated
- ArrayList toRemove = new ArrayList();
- Iterator i2 = regenerate.iterator();
- while(i2.hasNext()) {
- DocumentElement de = (DocumentElement)i2.next();
- if(model.isDescendantOf(toRegenerate, de)) toRemove.add(de);
- }
-
- //now really remove the elements
- regenerate.removeAll(toRemove);
-
- //add the element - it will be likely regenerated in next model update
- regenerate.add(toRegenerate);
-
- //debug>>>
- if(debug) System.out.println("===================================================================");
- if(debug) System.out.println("change happened in " + leaf);
- if(debug) System.out.println("we will regenerate its parent " + toRegenerate);
- //<< use root
+ toRegenerate = model.getRootElement();
+ }
+ }
+ }
+
+ if(toRegenerate == null) toRegenerate = model.getRootElement(); //root element is empty
+
+ //now regenerate all sub-elements inside parent of the affected element
+
+ //check if the element is not a descendant a one of the elements
+ //which are going to be regenerated
+ Iterator itr = regenerate.iterator();
+ boolean hasAncestor = false;
+ while(itr.hasNext()) {
+ DocumentElement de = (DocumentElement)itr.next();
+ if(de.equals(toRegenerate) || model.isDescendantOf(de, toRegenerate)) {
+ hasAncestor = true;
+ break;
+ }
+ }
+
+ if(!hasAncestor) {
+ //check whether the element is not an ancestor of one or more element
+ //which are going to be regenerated
+ ArrayList toRemove = new ArrayList();
+ Iterator i2 = regenerate.iterator();
+ while(i2.hasNext()) {
+ DocumentElement de = (DocumentElement)i2.next();
+ if(model.isDescendantOf(toRegenerate, de)) toRemove.add(de);
+ }
+
+ //now really remove the elements
+ regenerate.removeAll(toRemove);
+
+ //add the element - it will be likely regenerated in next model update
+ regenerate.add(toRegenerate);
+
+ //debug>>>
+ if(debug) System.out.println("===================================================================");
+ if(debug) System.out.println("change happened in " + leaf);
+ if(debug) System.out.println("we will regenerate its parent " + toRegenerate);
+ //<< elementsStack = new Stack<>(); //we need this to determine tags nesting
//the syntax element is created for token on offset - 1
//so I need to add 1 to the startOffset
@@ -294,7 +316,7 @@
//scan the document for syntax elements - from startOffset to endOffset
while(sel != null && getSyntaxElementEndOffset(sel) <= endOffset) {
- if(sel instanceof SyntaxElement.Error) {
+ if(sel.getType() == SyntaxElement.NODE_ERROR) {
//add error element into the structure
if(debug) System.out.println("Error found! => adding error element.");
String errorText = doc.getText(sel.getElementOffset(), sel.getElementLength());
@@ -313,16 +335,16 @@
from, to));
}
- if(sel instanceof StartTag) {
+ if(sup.isStartTag(sel)) {
//test if there is already an existing documet element in the model
- StartTag stag = (StartTag)sel;
- DocumentElement tagDE = DocumentModelUtils.findElement(model, sel.getElementOffset(), stag.getTagName(), XML_TAG);
+ String nn = sel.getNode().getNodeName();
+ DocumentElement tagDE = DocumentModelUtils.findElement(model, sel.getElementOffset(), nn, XML_TAG);
//do not skip the 'de' element which is to be regenerated
if(tagDE != null && !tagDE.equals(de)) {
//test if the element has also correct end tag
SyntaxElement endTagCheck = sup.getElementChain(Math.min(doc.getLength(), tagDE.getEndOffset() + 1));
- if(endTagCheck instanceof EndTag && ((EndTag)endTagCheck).getTagName().equals(stag.getTagName())) {
+ if(sup.isEndTag(endTagCheck) && endTagCheck.getNode().getNodeName().equals(nn)) {
//there is an element - skip it - analyze an element after the end of the
//existing element
if(debug) System.out.println("found existing element " + tagDE + " => skipping");
@@ -336,13 +358,14 @@
//add the tag syntax element into stack
elementsStack.push(sel);
- } else if(sel instanceof EndTag) {
+ } else if (sup.isEndTag(sel)) {
if(!elementsStack.isEmpty()) {
- StartTag latest = (StartTag)elementsStack.peek();
- if(((EndTag)sel).getTagName().equals(latest.getTagName())) {
+ SyntaxElement latest = elementsStack.peek();
+ String nn = latest.getNode().getNodeName();
+ if((sel.getNode().getNodeName().equals(nn))) {
//we have encountered a pair end tag to open tag on the peek of the stack
- Map attribs = createAttributesMap(latest);
- addedElements.add(dtm.addDocumentElement(latest.getTagName(), XML_TAG, attribs,
+ Map attribs = createAttributesMap(latest.getNode());
+ addedElements.add(dtm.addDocumentElement(nn, XML_TAG, attribs,
latest.getElementOffset(), getSyntaxElementEndOffset(sel)));
//remove the open tag syntax element from the stack
elementsStack.pop();
@@ -352,7 +375,7 @@
//I need to save the pop-ed elements for the case that there isn't
//any matching start tag found
- ArrayList savedElements = new ArrayList();
+ ArrayList savedElements = new ArrayList<>();
//this semaphore is used behind the loop to detect whether a
//matching start has been found
boolean foundStartTag = false;
@@ -361,15 +384,16 @@
SyntaxElement s = (SyntaxElement)elementsStack.pop();
savedElements.add(s);
- Tag start = (Tag)s;
- Tag end = (Tag)sel;
+ int soff = s.getElementOffset();
+ String sn = s.getNode().getNodeName();
+ String en = s.getNode().getNodeName();
- if(s instanceof StartTag && start.getTagName().equals(end.getTagName())) {
+ if(sup.isStartTag(s) && sn.equals(en)) {
//found a matching start tag
//XXX I am not sure whether this algorith is correct
- Map attribs = createAttributesMap((StartTag)s);
- addedElements.add(dtm.addDocumentElement(start.getTagName(), XML_TAG, attribs,
- start.getElementOffset(), getSyntaxElementEndOffset(end)));
+ Map attribs = createAttributesMap(s.getNode());
+ addedElements.add(dtm.addDocumentElement(sn, XML_TAG, attribs,
+ soff, getSyntaxElementEndOffset(sel)));
foundStartTag = true;
break; //break the while loop
@@ -385,49 +409,57 @@
}
}
}
- } else if(sel instanceof EmptyTag) {
- Map attribs = createAttributesMap((Tag)sel);
- addedElements.add(dtm.addDocumentElement(((EmptyTag)sel).getTagName(), XML_EMPTY_TAG, attribs,
- sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
- } else if (sel instanceof CDATASectionImpl) {
- //CDATA section
- addedElements.add(dtm.addDocumentElement("cdata", XML_CDATA, Collections.EMPTY_MAP,
- sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
- } else if (sel instanceof ProcessingInstructionImpl) {
- //PI section
- String nodeName = ((ProcessingInstructionImpl)sel).getNodeName();
- //if the nodename is not parsed, then the element is somehow broken => do not show it.
- if(nodeName != null) {
- addedElements.add(dtm.addDocumentElement(nodeName, XML_PI, Collections.EMPTY_MAP,
- sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
- }
- } else if (sel instanceof DocumentTypeImpl) {
- //document type
- String nodeName = ((DocumentTypeImpl)sel).getName();
- //if the nodename is not parsed, then the element is somehow broken => do not show it.
- if(nodeName != null) {
- addedElements.add(dtm.addDocumentElement(nodeName, XML_DOCTYPE, Collections.EMPTY_MAP,
- sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
- }
- } else if (sel instanceof CommentImpl) {
- //comment element
- //DO NOT CREATE ELEMENT FOR COMMENTS
- addedElements.add(dtm.addDocumentElement("comment", XML_COMMENT, Collections.EMPTY_MAP,
+ } else if(sup.isEmptyTag(sel)) {
+ Map attribs = createAttributesMap(sel.getNode());
+ addedElements.add(dtm.addDocumentElement(sel.getNode().getNodeName(), XML_EMPTY_TAG, attribs,
sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
} else {
- //everything else is content
- int from = sel.getElementOffset();
- // because of changeset #1d6a31161c70, all elements report end at the last char, but that is not
- // what is expected from the DocumentElement.
- int to = getSyntaxElementEndOffset(sel) + 1;
- if(from < to) {
- //Do not allow empty elements to be added:
- //Otherwise it causes problems in DocumentModel.ELEMENTS_COMPARATOR
- //(idential elements are considered as unequal (the reason why this
- //required is distinguishing elements after text deletion) and subsequently
- //the empty elements are added and removed all over again after each model
- //update which causes performance problems.
- addedElements.add(dtm.addDocumentElement("...", XML_CONTENT, Collections.EMPTY_MAP, from, to));
+ switch (sel.getType()) {
+ case Node.CDATA_SECTION_NODE:
+ addedElements.add(dtm.addDocumentElement("cdata", XML_CDATA, Collections.EMPTY_MAP,
+ sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
+ break;
+ case Node.PROCESSING_INSTRUCTION_NODE: {
+ //PI section
+ String nodeName = ((ProcessingInstruction)sel.getNode()).getNodeName();
+ //if the nodename is not parsed, then the element is somehow broken => do not show it.
+ if(nodeName != null) {
+ addedElements.add(dtm.addDocumentElement(nodeName, XML_PI, Collections.EMPTY_MAP,
+ sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
+ }
+ break;
+ }
+ case Node.DOCUMENT_TYPE_NODE: {
+ //document type
+ String nodeName = ((DocumentType)sel.getNode()).getName();
+ //if the nodename is not parsed, then the element is somehow broken => do not show it.
+ if(nodeName != null) {
+ addedElements.add(dtm.addDocumentElement(nodeName, XML_DOCTYPE, Collections.EMPTY_MAP,
+ sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
+ }
+ break;
+ }
+ case Node.COMMENT_NODE:
+ //comment element
+ //DO NOT CREATE ELEMENT FOR COMMENTS
+ addedElements.add(dtm.addDocumentElement("comment", XML_COMMENT, Collections.EMPTY_MAP,
+ sel.getElementOffset(), getSyntaxElementEndOffset(sel)));
+ break;
+ default:
+ //everything else is content
+ int from = sel.getElementOffset();
+ // because of changeset #1d6a31161c70, all elements report end at the last char, but that is not
+ // what is expected from the DocumentElement.
+ int to = getSyntaxElementEndOffset(sel) + 1;
+ if(from < to) {
+ //Do not allow empty elements to be added:
+ //Otherwise it causes problems in DocumentModel.ELEMENTS_COMPARATOR
+ //(idential elements are considered as unequal (the reason why this
+ //required is distinguishing elements after text deletion) and subsequently
+ //the empty elements are added and removed all over again after each model
+ //update which causes performance problems.
+ addedElements.add(dtm.addDocumentElement("...", XML_CONTENT, Collections.EMPTY_MAP, from, to));
+ }
}
}
//find next syntax element
@@ -499,29 +531,19 @@
return sel.getElementOffset() + sel.getElementLength() -1;
}
- private Map createAttributesMap(Tag tag) {
+ private Map createAttributesMap(Node tag) {
if(tag.getAttributes().getLength() == 0) {
return Collections.EMPTY_MAP;
} else {
HashMap map = new LinkedHashMap(tag.getAttributes().getLength());
for(int i = 0; i < tag.getAttributes().getLength(); i++) {
- AttrImpl attr = (AttrImpl)tag.getAttributes().item(i);
+ Attr attr = (Attr)tag.getAttributes().item(i);
map.put(attr.getName(), attr.getValue());
}
return map;
}
}
- public static final String XML_TAG = "tag";
- public static final String XML_EMPTY_TAG = "empty_tag";
- public static final String XML_CONTENT = "content";
- public static final String XML_PI = "pi";
- public static final String XML_CDATA = "cdata";
- public static final String XML_DOCTYPE = "doctype";
- public static final String XML_COMMENT = "comment";
-
- public static final String XML_ERROR = "error";
-
private static final boolean debug = Boolean.getBoolean("org.netbeans.modules.xml.text.structure.debug");
private static final boolean measure = Boolean.getBoolean("org.netbeans.modules.xml.text.structure.measure");
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/DTDKit.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/DTDKit.java
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/DTDKit.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/DTDKit.java
@@ -44,7 +44,10 @@
package org.netbeans.modules.xml.text.syntax;
import javax.swing.text.Document;
+import org.netbeans.api.editor.mimelookup.MimeLookup;
+import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.editor.Syntax;
+import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
import org.netbeans.modules.xml.text.syntax.javacc.lib.*;
import org.netbeans.modules.xml.text.syntax.javacc.*;
@@ -70,19 +73,8 @@
*/
public static final String MIME_TYPE = "application/xml-dtd"; // NOI18N
- /** Create new instance of syntax coloring parser */
- @Override
- public Syntax createSyntax(Document doc) {
- return new JJEditorSyntax(
- new DTDSyntaxTokenManager(null).new Bridge(),
- new DTDSyntaxTokenMapper(),
- DTDTokenContext.contextPath
- );
- }
-
@Override
public String getContentType() {
return MIME_TYPE;
}
-
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/ENTKit.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/ENTKit.java
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/ENTKit.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/ENTKit.java
@@ -42,11 +42,6 @@
package org.netbeans.modules.xml.text.syntax;
-import javax.swing.text.Document;
-import org.netbeans.editor.BaseDocument;
-import org.netbeans.editor.Syntax;
-import org.netbeans.editor.SyntaxSupport;
-
/**
*
* @author samaresh
@@ -61,21 +56,8 @@
*/
public static final String MIME_TYPE = "text/xml-external-parsed-entity"; // NOI18N
- /** Create new instance of syntax coloring parser */
- @Override
- public Syntax createSyntax(Document doc) {
- return new XMLDefaultSyntax();
- }
-
@Override
public String getContentType() {
return MIME_TYPE;
}
-
- /** Create syntax support */
- @Override
- public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
- return new XMLSyntaxSupport(doc);
- }
-
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/UniKit.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/UniKit.java
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/UniKit.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/UniKit.java
@@ -47,9 +47,14 @@
import javax.swing.text.Document;
import javax.swing.text.BadLocationException;
+import org.netbeans.api.editor.mimelookup.MimeLookup;
+import org.netbeans.editor.BaseDocument;
+import org.netbeans.editor.Syntax;
+import org.netbeans.editor.SyntaxSupport;
import org.netbeans.modules.editor.NbEditorKit;
import org.netbeans.modules.xml.api.EncodingUtil;
+import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
/**
* Editor kit implementation for xml content type.
@@ -112,4 +117,25 @@
super.write(out, doc, pos, len);
}
+ @Override
+ public Syntax createSyntax(Document doc) {
+ Syntax syn = null;
+ LegacySyntaxBridge bridge = MimeLookup.getLookup(getContentType()).lookup(LegacySyntaxBridge.class);
+ if (bridge != null) {
+ syn = bridge.createSyntax(this, doc, getContentType());
+ }
+ return syn != null ? syn : super.createSyntax(doc);
+ }
+
+ /** Create syntax support */
+ @Override
+ public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
+ SyntaxSupport syn = null;
+ LegacySyntaxBridge bridge = MimeLookup.getLookup(getContentType()).lookup(LegacySyntaxBridge.class);
+ if (bridge != null) {
+ syn = bridge.createSyntaxSupport(this, doc, getContentType());
+ }
+ return syn != null ? syn : super.createSyntaxSupport(doc);
+ }
+
}
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java
--- a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java
@@ -54,6 +54,7 @@
import javax.swing.text.JTextComponent;
import javax.swing.text.BadLocationException;
import javax.swing.*;
+import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.lexer.Language;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.openide.awt.StatusDisplayer;
@@ -65,6 +66,8 @@
import org.netbeans.modules.xml.text.XmlCommentHandler;
import org.netbeans.modules.xml.text.completion.NodeSelector;
+import static org.netbeans.modules.xml.text.syntax.DTDKit.MIME_TYPE;
+import org.netbeans.modules.xml.text.syntax.bridge.LegacySyntaxBridge;
/**
@@ -106,7 +109,12 @@
/** Create new instance of syntax coloring parser */
@Override
public Syntax createSyntax(Document doc) {
- return new XMLDefaultSyntax();
+ Syntax syn = null;
+ LegacySyntaxBridge bridge = MimeLookup.getLookup(MIME_TYPE).lookup(LegacySyntaxBridge.class);
+ if (bridge != null) {
+ syn = bridge.createSyntax(this, doc, MIME_TYPE);
+ }
+ return syn != null ? syn : super.createSyntax(doc);
}
@Override
@@ -120,11 +128,15 @@
}
}
-
/** Create syntax support */
@Override
public SyntaxSupport createSyntaxSupport(BaseDocument doc) {
- return new XMLSyntaxSupport(doc);
+ SyntaxSupport syn = null;
+ LegacySyntaxBridge bridge = MimeLookup.getLookup(MIME_TYPE).lookup(LegacySyntaxBridge.class);
+ if (bridge != null) {
+ syn = bridge.createSyntaxSupport(this, doc, MIME_TYPE);
+ }
+ return syn != null ? syn : super.createSyntaxSupport(doc);
}
@Override
diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/bridge/LegacySyntaxBridge.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/bridge/LegacySyntaxBridge.java
new file mode 100644
--- /dev/null
+++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/bridge/LegacySyntaxBridge.java
@@ -0,0 +1,59 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2016 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2016 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.xml.text.syntax.bridge;
+
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import org.netbeans.editor.Syntax;
+import org.netbeans.editor.SyntaxSupport;
+
+/**
+ * Transitional interface, which keeps old Syntax-related classes in a
+ * obsolete/deprecated module. Not intended to be implemented by regular clients.
+ * Implementations should be registered in MIME Lookup for the particular MIME type.
+ *
+ * @author sdedic
+ */
+public interface LegacySyntaxBridge {
+ public Syntax createSyntax(EditorKit host, Document doc, String mimeType);
+ public SyntaxSupport createSyntaxSupport(EditorKit host, Document doc, String mimeType);
+}
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/AbstractTestCase.java
@@ -52,13 +52,13 @@
import org.netbeans.api.lexer.Language;
import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.BaseDocument;
-import org.netbeans.modules.xml.text.syntax.XMLSyntaxSupport;
+import org.netbeans.junit.NbTestCase;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import org.netbeans.modules.xml.xam.ModelSource;
import org.netbeans.modules.xml.xdm.XDMModel;
import org.netbeans.modules.xml.xdm.diff.DefaultElementIdentity;
import org.netbeans.modules.xml.xdm.diff.DiffFinder;
import org.netbeans.modules.xml.xdm.diff.Difference;
-import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
@@ -67,7 +67,7 @@
* Various tests include, sanity, regression, performance etc.
* @author Samaresh (samaresh.panda@sun.com)
*/
-public class AbstractTestCase extends TestCase {
+public class AbstractTestCase extends NbTestCase {
public AbstractTestCase(String testName) {
super(testName);
@@ -131,7 +131,7 @@
BaseDocument doc = getResourceAsDocument(path);
//must set the language inside unit tests
doc.putProperty(Language.class, XMLTokenId.language());
- return ((XMLSyntaxSupport)doc.getSyntaxSupport());
+ return XMLSyntaxSupport.getSyntaxSupport(doc);
}
/**
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/dom/XMLSyntaxSupportTest.java
@@ -42,11 +42,13 @@
package org.netbeans.modules.xml.text.dom;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.netbeans.api.lexer.Token;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.xml.text.AbstractTestCase;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
/**
*
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/indent/XMLLexerFormatterTest.java
@@ -43,6 +43,7 @@
import org.netbeans.modules.xml.text.AbstractTestCase;
import junit.framework.*;
+import org.netbeans.api.editor.document.LineDocument;
import org.netbeans.editor.BaseDocument;
/**
@@ -81,23 +82,23 @@
* with a document that represents expected outcome.
*/
public void testFormat() throws Exception {
- BaseDocument inputDoc = getDocument("indent/input.xml");
+ LineDocument inputDoc = getDocument("indent/input.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatSubsection() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_sub.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 72, 97);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 72, 97);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_sub.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_sub.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
// #139160
@@ -105,10 +106,10 @@
BaseDocument inputDoc = getDocument("indent/input2.xsd");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output2.xsd");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output2.xsd");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatPerformance() throws Exception {
@@ -134,20 +135,20 @@
BaseDocument inputDoc = getDocument("indent/input_sub1.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 46, 74);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 46, 74);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_sub1.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_sub1.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatSubsection2() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_sub2.xml");
//format a subsection of the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 63, 80);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 63, 80);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_sub2.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_sub2.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
// #170343
@@ -155,10 +156,10 @@
BaseDocument inputDoc = getDocument("indent/input_preserve.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_preserve.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_preserve.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
// #170343
@@ -166,10 +167,10 @@
BaseDocument inputDoc = getDocument("indent/input_withpreserve.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_withpreserve.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_withpreserve.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
// #170343
@@ -178,10 +179,10 @@
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
System.out.println("SECTION:" + inputDoc.getText(91, 87));
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 91, 91 + 87);
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 91, 91 + 87);
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_preserve.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_preserve.xml");
+ assertTrue(compare(formattedDoc, outputDoc));
}
@@ -189,30 +190,30 @@
BaseDocument inputDoc = getDocument("indent/input_contentIndent.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_contentIndent.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_contentIndent.xml");
+ assertTrue(compare(formattedDoc, outputDoc));
}
public void testFormat_AttrsIndent() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_attrsIndent.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_attrsIndent.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_attrsIndent.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormat_ProcessingIndent() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_processingXml.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_processingXml.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_processingXml.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
@@ -220,49 +221,49 @@
BaseDocument inputDoc = getDocument("indent/input_nestedSame.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_nestedSame.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_nestedSame.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatWithCdataContent217342() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_cdataContent.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_cdataContent.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_cdataContent.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatBreaksMixedContent216986() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_breaksMixedContent.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_breaksMixedContent.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_breaksMixedContent.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatNewlinesInTags217995() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_newlineInTags.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_newlineInTags.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_newlineInTags.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
public void testFormatTagAtLineStartAfterContent238985() throws Exception {
BaseDocument inputDoc = getDocument("indent/input_tagAtStatOfLine.xml");
//format the inputDoc
XMLLexerFormatter formatter = new XMLLexerFormatter(null);
- BaseDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
+ LineDocument formattedDoc = formatter.doReformat(inputDoc, 0, inputDoc.getLength());
System.out.println(formattedDoc.getText(0, formattedDoc.getLength()));
- BaseDocument outputDoc = getDocument("indent/output_tagAtStatOfLine.xml");
- assert (compare(formattedDoc, outputDoc));
+ LineDocument outputDoc = getDocument("indent/output_tagAtStatOfLine.xml");
+ assertTrue (compare(formattedDoc, outputDoc));
}
}
diff --git a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java
--- a/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java
+++ b/xml.text/test/unit/src/org/netbeans/modules/xml/text/syntax/XMLSyntaxSupportTest.java
@@ -44,8 +44,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.xml.lexer.XMLTokenId;
import org.netbeans.editor.TokenItem;
import org.netbeans.modules.xml.text.AbstractTestCase;
+import org.netbeans.modules.xml.text.api.dom.XMLSyntaxSupport;
+import org.netbeans.modules.xml.text.api.dom.SyntaxElement;
/**
*
@@ -85,11 +89,11 @@
public void testTokens() throws Exception {
XMLSyntaxSupport support = getSyntaxSupport("syntax/test.xml");
- TokenItem token = support.getPreviousToken(30);
- System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());
+ Token token = support.getPreviousToken(30);
+ System.out.println("Token: " + token.id().name() + " Text: " + token.text());
token = support.getPreviousToken(31);
- System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());
+ System.out.println("Token: " + token.id().name() + " Text: " + token.text());
token = support.getPreviousToken(32);
- System.out.println("Token: " + token.getTokenID().getName() + " Text: " + token.getImage());
+ System.out.println("Token: " + token.id().name() + " Text: " + token.text());
}
}
diff --git a/xml/manifest.mf b/xml/manifest.mf
--- a/xml/manifest.mf
+++ b/xml/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Install: org/netbeans/modules/xml/CoreModuleInstall.class
OpenIDE-Module-Layer: org/netbeans/modules/xml/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
diff --git a/xml/nbproject/project.xml b/xml/nbproject/project.xml
--- a/xml/nbproject/project.xml
+++ b/xml/nbproject/project.xml
@@ -170,7 +170,7 @@
2
- 1.16
+ 1.60