From ec64e6b3dd9e133ed985274261612bcfa53175a4 Mon Sep 17 00:00:00 2001 From: "no_reply@jetbrains.com" Date: Tue, 18 Jan 2005 14:52:03 +0300 Subject: [PATCH] new jspx parsing schema --- .../intellij/psi/impl/source/jsp/jspJava/JspText.java | 10 +++++++++- source/com/intellij/psi/impl/source/tree/Factory.java | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/source/com/intellij/psi/impl/source/jsp/jspJava/JspText.java b/source/com/intellij/psi/impl/source/jsp/jspJava/JspText.java index 20f8e6c7d486..8b99cd232ec5 100644 --- a/source/com/intellij/psi/impl/source/jsp/jspJava/JspText.java +++ b/source/com/intellij/psi/impl/source/jsp/jspJava/JspText.java @@ -2,11 +2,15 @@ package com.intellij.psi.impl.source.jsp.jspJava; import com.intellij.psi.impl.source.tree.JspElementType; import com.intellij.psi.impl.source.tree.LeafPsiElement; +import com.intellij.psi.xml.XmlText; import com.intellij.util.CharTable; public class JspText extends LeafPsiElement { - public JspText(char[] buffer, int start, int end, CharTable table) { + private final XmlText myFollowingText; + + public JspText(XmlText text, char[] buffer, int start, int end, CharTable table) { super(JspElementType.HOLDER_TEMPLATE_DATA, buffer, start, end, -1, table); + myFollowingText = text; } public String toString() { @@ -16,4 +20,8 @@ public class JspText extends LeafPsiElement { public void setText(String text) { super.setText(text); } + + public XmlText getFollowingText() { + return myFollowingText; + } } diff --git a/source/com/intellij/psi/impl/source/tree/Factory.java b/source/com/intellij/psi/impl/source/tree/Factory.java index 238ab8e606e1..2e35dce1f4ad 100644 --- a/source/com/intellij/psi/impl/source/tree/Factory.java +++ b/source/com/intellij/psi/impl/source/tree/Factory.java @@ -9,8 +9,8 @@ import com.intellij.psi.impl.source.html.HtmlDocumentImpl; import com.intellij.psi.impl.source.html.HtmlTagImpl; import com.intellij.psi.impl.source.javadoc.*; import com.intellij.psi.impl.source.jsp.*; -import com.intellij.psi.impl.source.jsp.jspJava.JspTemplateStatement; import com.intellij.psi.impl.source.jsp.jspJava.JspText; +import com.intellij.psi.impl.source.jsp.jspJava.JspTemplateStatement; import com.intellij.psi.impl.source.tree.java.*; import com.intellij.psi.impl.source.xml.*; import com.intellij.psi.jsp.JspTokenType; @@ -126,7 +126,7 @@ public class Factory implements Constants { element = new JspDeclarationChameleonElement(type, buffer, startOffset, endOffset, lexerState, table); } else if (type == JspElementType.HOLDER_TEMPLATE_DATA) { - element = new JspText(buffer, startOffset, endOffset, table); + element = new JspText(null, buffer, startOffset, endOffset, table); } else { if (KEYWORD_BIT_SET.isInSet(type)) {