diff --git a/platform/core-impl/src/com/intellij/lang/LanguageTokenSeparatorGenerators.java b/platform/core-impl/src/com/intellij/lang/LanguageTokenSeparatorGenerators.java
index 843924443d7d..9ca24d61e568 100644
--- a/platform/core-impl/src/com/intellij/lang/LanguageTokenSeparatorGenerators.java
+++ b/platform/core-impl/src/com/intellij/lang/LanguageTokenSeparatorGenerators.java
@@ -31,6 +31,10 @@ public class LanguageTokenSeparatorGenerators extends LanguageExtension<TokenSep
       @Override
       public ASTNode generateWhitespaceBetweenTokens(ASTNode left, ASTNode right) {
         Language l = PsiUtilCore.getNotAnyLanguage(left);
+        Language rightLang = PsiUtilCore.getNotAnyLanguage(right);
+        if (rightLang.isKindOf(l)) {
+          l = rightLang; // get more precise lexer
+        }
         final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(l);
         if (parserDefinition != null) {
           PsiManager manager = right.getTreeParent().getPsi().getManager();