diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiMarkdownCodeBlockImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiMarkdownCodeBlockImpl.java index 9a43aff775a5..8404ddb5ba3a 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiMarkdownCodeBlockImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiMarkdownCodeBlockImpl.java @@ -3,6 +3,7 @@ package com.intellij.psi.impl.source.javadoc; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; +import com.intellij.lang.LanguageUtil; import com.intellij.psi.JavaDocTokenType; import com.intellij.psi.JavaElementVisitor; import com.intellij.psi.PsiElement; @@ -37,7 +38,7 @@ public class PsiMarkdownCodeBlockImpl extends CompositePsiElement implements Psi public @Nullable Language getCodeLanguage() { String languageInfo = getLanguageInfo(); if (languageInfo == null) return getLanguage(); - return Language.findLanguageByID(languageInfo); + return LanguageUtil.findRegisteredLanguage(languageInfo); } @Override diff --git a/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.html b/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.html index d8be26274b9f..166def412f0e 100644 --- a/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.html +++ b/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.html @@ -1,2 +1,3 @@ -
class MarkdownCodeBlock
new String();
System.out.println("Hello Markdown");
+
class MarkdownCodeBlock

Java code block

new String();
System.out.println("Hello Markdown");
+

Xml code block

<hello>
  <markdown />
</hello>

\ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.java b/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.java index 8a09b99ac24d..6290d0fdc6cd 100644 --- a/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.java +++ b/java/java-tests/testData/codeInsight/javadocIG/markdownCodeBlock.java @@ -1,7 +1,13 @@ - -/// ``` +/// Java code block +/// ```java /// new String(); /// System.out.println("Hello Markdown"); /// ``` +/// Xml code block +/// ```xml +/// +/// +/// +/// ``` class MarkdownCodeBlock {} \ No newline at end of file