Skip to content

Commit b37470c

Browse files
committed
fix npe while parsing
1 parent 449dc13 commit b37470c

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

base-impl/src/main/java/com/intellij/lang/javascript/JSTokenTypes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
154154
@RequiredReadAction
155155
protected ASTNode doParseContents(ASTNode chameleon, PsiElement psi) {
156156
Project project = psi.getProject();
157-
Language languageForParser = getLanguageForParser(psi);
158157
LanguageVersion tempLanguageVersion = chameleon.getUserData(LanguageVersion.KEY);
159158
LanguageVersion languageVersion = tempLanguageVersion == null ? psi.getLanguageVersion() : tempLanguageVersion;
160159
PsiBuilder builder = PsiBuilderFactory.getInstance()
161-
.createBuilder(project, chameleon, null, languageForParser, languageVersion, chameleon.getChars());
162-
JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageForParser).createParser(languageVersion);
160+
.createBuilder(project, chameleon, null, languageVersion.getLanguage(), languageVersion, chameleon.getChars());
161+
JavaScriptParser parser = (JavaScriptParser) ParserDefinition.forLanguage(languageVersion.getLanguage())
162+
.createParser(languageVersion);
163163

164164
JavaScriptParsingContext parsingContext = parser.createParsingContext();
165165
parseScriptExpression(parsingContext, builder);

0 commit comments

Comments
 (0)