Merge branch 'master' of git.labs.intellij.net:idea/community

This commit is contained in:
Kirill.Safonov
2010-01-17 09:23:17 +03:00
@@ -59,7 +59,7 @@ public abstract class TemplateLanguageFormattingModelBuilder implements Delegati
return createDummyBlock(node);
}
if (builder == null) {
return createTemplateLanguageBlock(node, Collections.<DataLanguageBlockWrapper>emptyList(), null);
return createTemplateLanguageBlock(node, Collections.<DataLanguageBlockWrapper>emptyList(), settings);
}
final FormattingModel model = builder.createModel(viewProvider.getPsi(dataLanguage), settings);
List<DataLanguageBlockWrapper> childWrappers = buildChildWrappers(model.getRootBlock());