Attachment #129537 for bug #223895

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 223895
Collapse All | Expand All

Lines 193-198 Link Here

(-)a/javascript2.editor/src/org/netbeans/modules/javascript2/editor/embedding/JsEmbeddingProvider.java (+1 lines)
193	* @param tokenSequence The token sequence for the RHTML code	193	* @param tokenSequence The token sequence for the RHTML code
194	*/	194	*/
195	public List<Embedding> translate(Snapshot snapshot) {	195	public List<Embedding> translate(Snapshot snapshot) {
		196
196	TokenHierarchy<?> th = snapshot.getTokenHierarchy();	197	TokenHierarchy<?> th = snapshot.getTokenHierarchy();
197	if (th == null) {	198	if (th == null) {
198	//the token hierarchy may be null if the language is not initialized yet	199	//the token hierarchy may be null if the language is not initialized yet

Lines 52-58 Link Here

(-)a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJspServlet.java (-3 / +13 lines)
52	import java.util.Collections;	52	import java.util.Collections;
53	import java.util.LinkedList;	53	import java.util.LinkedList;
54	import java.util.List;	54	import java.util.List;
		55	import java.util.Map;
55	import java.util.logging.Level;	56	import java.util.logging.Level;
		57	import java.util.logging.Logger;
56	import javax.swing.SwingUtilities;	58	import javax.swing.SwingUtilities;
57	import javax.swing.text.BadLocationException;	59	import javax.swing.text.BadLocationException;
58	import javax.swing.text.Document;	60	import javax.swing.text.Document;
Lines 78-85 Link Here
78	import org.openide.loaders.DataObjectNotFoundException;	80	import org.openide.loaders.DataObjectNotFoundException;
79	import org.openide.util.NbBundle;	81	import org.openide.util.NbBundle;
80	import static org.netbeans.api.jsp.lexer.JspTokenId.JavaCodeType;	82	import static org.netbeans.api.jsp.lexer.JspTokenId.JavaCodeType;
		83	import org.netbeans.api.lexer.InputAttributes;
81	import org.netbeans.lib.editor.util.CharSequenceUtilities;	84	import org.netbeans.lib.editor.util.CharSequenceUtilities;
82	import org.netbeans.modules.csl.spi.GsfUtilities;	85	import org.netbeans.modules.csl.spi.GsfUtilities;
		86	import org.netbeans.modules.web.core.api.JspColoringData;
		87	import org.netbeans.spi.jsp.lexer.JspParseData;
83		88
84	/**	89	/**
85	* Utility class for generating a simplified <em>JSP servlet</em> class from a JSP file.	90	* Utility class for generating a simplified <em>JSP servlet</em> class from a JSP file.
Lines 181-189 Link Here
181		186
182	processIncludes();	187	processIncludes();
183		188
184	//XXX The InputAttribute from the document are not copied to the following TokenHierarchy,	189	InputAttributes inputAttributes = new InputAttributes();
185	//the JspLexer behaviour may seem to be inaccurate in some cases!	190	JspColoringData jspColoringData = JspUtils.getJSPColoringData(snapshot.getSource().getFileObject());
186	TokenHierarchy<CharSequence> tokenHierarchy = TokenHierarchy.create(charSequence, JspTokenId.language());	191	if (jspColoringData != null) {
		192	JspParseData jspParseData = new JspParseData((Map<String, String>) jspColoringData.getPrefixMapper(),
		193	jspColoringData.isELIgnored(), jspColoringData.isXMLSyntax(), jspColoringData.isInitialized());
		194	inputAttributes.setValue(JspTokenId.language(), JspParseData.class, jspParseData, false);
		195	}
		196	TokenHierarchy<CharSequence> tokenHierarchy = TokenHierarchy.create(charSequence, false, JspTokenId.language(), null, inputAttributes);
187		197
188	TokenSequence<JspTokenId> tokenSequence = tokenHierarchy.tokenSequence(JspTokenId.language()); //get top level token sequence	198	TokenSequence<JspTokenId> tokenSequence = tokenHierarchy.tokenSequence(JspTokenId.language()); //get top level token sequence
189	if (!tokenSequence.moveNext()) {	199	if (!tokenSequence.moveNext()) {




import org.netbeans.api.lexer.TokenSequence;
import org.netbeans.lib.editor.util.CharSequenceUtilities;
import org.netbeans.modules.parsing.api.Snapshot;
import org.netbeans.modules.web.core.syntax.JspUtils;

/**
 * Simple plain JSP syntax analyzer.


    public static Result parse(Snapshot snapshot) {
        CharSequence sourceCode = snapshot.getText();
        JspSyntaxParser instance = new JspSyntaxParser(sourceCode, snapshot);
        List<JspSyntaxElement> elements = instance.parseDocument();
        return new Result(sourceCode, elements);
    }

    public JspSyntaxParser(CharSequence source) {
        this.source = source;
        this.hi = TokenHierarchy.create(source, JspTokenId.language());
    }
    
    public JspSyntaxParser(CharSequence source, Snapshot snapshot) {
        this.source = source;
        this.hi = JspUtils.createJspTokenHierarchy(snapshot);
    }

    //---------------------------- private methods -----------------------------

Return to bug 223895

Lines 51-56 Link Here

(-)a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/parser/JspSyntaxParser.java (-4 / +6 lines)
51	import org.netbeans.api.lexer.TokenSequence;	51	import org.netbeans.api.lexer.TokenSequence;
52	import org.netbeans.lib.editor.util.CharSequenceUtilities;	52	import org.netbeans.lib.editor.util.CharSequenceUtilities;
53	import org.netbeans.modules.parsing.api.Snapshot;	53	import org.netbeans.modules.parsing.api.Snapshot;
		54	import org.netbeans.modules.web.core.syntax.JspUtils;
54		55
55	/**	56	/**
56	* Simple plain JSP syntax analyzer.	57	* Simple plain JSP syntax analyzer.
Lines 76-93 Link Here
76		77
77	public static Result parse(Snapshot snapshot) {	78	public static Result parse(Snapshot snapshot) {
78	CharSequence sourceCode = snapshot.getText();	79	CharSequence sourceCode = snapshot.getText();
79	JspSyntaxParser instance = new JspSyntaxParser(sourceCode, snapshot.getTokenHierarchy());	80	JspSyntaxParser instance = new JspSyntaxParser(sourceCode, snapshot);
80	List<JspSyntaxElement> elements = instance.parseDocument();	81	List<JspSyntaxElement> elements = instance.parseDocument();
81	return new Result(sourceCode, elements);	82	return new Result(sourceCode, elements);
82	}	83	}
83		84
84	public JspSyntaxParser(CharSequence source) {	85	public JspSyntaxParser(CharSequence source) {
85	this(source, TokenHierarchy.create(source, JspTokenId.language()));	86	this.source = source;
		87	this.hi = TokenHierarchy.create(source, JspTokenId.language());
86	}	88	}
87		89
88	public JspSyntaxParser(CharSequence source, TokenHierarchy<?> hierarchy) {	90	public JspSyntaxParser(CharSequence source, Snapshot snapshot) {
89	this.source = source;	91	this.source = source;
90	this.hi = hierarchy;	92	this.hi = JspUtils.createJspTokenHierarchy(snapshot);
91	}	93	}
92		94
93	//---------------------------- private methods -----------------------------	95	//---------------------------- private methods -----------------------------