diff --git a/gradle.properties b/gradle.properties index f29cd5e73..f0f744dc3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,11 +15,11 @@ pluginUntilBuild = # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType = IU -platformVersion = 2022.3.2 +platformVersion = 2023.3.2 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 -platformPlugins = java,yaml,xpath,webDeployment,JavaScript,com.jetbrains.php:223.8617.59,de.espend.idea.php.annotation:8.3.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:223.8617.59,com.jetbrains.php.dql:223.7571.117 +platformPlugins = java,yaml,xpath,webDeployment,JavaScript,com.jetbrains.php:233.13135.108,de.espend.idea.php.annotation:8.3.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:233.13135.108,com.jetbrains.php.dql:233.11799.172 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 javaVersion = 17 diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java index 193423312..c4023e4da 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java @@ -487,40 +487,6 @@ public void assertLocalInspectionContains(String filename, String content, Strin fail(String.format("Fail matches '%s' with one of %s", contains, matches)); } - public void assertAnnotationContains(String filename, String content, String contains) { - List matches = new ArrayList<>(); - for (Annotation annotation : getAnnotationsAtCaret(filename, content)) { - matches.add(annotation.toString()); - if(annotation.getMessage().contains(contains)) { - return; - } - } - - fail(String.format("Fail matches '%s' with one of %s", contains, matches)); - } - - @NotNull - private AnnotationHolderImpl getAnnotationsAtCaret(String filename, String content) { - PsiFile psiFile = myFixture.configureByText(filename, content); - PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset()); - - AnnotationHolderImpl annotations = new AnnotationHolderImpl(new AnnotationSession(psiFile)); - - for (Annotator annotator : LanguageAnnotators.INSTANCE.allForLanguage(psiFile.getLanguage())) { - annotator.annotate(psiElement, annotations); - } - - return annotations; - } - - public void assertAnnotationNotContains(String filename, String content, String contains) { - for (Annotation annotation : getAnnotationsAtCaret(filename, content)) { - if(annotation.getMessage().contains(contains)) { - fail(String.format("Fail not matching '%s' with '%s'", contains, annotation)); - } - } - } - public void assertIntentionIsAvailable(LanguageFileType languageFileType, String configureByText, String intentionText) { myFixture.configureByText(languageFileType, configureByText); PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset());