Skip to content

Commit 90fc5e4

Browse files
committed
Formatting exception when using ".if" live template in JSFile with injected GraphQL (#26)
(cherry picked from commit 27a996a)
1 parent c836fe3 commit 90fc5e4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/com/intellij/lang/jsgraphql/ide/formatter/JSGraphQLInjectedFormattingModelBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public class JSGraphQLInjectedFormattingModelBuilder implements CustomFormatting
3131
@NotNull
3232
@Override
3333
public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) {
34-
if(element instanceof JSFile) {
35-
final JSFile file = (JSFile)element;
34+
if(element instanceof JSFile || element.getContainingFile() instanceof JSFile) {
35+
final JSFile file = (JSFile)(element instanceof JSFile ? element : element.getContainingFile());
3636
file.putUserData(WANT_DEFAULT_FORMATTER_KEY, true);
3737
try {
3838
final FormattingModelBuilder formattingModelBuilder = LanguageFormatting.INSTANCE.forContext(file.getLanguage(), element);
@@ -45,7 +45,7 @@ public FormattingModel createModel(PsiElement element, CodeStyleSettings setting
4545
file.putUserData(WANT_DEFAULT_FORMATTER_KEY, null);
4646
}
4747
}
48-
throw new IllegalArgumentException("Unsupported element '" + element + "'. It must be a JSFile with its own default formatter to support injected GraphQL formatting");
48+
throw new IllegalArgumentException("Unsupported element '" + element + "'. It must be an element in a JSFile with its own default formatter to support injected GraphQL formatting");
4949
}
5050

5151
private static SpacingBuilder createSpaceBuilder(CodeStyleSettings settings, PsiElement element) {

0 commit comments

Comments
 (0)