From 9a51f2b9536ad17161066a8d703304347ed77f9c Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Tue, 28 Dec 2021 14:09:11 +0100 Subject: [PATCH] Revert "[java] fix language level required for @snippet" This reverts commit 093605a5d64aba4de5c9331ad6fc604e9f014328. GitOrigin-RevId: a7de981964bbe6f30876c6aad8e9179c391d6aa4 --- .../intellij/psi/impl/source/javadoc/JavadocManagerImpl.java | 3 ++- .../codeInsight/daemonCodeAnalyzer/javaDoc/Snippet.java | 2 +- .../java/codeInsight/daemon/JavadocHighlightingTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java index ff0e8bce8b87..cf82119613eb 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/JavadocManagerImpl.java @@ -45,7 +45,8 @@ public class JavadocManagerImpl implements JavadocManager { myInfos.add(new SimpleDocTagInfo("index", LanguageLevel.JDK_1_9, true, PsiElement.class)); myInfos.add(new SimpleDocTagInfo("summary", LanguageLevel.JDK_10, true, PsiElement.class)); myInfos.add(new SimpleDocTagInfo("systemProperty", LanguageLevel.JDK_12, true, PsiElement.class)); - myInfos.add(new SimpleDocTagInfo("snippet", LanguageLevel.JDK_18, true, PsiElement.class)); + // TODO nikita.eshkeev@jetbrains.com, please change the language level to LanguageLevel.JDK_18 when it's available + myInfos.add(new SimpleDocTagInfo("snippet", LanguageLevel.JDK_17, true, PsiElement.class)); // not a standard tag, used by IDEA for suppressing inspections myInfos.add(new SimpleDocTagInfo(SuppressionUtilCore.SUPPRESS_INSPECTIONS_TAG_NAME, LanguageLevel.JDK_1_3, false, PsiElement.class)); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Snippet.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Snippet.java index 89f1983164ab..254d61baf6db 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Snippet.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/javaDoc/Snippet.java @@ -1,4 +1,4 @@ -/** {@snippet : +/** {@snippet : * Body * } */ diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java index 7d0d7f459397..4deec4935a0a 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/JavadocHighlightingTest.java @@ -126,7 +126,7 @@ public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase { public void testAuthoredMethod() { doTest(); } public void testThrowsInheritDoc() { doTest(); } public void testSnippetInlineTag() { doTest(); } - public void testSnippet() { setLanguageLevel(LanguageLevel.JDK_17); doTest(); } + public void testSnippet() { doTest(); } public void testIssueLinksInJavaDoc() { IssueNavigationConfiguration navigationConfiguration = IssueNavigationConfiguration.getInstance(getProject());