diff --git a/xml/xml-psi-impl/src/com/intellij/embedding/EmbeddedLazyParseableElementType.java b/xml/xml-psi-impl/src/com/intellij/embedding/EmbeddedLazyParseableElementType.java
index 83900d41e32c..05994a94de97 100644
--- a/xml/xml-psi-impl/src/com/intellij/embedding/EmbeddedLazyParseableElementType.java
+++ b/xml/xml-psi-impl/src/com/intellij/embedding/EmbeddedLazyParseableElementType.java
@@ -62,9 +62,9 @@ public class EmbeddedLazyParseableElementType extends ILazyParseableElementType
 
   public PsiBuilder getBuilder(ASTNode chameleon, Project project, ParserDefinition parserDefinition, Lexer lexer) {
     final PsiBuilder builder;
-    if (lexer instanceof ForeignTokenClassifierLexer) {
+    if (lexer instanceof MasqueradingLexer) {
       builder =
-        new MasqueradingPsiBuilderAdapter(project, parserDefinition, ((ForeignTokenClassifierLexer)lexer), chameleon, chameleon.getChars());
+        new MasqueradingPsiBuilderAdapter(project, parserDefinition, ((MasqueradingLexer)lexer), chameleon, chameleon.getChars());
     }
     else {
       builder = new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, chameleon.getChars());
diff --git a/xml/xml-psi-impl/src/com/intellij/embedding/IndentEatingLexer.java b/xml/xml-psi-impl/src/com/intellij/embedding/IndentEatingLexer.java
index 37c789bd8c71..e428a55630c4 100644
--- a/xml/xml-psi-impl/src/com/intellij/embedding/IndentEatingLexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/embedding/IndentEatingLexer.java
@@ -23,12 +23,32 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class IndentEatingLexer extends ForeignTokenClassifierLexer {
+public class IndentEatingLexer extends MasqueradingLexer {
   public IndentEatingLexer(@NotNull Lexer delegate, int baseIndent) {
     super(new MyLexer(delegate, baseIndent));
   }
 
+
+  @Nullable
   @Override
+  public IElementType getMasqueTokenType() {
+    if (isForeignToken()) {
+      return null;
+    }
+
+    return getTokenType();
+  }
+
+  @Nullable
+  @Override
+  public String getMasqueTokenText() {
+    if (getMasqueTokenType() == null) {
+      return null;
+    }
+
+    return getTokenText();
+  }
+
   public boolean isForeignToken() {
     return myDelegate.getTokenType() == TokenType.DUMMY_HOLDER;
   }
diff --git a/xml/xml-psi-impl/src/com/intellij/embedding/ForeignTokenClassifierLexer.java b/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingLexer.java
similarity index 75%
rename from xml/xml-psi-impl/src/com/intellij/embedding/ForeignTokenClassifierLexer.java
rename to xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingLexer.java
index 20e91e3aea45..362867a2c5cd 100644
--- a/xml/xml-psi-impl/src/com/intellij/embedding/ForeignTokenClassifierLexer.java
+++ b/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingLexer.java
@@ -17,19 +17,25 @@ package com.intellij.embedding;
 
 import com.intellij.lexer.DelegateLexer;
 import com.intellij.lexer.Lexer;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A lexer which additionally providers information concerning whether a token
  * should be used in parsing (and be exposed to a parser) or be hidden to parser
  * @see com.intellij.embedding.MasqueradingPsiBuilderAdapter
  */
-public abstract class ForeignTokenClassifierLexer extends DelegateLexer {
+public abstract class MasqueradingLexer extends DelegateLexer {
 
-  public ForeignTokenClassifierLexer(@NotNull Lexer delegate) {
+  public MasqueradingLexer(@NotNull Lexer delegate) {
     super(delegate);
   }
 
-  public abstract boolean isForeignToken();
+  @Nullable
+  public abstract IElementType getMasqueTokenType();
+
+  @Nullable
+  public abstract String getMasqueTokenText();
 
 }
diff --git a/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java b/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java
index b943c346b3c4..885e2bfde7a4 100644
--- a/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java
+++ b/xml/xml-psi-impl/src/com/intellij/embedding/MasqueradingPsiBuilderAdapter.java
@@ -28,9 +28,9 @@ import java.util.List;
 import java.util.logging.Logger;
 
 /**
- * A delegate PsiBuilder that hides some tokens (namely, the ones provided by {@link com.intellij.embedding.ForeignTokenClassifierLexer})
- * from a parser, however, _still inserting_ them into a production tree.
- * @see com.intellij.embedding.ForeignTokenClassifierLexer
+ * A delegate PsiBuilder that hides or substitutes some tokens (namely, the ones provided by {@link MasqueradingLexer})
+ * from a parser, however, _still inserting_ them into a production tree in their initial appearance.
+ * @see MasqueradingLexer
  */
 public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
 
@@ -42,7 +42,7 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
 
   public MasqueradingPsiBuilderAdapter(@NotNull final Project project,
                         @NotNull final ParserDefinition parserDefinition,
-                        @NotNull final ForeignTokenClassifierLexer lexer,
+                        @NotNull final MasqueradingLexer lexer,
                         @NotNull final ASTNode chameleon,
                         @NotNull final CharSequence text) {
     super(new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, text));
@@ -52,7 +52,7 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
 
   public MasqueradingPsiBuilderAdapter(@NotNull final Project project,
                         @NotNull final ParserDefinition parserDefinition,
-                        @NotNull final ForeignTokenClassifierLexer lexer,
+                        @NotNull final MasqueradingLexer lexer,
                         @NotNull final LighterLazyParseableNode chameleon,
                         @NotNull final CharSequence text) {
     super(new PsiBuilderImpl(project, parserDefinition, lexer, chameleon, text));
@@ -152,43 +152,43 @@ public class MasqueradingPsiBuilderAdapter extends PsiBuilderAdapter {
 
   protected void initShrunkSequence() {
     final PsiBuilderImpl delegate = (PsiBuilderImpl)getDelegate();
-    final ForeignTokenClassifierLexer lexer = (ForeignTokenClassifierLexer)delegate.getLexer();
+    final MasqueradingLexer lexer = (MasqueradingLexer)delegate.getLexer();
 
-    initTokenList(lexer);
-    initCharSequence();
+    initTokenListAndCharSequence(lexer);
     myLexPosition = 0;
     synchronizePositions();
   }
 
-  private void initTokenList(ForeignTokenClassifierLexer lexer) {
+  private void initTokenListAndCharSequence(MasqueradingLexer lexer) {
     lexer.start(getDelegate().getOriginalText());
     myShrunkSequence = new ArrayList<MyShiftedToken>();
+    StringBuilder charSequenceBuilder = new StringBuilder();
 
     int realPos = 0;
     int shrunkPos = 0;
-    IElementType currentTokenType;
-    while ((currentTokenType = lexer.getTokenType()) != null) {
-      final boolean isForeign = lexer.isForeignToken();
+    IElementType realTokenType;
+    while ((realTokenType = lexer.getTokenType()) != null) {
+      final IElementType masqueTokenType = lexer.getMasqueTokenType();
+      final String masqueTokenText = lexer.getMasqueTokenText();
 
-      final int tokenLength = lexer.getTokenEnd() - lexer.getTokenStart();
-      if (!isForeign) {
-        myShrunkSequence.add(new MyShiftedToken(currentTokenType,
-                                                realPos, realPos + tokenLength,
-                                                shrunkPos, shrunkPos + tokenLength));
-        shrunkPos += tokenLength;
+      final int realLength = lexer.getTokenEnd() - lexer.getTokenStart();
+      if (masqueTokenType != null) {
+        assert masqueTokenText != null;
+
+        final int masqueLength = masqueTokenText.length();
+        myShrunkSequence.add(new MyShiftedToken(realTokenType,
+                                                realPos, realPos + realLength,
+                                                shrunkPos, shrunkPos + masqueLength));
+        charSequenceBuilder.append(masqueTokenText);
+
+        shrunkPos += masqueLength;
       }
-      realPos += tokenLength;
+      realPos += realLength;
 
       lexer.advance();
     }
-  }
 
-  private void initCharSequence() {
-    StringBuilder sb = new StringBuilder();
-    for (MyShiftedToken token : myShrunkSequence) {
-      sb.append(getDelegate().getOriginalText().subSequence(token.realStart, token.realEnd));
-    }
-    myShrunkCharSequence = sb.toString();
+    myShrunkCharSequence = charSequenceBuilder.toString();
   }
 
   @SuppressWarnings({"StringConcatenationInsideStringBufferAppend", "UnusedDeclaration"})