From c8fb4201489ee1491f66c429021489345093e63e Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Thu, 13 Feb 2014 17:41:27 +0400 Subject: [PATCH] fix negative offset when injection is contained in parent --- .../psi/formatter/common/InjectedLanguageBlockBuilder.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java index 90046df5e08f..fda86576377b 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/InjectedLanguageBlockBuilder.java @@ -107,11 +107,12 @@ public abstract class InjectedLanguageBlockBuilder { } } }; - InjectedLanguageUtil.enumerate(injectionHost.getPsi(), injectedPsiVisitor); + final PsiElement injectionHostPsi = injectionHost.getPsi(); + InjectedLanguageUtil.enumerate(injectionHostPsi, injectionHostPsi.getContainingFile(), false, injectedPsiVisitor); if (injectedFile[0] != null) { final Language childLanguage = injectedFile[0].getLanguage(); - final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(childLanguage, injectionHost.getPsi()); + final FormattingModelBuilder builder = LanguageFormatting.INSTANCE.forContext(childLanguage, injectionHostPsi); if (builder != null) { final int startOffset = injectedRangeInsideHost.get().getStartOffset();