From e897370068ff1157ab31817ecc2b4cf766a083a0 Mon Sep 17 00:00:00 2001 From: Daniel Espendiller Date: Wed, 1 Mar 2023 17:48:02 +0100 Subject: [PATCH] java language level feature migration --- build.gradle.kts | 2 +- .../Symfony2ProjectComponent.java | 1 - .../action/ServiceActionUtil.java | 3 +- .../action/bundle/NewBundleCommandAction.java | 4 +- .../action/bundle/NewBundleFormAction.java | 2 +- .../bundle/NewBundleTwigExtensionAction.java | 2 +- .../ui/ServiceArgumentSelectionDialog.java | 2 +- .../action/ui/ServiceBuilder.java | 2 +- .../action/ui/SymfonyCreateService.java | 15 ++- .../asset/AssetGoToDeclarationHandler.java | 15 ++- .../reference/AssistantReferenceUtil.java | 4 +- .../completion/CompletionContributor.java | 10 +- .../codeInsight/navigation/GotoHandler.java | 2 +- .../config/ConfigLineMarkerProvider.java | 10 +- .../config/PhpClassReference.java | 2 +- .../SymfonyPhpReferenceContributor.java | 1 - .../dic/EventDispatcherEventReference.java | 2 +- .../php/PhpConfigReferenceContributor.java | 1 - ...sageSubscriberGotoCompletionRegistrar.java | 6 +- .../XmlServiceArgumentInspection.java | 9 +- .../yaml/YamlCompletionContributor.java | 26 ++--- .../config/yaml/YamlElementPatternHelper.java | 12 +-- .../dic/DefaultServiceCollector.java | 2 +- .../container/util/ServiceContainerUtil.java | 16 ++- .../symfony2plugin/doctrine/EntityHelper.java | 6 +- .../doctrine/EntityReference.java | 2 +- .../ObjectRepositoryResultTypeProvider.java | 2 +- .../DoctrineXmlCompletionContributor.java | 32 +++--- .../QueryBuilderCompletionContributor.java | 98 +++++++++---------- .../QueryBuilderGotoDeclarationHandler.java | 2 +- .../processor/QueryBuilderChainProcessor.java | 12 +-- .../provider/ServiceToolboxProvider.java | 8 +- .../TranslationDomainToolboxProvider.java | 1 - .../form/FormExtensionKeyReference.java | 4 +- .../completion/FormCompletionContributor.java | 3 - .../form/dict/FormOptionEnum.java | 16 ++- ...anslationDomainGotoCompletionProvider.java | 1 - .../form/util/FormFieldNameReference.java | 2 +- .../installer/SymfonyInstallerForm.java | 1 - .../installer/SymfonyInstallerUtil.java | 6 +- .../navigation/PhpFoldingBuilder.java | 2 +- .../navigation/ServiceSymbolContributor.java | 2 +- .../SymfonyCommandSymbolContributor.java | 2 +- .../navigation/TemplateFileContributor.java | 2 +- .../navigation/TwigFoldingBuilder.java | 2 +- ...mplatesControllerRelatedGotoCollector.java | 7 +- .../reader/ReverseFileLineReader.java | 2 +- .../profiler/ui/ProfilerSettingsDialog.java | 2 - .../profiler/utils/ProfilerUtil.java | 6 +- .../symfony2plugin/routing/RouteHelper.java | 6 +- .../routing/RouteParameterReference.java | 2 +- .../routing/XmlLineMarkerProvider.java | 8 -- .../inspection/RouteGuessTypoQuickFix.java | 24 +++-- .../stubs/ServiceIndexUtil.java | 2 +- .../stubs/cache/FileIndexCaches.java | 1 - .../stubs/indexes/TranslationStubIndex.java | 3 - .../indexes/TwigControllerStubIndex.java | 3 - .../indexes/TwigMacroFunctionStubIndex.java | 4 - .../templating/TwigPattern.java | 4 +- .../TwigTemplateCompletionContributor.java | 34 +++---- .../TwigHtmlCompletionContributor.java | 45 +++++---- .../templating/dict/TwigCreateContainer.java | 2 +- .../dict/TwigExtensionLookupElement.java | 2 +- .../inspection/TemplateGuessTypoQuickFix.java | 24 +++-- .../templating/util/TwigTypeResolveUtil.java | 2 +- .../templating/util/TwigUtil.java | 22 ++--- .../collector/IncludeVariableCollector.java | 7 +- .../variable/resolver/FormVarsResolver.java | 4 +- .../PhpTranslationKeyInspection.java | 1 - .../translation/TranslationReference.java | 2 +- .../TranslationDomainGuessTypoQuickFix.java | 24 +++-- .../TranslationKeyGuessTypoQuickFix.java | 24 +++-- .../util/TranslationInsertUtil.java | 13 +-- .../assets/TwigNamedAssetsServiceParser.java | 2 +- .../twig/utils/TwigFileUtil.java | 2 +- .../ui/ContainerSettingsForm.java | 1 - .../MethodParameterReferenceSettingsForm.java | 2 +- .../ui/MethodSignatureTypeSettingsForm.java | 2 +- .../ui/RoutingSettingsForm.java | 2 +- .../symfony2plugin/ui/TwigSettingsForm.java | 2 +- .../util/AnnotationBackportUtil.java | 8 +- .../util/EventSubscriberUtil.java | 1 - .../symfony2plugin/util/PhpElementsUtil.java | 12 +-- .../symfony2plugin/util/PsiElementUtils.java | 1 - .../YamlKeywordsCompletionProvider.java | 2 +- .../symfony2plugin/util/dict/ServiceUtil.java | 4 +- .../symfony2plugin/util/yaml/YamlHelper.java | 17 ++-- ...ymfonyLightCodeInsightFixtureTestCase.java | 85 +++++++--------- ...SymfonyTempCodeInsightFixtureTestCase.java | 2 +- .../yaml/YamlGotoCompletionRegistrarTest.java | 8 +- .../config/ServiceLineMarkerProviderTest.java | 4 +- ...SubscriberGotoCompletionRegistrarTest.java | 4 - .../yaml/YamlGoToDeclarationHandlerTest.java | 1 - .../util/ServiceContainerUtilTest.java | 4 - .../tests/doctrine/EntityHelperTest.java | 12 +-- ...ctrineYamlGotoCompletionRegistrarTest.java | 10 +- ...ctrineTypeGotoCompletionRegistrarTest.java | 56 +++++------ .../util/DoctrineMetadataUtilTest.java | 21 ++-- .../tests/form/util/FormOptionsUtilTest.java | 15 ++- .../tests/form/util/FormUtilTest.java | 14 +-- .../PhpRouteReferenceContributorTest.java | 10 +- .../tests/routing/RouteHelperTest.java | 22 ++--- .../tests/routing/RouteTest.java | 2 - .../routing/YamlLineMarkerProviderTest.java | 16 +-- .../RouteSettingDeprecatedInspectionTest.java | 10 +- .../stubs/indexes/FileResourcesIndexTest.java | 2 - .../indexes/TranslationStubIndexTest.java | 6 +- .../tests/templating/util/TwigUtilTest.java | 10 +- .../webpack/SymfonyWebpackUtilTest.java | 1 - .../PhpTranslationKeyInspectionTest.java | 1 - .../tests/util/PhpElementsUtilTest.java | 22 ++--- .../tests/util/yaml/YamlHelperLightTest.java | 16 +-- 112 files changed, 465 insertions(+), 584 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 297adf81b..e92629fc6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -72,7 +72,7 @@ tasks { version.set(properties("pluginVersion")) sinceBuild.set(properties("pluginSinceBuild")) untilBuild.set(properties("pluginUntilBuild")) - changeNotes.set(file("src/main/resources/META-INF/change-notes.html").readText().replace("", "").replace("", "")); + changeNotes.set(file("src/main/resources/META-INF/change-notes.html").readText().replace("", "").replace("", "")) // Get the latest available change notes from the changelog file // changeNotes.set(provider { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java index a68cf1311..6b051b8cd 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Symfony2ProjectComponent.java @@ -11,7 +11,6 @@ import fr.adrienbrault.idea.symfony2plugin.extension.PluginConfigurationExtension; import fr.adrienbrault.idea.symfony2plugin.extension.ServiceContainerLoader; import fr.adrienbrault.idea.symfony2plugin.extension.ServiceContainerLoaderParameter; -import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper; import fr.adrienbrault.idea.symfony2plugin.util.IdeHelper; import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil; import fr.adrienbrault.idea.symfony2plugin.util.service.ServiceXmlParserFactory; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java index 159af9477..6be6612e4 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ServiceActionUtil.java @@ -157,8 +157,7 @@ public static Set getPossibleServices(@NotNull PhpClass phpClass, @NotNu matchedContainer.sort(new SymfonyCreateService.ContainerServicePriorityNameComparator()); matchedContainer.sort((o1, o2) -> - ((Integer)ServiceContainerUtil.getServiceUsage(phpClass.getProject(), o2.getName())) - .compareTo(ServiceContainerUtil.getServiceUsage(phpClass.getProject(), o1.getName())) + Integer.compare(ServiceContainerUtil.getServiceUsage(phpClass.getProject(), o2.getName()), ServiceContainerUtil.getServiceUsage(phpClass.getProject(), o1.getName())) ); return matchedContainer.stream() diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java index 2dec95769..8ddf76593 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java @@ -37,9 +37,9 @@ protected void run(@NotNull Result result) throws Throwable { PsiElement bundleFile = null; try { - bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, "command", "Command\\" + finalClassName, new HashMap() {{ + bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, "command", "Command\\" + finalClassName, new HashMap<>() {{ String name = phpClass.getName(); - if(name.endsWith("Bundle")) { + if (name.endsWith("Bundle")) { name = name.substring(0, name.length() - "Bundle".length()); } put("name", StringUtils.underscore(name) + ":" + StringUtils.underscore(finalClassName)); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java index 1ff7ace20..5882de755 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleFormAction.java @@ -38,7 +38,7 @@ protected void run(@NotNull Result result) throws Throwable { PsiElement bundleFile = null; try { - bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, fileTemplate, "Form\\" + className, new HashMap() {{ + bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, fileTemplate, "Form\\" + className, new HashMap<>() {{ put("name", fr.adrienbrault.idea.symfony2plugin.util.StringUtils.underscore(phpClass.getName() + className)); }}); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java index 5ddd63532..845758238 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleTwigExtensionAction.java @@ -36,7 +36,7 @@ protected void run(@NotNull Result result) throws Throwable { } final String finalName = name; - bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, "twig_extension", "Twig\\Extension\\" + className, new HashMap() {{ + bundleFile = PhpBundleFileFactory.createBundleFile(phpClass, "twig_extension", "Twig\\Extension\\" + className, new HashMap<>() {{ put("name", fr.adrienbrault.idea.symfony2plugin.util.StringUtils.underscore(finalName)); }}); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java index ba4b9f563..62e362c76 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceArgumentSelectionDialog.java @@ -206,7 +206,7 @@ public boolean isCellEditable(ServiceParameter modelParameter) { public TableCellEditor getEditor(ServiceParameter modelParameter) { Set sorted = modelParameter.getPossibleServices(); - ComboBox comboBox = new ComboBox(sorted.toArray(new String[sorted.size()] ), 200); + ComboBox comboBox = new ComboBox(sorted.toArray(new String[0]), 200); comboBox.setEditable(true); return new DefaultCellEditor(comboBox); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java index 0e18798b0..18c83bc62 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/ServiceBuilder.java @@ -98,7 +98,7 @@ private List getParameters(List me List methodCalls = new ArrayList<>(); // sort by indexes parameter - methodModelParameters.sort((o1, o2) -> ((Integer) o1.getIndex()).compareTo(o2.getIndex())); + methodModelParameters.sort(Comparator.comparingInt(MethodParameter.MethodModelParameter::getIndex)); for(MethodParameter.MethodModelParameter methodModelParameter: methodModelParameters) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java index 1fa3da26c..3e2ebf886 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/ui/SymfonyCreateService.java @@ -380,14 +380,11 @@ private void updateTask() { method.getName(); } - modelParameters.sort((o1, o2) -> { - int i = o1.getName().compareTo(o2.getName()); - if (i != 0) { - return i; - } - - return Integer.valueOf(o1.getIndex()).compareTo(o2.getIndex()); - }); + modelParameters.sort( + Comparator + .comparing(MethodParameter.MethodModelParameter::getName) + .thenComparingInt(MethodParameter.MethodModelParameter::getIndex) + ); while(this.modelList.getRowCount() > 0) { this.modelList.removeRow(0); @@ -466,7 +463,7 @@ public boolean isCellEditable(MethodParameter.MethodModelParameter modelParamete public TableCellEditor getEditor(MethodParameter.MethodModelParameter modelParameter) { Set sorted = modelParameter.getPossibleServices(); - ComboBox comboBox = new ComboBox(sorted.toArray(new String[sorted.size()] ), 200); + ComboBox comboBox = new ComboBox(sorted.toArray(new String[0]), 200); comboBox.setEditable(true); return new DefaultCellEditor(comboBox); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java index 659beb652..b645d6f2a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetGoToDeclarationHandler.java @@ -46,7 +46,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit } } - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } private String[] findValidAssetFilter(PsiElement psiElement) { @@ -72,14 +72,11 @@ private String[] getFileExtensionFilterIfValidTag(PsiElement psiElement) { continue; } - switch (tag) { - case "stylesheets": - return TwigUtil.CSS_FILES_EXTENSIONS; - case "javascripts": - return TwigUtil.JS_FILES_EXTENSIONS; - default: - return null; - } + return switch (tag) { + case "stylesheets" -> TwigUtil.CSS_FILES_EXTENSIONS; + case "javascripts" -> TwigUtil.JS_FILES_EXTENSIONS; + default -> null; + }; } return null; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java index 6e24fe2fc..4c8b1bdfe 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/reference/AssistantReferenceUtil.java @@ -26,7 +26,7 @@ public static String[] getReferenceProvider(Project project) { contributorAliases.add(referenceProvider.getAlias()); } - return contributorAliases.toArray(new String[contributorAliases.size()]); + return contributorAliases.toArray(new String[0]); } public static String[] getContributorProvider(Project project) { @@ -36,7 +36,7 @@ public static String[] getContributorProvider(Project project) { contributorAliases.add(assistantReferenceContributor.getAlias()); } - return contributorAliases.toArray(new String[contributorAliases.size()]); + return contributorAliases.toArray(new String[0]); } @Nullable diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java index 82205b534..a87ec2b37 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/completion/CompletionContributor.java @@ -23,7 +23,7 @@ public class CompletionContributor extends com.intellij.codeInsight.completion.CompletionContributor { public CompletionContributor() { - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -34,17 +34,17 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters GotoCompletionProviderLookupArguments arguments = null; Collection contributors = GotoCompletionUtil.getContributors(psiElement); - for(GotoCompletionContributor contributor: contributors) { + for (GotoCompletionContributor contributor : contributors) { GotoCompletionProviderInterface formReferenceCompletionContributor = contributor.getProvider(psiElement); - if(formReferenceCompletionContributor != null) { + if (formReferenceCompletionContributor != null) { completionResultSet.addAllElements( formReferenceCompletionContributor.getLookupElements() ); } // extension to provide full argument pipes - if(formReferenceCompletionContributor instanceof GotoCompletionProviderInterfaceEx) { - if(arguments == null) { + if (formReferenceCompletionContributor instanceof GotoCompletionProviderInterfaceEx) { + if (arguments == null) { arguments = new GotoCompletionProviderLookupArguments(completionParameters, processingContext, completionResultSet); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java index e1e4db646..a7f16090c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/navigation/GotoHandler.java @@ -35,7 +35,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int i, Edit } } - return psiTargets.toArray(new PsiElement[psiTargets.size()]); + return psiTargets.toArray(new PsiElement[0]); } @Nullable diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java index 869c15b47..3fffaecd7 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Supplier; /** @@ -129,11 +130,10 @@ private static class LazyConfigTreeSignatures { @NotNull public Map> value() { - if(this.treeSignatures == null) { - return this.treeSignatures = ConfigUtil.getTreeSignatures(project); - } - - return this.treeSignatures; + return Objects.requireNonNullElseGet( + this.treeSignatures, + () -> this.treeSignatures = ConfigUtil.getTreeSignatures(project) + ); } } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java index 2ac048e16..33415b332 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/PhpClassReference.java @@ -64,7 +64,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) { this.attachPhpClassResolveResults(phpIndex.getInterfacesByFQN(classFQN.startsWith("\\") ? classFQN : "\\" + classFQN), results); } - return results.toArray(new ResolveResult[results.size()]); + return results.toArray(new ResolveResult[0]); } private void attachPhpClassResolveResults(Collection phpClasses, List results) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java index 2d1c7bfa1..dd5d4d052 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/SymfonyPhpReferenceContributor.java @@ -3,7 +3,6 @@ import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.*; import com.intellij.util.ProcessingContext; -import com.jetbrains.php.lang.PhpLanguage; import com.jetbrains.php.lang.psi.elements.*; import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent; import fr.adrienbrault.idea.symfony2plugin.dic.ConstraintPropertyReference; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java index 2765544eb..58c77595a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/dic/EventDispatcherEventReference.java @@ -38,7 +38,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) { resolveResults.add(new PsiElementResolveResult(psiElement)); } - return resolveResults.toArray(new ResolveResult[resolveResults.size()]); + return resolveResults.toArray(new ResolveResult[0]); } @NotNull diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java index 7469a60ee..4465fd258 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpConfigReferenceContributor.java @@ -4,7 +4,6 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ProcessingContext; -import com.jetbrains.php.lang.PhpLanguage; import com.jetbrains.php.lang.psi.elements.*; import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent; import fr.adrienbrault.idea.symfony2plugin.config.PhpClassReference; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpMessageSubscriberGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpMessageSubscriberGotoCompletionRegistrar.java index 66973119d..55c0e20c0 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpMessageSubscriberGotoCompletionRegistrar.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/php/PhpMessageSubscriberGotoCompletionRegistrar.java @@ -44,7 +44,7 @@ public class PhpMessageSubscriberGotoCompletionRegistrar implements GotoCompleti PlatformPatterns.or( PlatformPatterns.psiElement(ArrayHashElement.class) .withParent(PlatformPatterns.psiElement(ArrayCreationExpression.class).withParent(PhpReturn.class)) - .with(new PatternCondition("Key Type") { + .with(new PatternCondition<>("Key Type") { @Override public boolean accepts(@NotNull ArrayHashElement arrayHashElement, ProcessingContext context) { PhpPsiElement keyElement = arrayHashElement.getKey(); @@ -53,7 +53,7 @@ public boolean accepts(@NotNull ArrayHashElement arrayHashElement, ProcessingCon } }), PlatformPatterns.psiElement(ArrayHashElement.class) - .with(new PatternCondition("Key Text") { + .with(new PatternCondition<>("Key Text") { @Override public boolean accepts(@NotNull ArrayHashElement arrayHashElement, ProcessingContext context) { PhpPsiElement keyElement = arrayHashElement.getKey(); @@ -68,7 +68,7 @@ public boolean accepts(@NotNull ArrayHashElement arrayHashElement, ProcessingCon .withParent( PlatformPatterns.psiElement(ArrayCreationExpression.class).withParent( PlatformPatterns.psiElement(PhpYield.class) - .with(new PatternCondition("Yield Key Type") { + .with(new PatternCondition<>("Yield Key Type") { @Override public boolean accepts(@NotNull PhpYield phpYield, ProcessingContext context) { PsiElement keyElement = phpYield.getArgument(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java index af620dbe6..87ab45569 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/xml/inspection/XmlServiceArgumentInspection.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; +import java.util.Objects; /** * @author Daniel Espendiller @@ -54,11 +55,11 @@ public void visitFile(PsiFile file) { } private ContainerCollectionResolver.LazyServiceCollector getLazyServiceCollector(XmlTag xmlTag) { - if(this.lazyServiceCollector != null) { - return this.lazyServiceCollector; - } + return Objects.requireNonNullElseGet( + this.lazyServiceCollector, + () -> this.lazyServiceCollector = new ContainerCollectionResolver.LazyServiceCollector(xmlTag.getProject()) + ); - return this.lazyServiceCollector = new ContainerCollectionResolver.LazyServiceCollector(xmlTag.getProject()); } private void visitService(XmlTag xmlTag, @NotNull ProblemsHolder holder) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java index b00a26a47..0df0b715a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlCompletionContributor.java @@ -105,19 +105,19 @@ public class YamlCompletionContributor extends CompletionContributor { put("exclude", ">= 2.8"); }}); - private static final Map ROUTE_KEYS = Collections.unmodifiableMap(new HashMap<>() {{ - put("pattern", "deprecated"); - put("defaults", "(bool)"); - put("path", "(string)"); - put("requirements", "(array)"); - put("methods", "(array|string)"); - put("condition", "(string / expression)"); - put("resource", "(string)"); - put("prefix", "(string)"); - put("schemes", "(array|string)"); - put("host", "(string)"); - put("controller", "(string)"); - }}); + private static final Map ROUTE_KEYS = Map.ofEntries( + Map.entry("pattern", "deprecated"), + Map.entry("defaults", "(bool)"), + Map.entry("path", "(string)"), + Map.entry("requirements", "(array)"), + Map.entry("methods", "(array|string)"), + Map.entry("condition", "(string / expression)"), + Map.entry("resource", "(string)"), + Map.entry("prefix", "(string)"), + Map.entry("schemes", "(array|string)"), + Map.entry("host", "(string)"), + Map.entry("controller", "(string)") + ); public YamlCompletionContributor() { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java index f2b62e7a3..c71b49229 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/yaml/YamlElementPatternHelper.java @@ -49,7 +49,7 @@ public class YamlElementPatternHelper { * * /../config/packages/doctrine.yaml */ - private static final PatternCondition CONFIG_YAML_PATTERN = new PatternCondition("Yaml Configuration") { + private static final PatternCondition CONFIG_YAML_PATTERN = new PatternCondition<>("Yaml Configuration") { @Override public boolean accepts(@NotNull PsiFile psiFile, ProcessingContext processingContext) { if (psiFile.getFileType() != YAMLFileType.YML) { @@ -316,7 +316,7 @@ public static ElementPattern getServicesKeyPattern() { * Proxy for getWithFirstRootKey to filter with file name condition */ public static ElementPattern getOrmRoot() { - return PlatformPatterns.and(PlatformPatterns.psiElement().with(new PatternCondition("Doctrine file") { + return PlatformPatterns.and(PlatformPatterns.psiElement().with(new PatternCondition<>("Doctrine file") { @Override public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext processingContext) { return getOrmFilePattern().accepts(psiElement.getContainingFile()); @@ -806,7 +806,7 @@ public static ElementPattern getPhpConstPattern() { */ public static ElementPattern getNamedDefaultBindPattern() { // "__defaults" key - PsiElementPattern.Capture defaultsKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + PsiElementPattern.Capture defaultsKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext context) { return "_defaults".equals(yamlKeyValue.getKeyText()); @@ -814,7 +814,7 @@ public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext con })); // "bind" bind - PsiElementPattern.Capture bindKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + PsiElementPattern.Capture bindKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext context) { return "bind".equals(yamlKeyValue.getKeyText()); @@ -822,7 +822,7 @@ public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext con }).withParent(defaultsKey)); // "arguments" bind - PsiElementPattern.Capture argumentsKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + PsiElementPattern.Capture argumentsKey = PlatformPatterns.psiElement(YAMLMapping.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext context) { return "arguments".equals(yamlKeyValue.getKeyText()); @@ -846,7 +846,7 @@ public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext con // incomplete code 2.0 for new phpstorm version. // bind: // $ - PsiElementPattern.Capture incompleteCodePattern2 = PlatformPatterns.psiElement(YAMLTokenTypes.TEXT).withText(PlatformPatterns.string().startsWith("$")).withParent(PlatformPatterns.psiElement(YAMLScalar.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + PsiElementPattern.Capture incompleteCodePattern2 = PlatformPatterns.psiElement(YAMLTokenTypes.TEXT).withText(PlatformPatterns.string().startsWith("$")).withParent(PlatformPatterns.psiElement(YAMLScalar.class).withParent(PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext context) { String keyText = yamlKeyValue.getKeyText(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java index 947969f5f..f03007686 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/DefaultServiceCollector.java @@ -13,7 +13,7 @@ */ public class DefaultServiceCollector implements ServiceCollector { - private static Map DEFAULTS = new HashMap() {{ + private static Map DEFAULTS = new HashMap<>() {{ put("service_container", "Symfony\\Component\\DependencyInjection\\ContainerInterface"); put("kernel", "Symfony\\Component\\HttpKernel\\KernelInterface"); put("controller_resolver", "Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface"); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java index 2fa6c8f90..74d0425d4 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java @@ -407,14 +407,11 @@ private static Boolean getBooleanValueOf(@Nullable String value) { return null; } - switch (value.toLowerCase()) { - case "false": - return false; - case "true": - return true; - default: - return null; - } + return switch (value.toLowerCase()) { + case "false" -> false; + case "true" -> true; + default -> null; + }; } @@ -928,8 +925,7 @@ public static List getSortedServiceId(@NotNull Project project, @NotNull myIds.sort(new ServiceContainerUtil.ContainerServiceIdPriorityNameComparator()); myIds.sort((o1, o2) -> - ((Integer) ServiceContainerUtil.getServiceUsage(project, o2)) - .compareTo(ServiceContainerUtil.getServiceUsage(project, o1)) + Integer.compare(ServiceContainerUtil.getServiceUsage(project, o2), ServiceContainerUtil.getServiceUsage(project, o1)) ); return myIds; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java index d3b6a5548..b8c7a9842 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityHelper.java @@ -304,7 +304,7 @@ public static PsiElement[] getModelFieldTargets(@NotNull PhpClass phpClass,@NotN psiElements.add(method); } - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } @@ -698,7 +698,7 @@ public static void attachAnnotationInformation(@NotNull PhpClass phpClass, @NotN */ public static Collection getModelClasses(final Project project) { - HashMap shortcutNames = new HashMap() {{ + HashMap shortcutNames = new HashMap<>() {{ putAll(ServiceXmlParserFactory.getInstance(project, EntityNamesServiceParser.class).getEntityNameMap()); putAll(ServiceXmlParserFactory.getInstance(project, DocumentNamespacesParser.class).getNamespaceMap()); }}; @@ -807,7 +807,7 @@ public static Map getWeakBundleNamespaces(Project project, Map> useImportMap) { - Map matches = new HashMap() {{ + Map matches = new HashMap<>() {{ put("string", Pattern.compile(propertyName + "\\s*=\\s*\"([^\"]*)\"").matcher(text)); // targetEntity="Foobar" put("class", Pattern.compile(propertyName + "\\s*=\\s*([^\\s:]*)::class").matcher(text)); // targetEntity=Foobar::class }}; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java index b7d68989f..26045ab8c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/EntityReference.java @@ -57,7 +57,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) { @NotNull @Override public Object[] getVariants() { - List results = new ArrayList<>(getModelLookupElements(getElement().getProject(), this.useClassNameAsLookupString, this.doctrineManagers.toArray(new DoctrineTypes.Manager[this.doctrineManagers.size()]))); + List results = new ArrayList<>(getModelLookupElements(getElement().getProject(), this.useClassNameAsLookupString, this.doctrineManagers.toArray(new DoctrineTypes.Manager[0]))); return results.toArray(); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java index 6e235fcc6..9be88bdf4 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java @@ -39,7 +39,7 @@ public class ObjectRepositoryResultTypeProvider implements PhpTypeProvider4 { new MethodMatcher.CallToSignature("\\Doctrine\\Persistence\\ObjectRepository", "findBy"), }; - private static Set MANAGED_FIND_METHOD = new HashSet() {{ + private static Set MANAGED_FIND_METHOD = new HashSet<>() {{ add("find"); add("findOneBy"); add("findAll"); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java index 01331c080..0832aa643 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/metadata/DoctrineXmlCompletionContributor.java @@ -25,12 +25,12 @@ public DoctrineXmlCompletionContributor() { DoctrineMetadataPattern.getXmlTargetEntityClass(), DoctrineMetadataPattern.getXmlTargetDocumentClass(), DoctrineMetadataPattern.getEmbeddableNameClassPattern() - )), new CompletionProvider() { + )), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { PsiElement psiElement = parameters.getOriginalPosition(); - if(psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { + if (psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { return; } @@ -41,20 +41,20 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi // // extend(CompletionType.BASIC, XmlPatterns.psiElement().withParent(PlatformPatterns.or(DoctrineMetadataPattern.getXmlRepositoryClass())), - new CompletionProvider() { - @Override - protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { - - PsiElement psiElement = parameters.getOriginalPosition(); - if(psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { - return; + new CompletionProvider<>() { + @Override + protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { + + PsiElement psiElement = parameters.getOriginalPosition(); + if (psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { + return; + } + + // @TODO: filter on doctrine manager + resultSet.addAllElements( + DoctrineMetadataUtil.getObjectRepositoryLookupElements(psiElement.getProject()) + ); } - - // @TODO: filter on doctrine manager - resultSet.addAllElements( - DoctrineMetadataUtil.getObjectRepositoryLookupElements(psiElement.getProject()) - ); - } - }); + }); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java index 22236a956..597e11e9c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java @@ -72,7 +72,7 @@ public class QueryBuilderCompletionContributor extends CompletionContributor { public QueryBuilderCompletionContributor() { - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -85,22 +85,22 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature("\\Doctrine\\ORM\\QueryBuilder", "setParameter") .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { methodMatchParameter = new MethodMatcher.ArrayParameterMatcher(psiElement.getContext(), 0) .withSignature("\\Doctrine\\ORM\\QueryBuilder", "setParameters") .match(); } - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference()); - if(qb == null) { + if (qb == null) { return; } - for(String parameter: qb.collect().getParameters()) { + for (String parameter : qb.collect().getParameters()) { completionResultSet.addElement(LookupElementBuilder.create(parameter)); } @@ -108,7 +108,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -121,18 +121,18 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature(JOINS) .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference()); - if(qb == null) { + if (qb == null) { return; } QueryBuilderScopeContext collect = qb.collect(); - for(Map.Entry> parameter: collect.getRelationMap().entrySet()) { - for(QueryBuilderRelation relation: parameter.getValue()) { + for (Map.Entry> parameter : collect.getRelationMap().entrySet()) { + for (QueryBuilderRelation relation : parameter.getValue()) { completionResultSet.addElement(LookupElementBuilder.create(parameter.getKey() + "." + relation.getFieldName()).withTypeText(relation.getTargetEntity(), true)); } } @@ -141,22 +141,22 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { PsiElement psiElement = completionParameters.getOriginalPosition(); - if(psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { + if (psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { return; } MethodMatcher.MethodMatchParameter methodMatchParameter = MatcherUtil.matchPropertyField(psiElement.getContext()); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference()); - if(qb == null) { + if (qb == null) { return; } @@ -167,12 +167,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { PsiElement psiElement = completionParameters.getOriginalPosition(); - if(psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { + if (psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { return; } @@ -180,15 +180,15 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature(WHERES) .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } // querybuilder parser is too slow longer values, and that dont make sense here at all // user can fire a manual completion event, when needed... - if(completionParameters.isAutoPopup()) { - if(psiElement instanceof StringLiteralExpression) { - if(((StringLiteralExpression) psiElement).getContents().length() > 5) { + if (completionParameters.isAutoPopup()) { + if (psiElement instanceof StringLiteralExpression) { + if (((StringLiteralExpression) psiElement).getContents().length() > 5) { return; } } @@ -198,7 +198,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters addParameterNameCompletion(completionParameters, completionResultSet, psiElement); QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference()); - if(qb == null) { + if (qb == null) { return; } @@ -210,12 +210,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters private void addParameterNameCompletion(CompletionParameters completionParameters, CompletionResultSet completionResultSet, PsiElement psiElement) { PsiElement literalExpr = psiElement.getParent(); - if(!(literalExpr instanceof StringLiteralExpression)) { + if (!(literalExpr instanceof StringLiteralExpression)) { return; } String content = PsiElementUtils.getStringBeforeCursor((StringLiteralExpression) literalExpr, completionParameters.getOffset()); - if(content == null) { + if (content == null) { return; } @@ -224,12 +224,12 @@ private void addParameterNameCompletion(CompletionParameters completionParameter final String complete = matcher.group(1) + "_" + matcher.group(2); // fill underscore and underscore completion - Set strings = new HashSet() {{ + Set strings = new HashSet<>() {{ add(complete); add(fr.adrienbrault.idea.symfony2plugin.util.StringUtils.camelize(complete, true)); }}; - for(String string: strings) { + for (String string : strings) { completionResultSet.addElement(LookupElementBuilder.create(":" + string).withIcon(Symfony2Icons.DOCTRINE)); } @@ -239,7 +239,7 @@ private void addParameterNameCompletion(CompletionParameters completionParameter }); // $qb->join('test.foo', 'foo'); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -252,23 +252,23 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature(JOINS) .match(); - if(methodMatchParameter != null) { + if (methodMatchParameter != null) { MethodReference methodReference = PsiTreeUtil.getParentOfType(psiElement, MethodReference.class); - if(methodReference != null) { + if (methodReference != null) { String joinTable = PhpElementsUtil.getStringValue(PsiElementUtils.getMethodParameterPsiElementAt(methodReference, 0)); - if(joinTable != null && StringUtils.isNotBlank(joinTable)) { + if (joinTable != null && StringUtils.isNotBlank(joinTable)) { int pos = joinTable.lastIndexOf("."); - if(pos > 0) { + if (pos > 0) { final String aliasName = joinTable.substring(pos + 1); - if(StringUtils.isNotBlank(aliasName)) { + if (StringUtils.isNotBlank(aliasName)) { - Set strings = new HashSet() {{ + Set strings = new HashSet<>() {{ add(aliasName); add(fr.adrienbrault.idea.symfony2plugin.util.StringUtils.camelize(aliasName, true)); add(fr.adrienbrault.idea.symfony2plugin.util.StringUtils.underscore(aliasName)); }}; - for(String string: strings) { + for (String string : strings) { completionResultSet.addElement(LookupElementBuilder.create(string)); } @@ -284,12 +284,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters // $qb->expr()->in('') // $qb->expr()->eg('') - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { PsiElement psiElement = completionParameters.getOriginalPosition(); - if(psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { + if (psiElement == null || !Symfony2ProjectComponent.isEnabled(psiElement)) { return; } @@ -297,7 +297,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature(EXPR) .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } @@ -305,12 +305,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters // $qb->expr()->in('') MethodReference methodReference = methodMatchParameter.getMethodReference(); PsiElement methodReferenceChild = methodReference.getFirstChild(); - if(!(methodReferenceChild instanceof MethodReference)) { + if (!(methodReferenceChild instanceof MethodReference)) { return; } QueryBuilderMethodReferenceParser qb = getQueryBuilderParser((MethodReference) methodReferenceChild); - if(qb == null) { + if (qb == null) { return; } @@ -321,7 +321,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -334,12 +334,12 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature("\\Doctrine\\ORM\\QueryBuilder", "from") .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } QueryBuilderMethodReferenceParser qb = getQueryBuilderParser(methodMatchParameter.getMethodReference()); - if(qb == null) { + if (qb == null) { return; } @@ -351,7 +351,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -364,14 +364,14 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature("\\Doctrine\\ORM\\EntityRepository", "createQueryBuilder") .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } - for(String type: methodMatchParameter.getMethodReference().getType().getTypes()) { + for (String type : methodMatchParameter.getMethodReference().getType().getTypes()) { // strip last method call - if(type.endsWith(".createQueryBuilder")) { + if (type.endsWith(".createQueryBuilder")) { attachClassNames(completionResultSet, type.substring(0, type.length() - ".createQueryBuilder".length())); } @@ -379,7 +379,7 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters } }); - extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider() { + extend(CompletionType.BASIC, PlatformPatterns.psiElement(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { @@ -392,13 +392,13 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters .withSignature("\\Doctrine\\ORM\\QueryBuilder", "from") .match(); - if(methodMatchParameter == null) { + if (methodMatchParameter == null) { return; } MethodReference methodReference = methodMatchParameter.getMethodReference(); String repoName = PhpElementsUtil.getStringValue(methodReference.getParameters()[0]); - if(repoName != null) { + if (repoName != null) { attachClassNames(completionResultSet, repoName); } @@ -480,7 +480,7 @@ public static QueryBuilderMethodReferenceParser getQueryBuilderParser(MethodRefe processor.collectMethods(); // @TODO: pipe factory method - return new QueryBuilderMethodReferenceParser(methodReference.getProject(), new ArrayList() {{ + return new QueryBuilderMethodReferenceParser(methodReference.getProject(), new ArrayList<>() {{ addAll(processor.getQueryBuilderFactoryMethods()); addAll(processor.getQueryBuilderMethodReferences()); }}); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java index 8ee5fe59a..c7e9f65de 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderGotoDeclarationHandler.java @@ -48,7 +48,7 @@ public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int offset, // $qb->from('', '', ''); attachFromIndexGoto(context, psiElements); - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } private void attachPartialGoto(@NotNull StringLiteralExpression psiElement, @NotNull List targets, int offset) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java index a72052ea2..4ec8e06a1 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/processor/QueryBuilderChainProcessor.java @@ -145,13 +145,12 @@ private boolean nextMethodScope(List medRefCollection, List { // we are inside QueryBuilder class eg. addSelect medRefCollection.add(child); return true; - - case RESOLVE: + } + case RESOLVE -> { // we found a method returning QueryBuilder @@ -164,10 +163,11 @@ private boolean nextMethodScope(List medRefCollection, List { factoryReferences.add(child); return false; + } } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java index fae461927..c12555fab 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ServiceToolboxProvider.java @@ -40,8 +40,8 @@ public Collection getLookupElements(@NotNull PhpToolboxCompletion List results = new ArrayList<>(); - Boolean aPrivate = parameter.getParameterBag().getParameterBool("private", false); - Boolean aPublic = parameter.getParameterBag().getParameterBool("public", true); + boolean aPrivate = parameter.getParameterBag().getParameterBool("private", false); + boolean aPublic = parameter.getParameterBag().getParameterBool("public", true); for (ContainerService service : ContainerCollectionResolver.getServices(parameter.getProject()).values()) { if(service.isPrivate() == aPrivate) { @@ -69,7 +69,7 @@ public Collection getPsiTargets(@NotNull PhpToolboxDeclarationHandle return Collections.emptyList(); } - return new ArrayList() {{ + return new ArrayList<>() {{ add(serviceClass); }}; } @@ -114,7 +114,7 @@ public Collection resolveParameter(@NotNull PhpToolboxTypeProvi return null; } - return new ArrayList(){{ + return new ArrayList<>() {{ add(serviceClass); }}; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java index 5505a3d72..dce74aea9 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/TranslationDomainToolboxProvider.java @@ -2,7 +2,6 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; import de.espend.idea.php.toolbox.completion.dict.PhpToolboxCompletionContributorParameter; import de.espend.idea.php.toolbox.extension.PhpToolboxProviderAbstract; import de.espend.idea.php.toolbox.navigation.dict.PhpToolboxDeclarationHandlerParameter; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java index 992508490..f70fb6776 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormExtensionKeyReference.java @@ -35,13 +35,13 @@ public FormExtensionKeyReference(@NotNull StringLiteralExpression element, @Null @Override public ResolveResult[] multiResolve(boolean b) { return PsiElementResolveResult.createResults( - FormOptionsUtil.getFormExtensionsKeysTargets(element, formTypes.toArray(new String[formTypes.size()])) + FormOptionsUtil.getFormExtensionsKeysTargets(element, formTypes.toArray(new String[0])) ); } @NotNull @Override public Object[] getVariants() { - return FormOptionsUtil.getFormExtensionKeysLookupElements(getElement().getProject(), formTypes.toArray(new String[formTypes.size()])).toArray(); + return FormOptionsUtil.getFormExtensionKeysLookupElements(getElement().getProject(), formTypes.toArray(new String[0])).toArray(); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java index 9a2de5338..6ea575f03 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/completion/FormCompletionContributor.java @@ -2,9 +2,7 @@ import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.LookupElement; -import com.intellij.patterns.PatternCondition; import com.intellij.patterns.PlatformPatterns; -import com.intellij.patterns.StandardPatterns; import com.intellij.psi.PsiElement; import com.intellij.util.ProcessingContext; import com.jetbrains.php.PhpIndex; @@ -12,7 +10,6 @@ import com.jetbrains.php.lang.psi.elements.MethodReference; import com.jetbrains.php.lang.psi.elements.PhpClass; import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent; -import fr.adrienbrault.idea.symfony2plugin.dic.ServiceCompletionProvider; import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java index 4ac3ec5d6..b0fbd1ce7 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/dict/FormOptionEnum.java @@ -10,16 +10,12 @@ public enum FormOptionEnum { public static FormOptionEnum getEnum(@NotNull String s) { - switch (s) { - case "setDefault": - return DEFAULT; - case "setRequired": - return REQUIRED; - case "setDefined": - case "setOptional": - return DEFINED; - } + return switch (s) { + case "setDefault" -> DEFAULT; + case "setRequired" -> REQUIRED; + case "setDefined", "setOptional" -> DEFINED; + default -> UNKNOWN; + }; - return UNKNOWN; } } \ No newline at end of file diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java index 6e7709276..8489c2ceb 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/gotoCompletion/TranslationDomainGotoCompletionProvider.java @@ -2,7 +2,6 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; import fr.adrienbrault.idea.symfony2plugin.codeInsight.GotoCompletionProvider; import fr.adrienbrault.idea.symfony2plugin.codeInsight.utils.GotoCompletionUtil; import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java index 6ffc84447..a8d86e8ef 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/util/FormFieldNameReference.java @@ -70,7 +70,7 @@ public static LookupElement[] getFormLookups(Method method) { } } - return lookupElements.toArray(new LookupElement[lookupElements.size()]); + return lookupElements.toArray(new LookupElement[0]); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java index e9d0ae9be..57a5d7e28 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerForm.java @@ -1,6 +1,5 @@ package fr.adrienbrault.idea.symfony2plugin.installer; -import fr.adrienbrault.idea.symfony2plugin.installer.dict.SymfonyInstallerVersion; import org.jdesktop.swingx.combobox.ListComboBoxModel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java index b622f2459..e3d9a609e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java @@ -293,15 +293,15 @@ public static String getDownloadVersions() { BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); - String content = ""; + StringBuilder content = new StringBuilder(); String line; while ((line = in.readLine()) != null) { - content += line; + content.append(line); } in.close(); - return content; + return content.toString(); } catch (IOException e) { return null; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java index d930d23b8..574027c9b 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/PhpFoldingBuilder.java @@ -67,7 +67,7 @@ public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement psiElement, @Not attachRouteShortcuts(descriptors, stringLiteralExpressiones); } - return descriptors.toArray(new FoldingDescriptor[descriptors.size()]); + return descriptors.toArray(new FoldingDescriptor[0]); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java index 732805cff..bfb3ba8f5 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/ServiceSymbolContributor.java @@ -46,7 +46,7 @@ public NavigationItem[] getItemsByName(String serviceName, String s2, Project pr } } - return navigationItems.toArray(new NavigationItem[navigationItems.size()]); + return navigationItems.toArray(new NavigationItem[0]); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java index be4074938..f8f31f55e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/SymfonyCommandSymbolContributor.java @@ -50,7 +50,7 @@ public NavigationItem[] getItemsByName(String name, String s2, Project project, } } - return navigationItems.toArray(new NavigationItem[navigationItems.size()]); + return navigationItems.toArray(new NavigationItem[0]); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java index c2cf371d0..9a9321714 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TemplateFileContributor.java @@ -22,7 +22,7 @@ public String[] getNames(Project project, boolean b) { } Collection twigFileNames = TwigUtil.getTemplateMap(project).keySet(); - return twigFileNames.toArray(new String[twigFileNames.size()]); + return twigFileNames.toArray(new String[0]); } @NotNull diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java index 820fd0d73..e0cb78547 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/TwigFoldingBuilder.java @@ -50,7 +50,7 @@ public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement psiElement, @Not attachConstantFoldingDescriptors(psiElement, descriptors); } - return descriptors.toArray(new FoldingDescriptor[descriptors.size()]); + return descriptors.toArray(new FoldingDescriptor[0]); } private void attachTemplateFoldingDescriptors(PsiElement psiElement, List descriptors) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java index 0726d083b..6428af7e1 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/navigation/controller/TemplatesControllerRelatedGotoCollector.java @@ -20,9 +20,10 @@ public class TemplatesControllerRelatedGotoCollector implements ControllerAction public void collectGotoRelatedItems(ControllerActionGotoRelatedCollectorParameter parameter) { Set uniqueTemplates = new HashSet<>(); - PhpMethodVariableResolveUtil.visitRenderTemplateFunctions(parameter.getMethod(), triple -> { - uniqueTemplates.add(triple.getFirst()); - }); + PhpMethodVariableResolveUtil.visitRenderTemplateFunctions( + parameter.getMethod(), + triple -> uniqueTemplates.add(triple.getFirst()) + ); for (String uniqueTemplate : uniqueTemplates) { for(PsiFile templateTarget: TwigUtil.getTemplatePsiElements(parameter.getProject(), uniqueTemplate)) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java index 95a995e78..badc33431 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/reader/ReverseFileLineReader.java @@ -44,7 +44,7 @@ public String[] readLines() throws IOException { channel.close(); raf.close(); - return lines.toArray(new String[lines.size()]); + return lines.toArray(new String[0]); } private String readLine() throws IOException { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java index b8a052249..06d211e85 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/ui/ProfilerSettingsDialog.java @@ -18,8 +18,6 @@ import javax.swing.*; import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; /** * @author Daniel Espendiller diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java index d02663853..fcfee4760 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/utils/ProfilerUtil.java @@ -90,7 +90,7 @@ public static Collection createRequestsFromIndexHtml(@ } // we need at least this fields - if(!header.containsAll(Arrays.asList("token", "url"))) { + if(!new HashSet<>(header).containsAll(Arrays.asList("token", "url"))) { return Collections.emptyList(); } @@ -274,9 +274,9 @@ public static Map getRenderedElementTwigTemplates(@NotNull Proj continue; } - Integer count; + int count; try { - count = Integer.valueOf(stripHtmlTags(StringUtils.trim(tds[1].getValue().getText()))); + count = Integer.parseInt(stripHtmlTags(StringUtils.trim(tds[1].getValue().getText()))); } catch (NumberFormatException e) { count = 0; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java index 3674a499f..19dfe67d0 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java @@ -94,7 +94,7 @@ public static LookupElement[] getRouteParameterLookupElements(@NotNull Project p lookupElements.add(LookupElementBuilder.create("_fragment").withIcon(Symfony2Icons.ROUTE)); } - return lookupElements.toArray(new LookupElement[lookupElements.size()]); + return lookupElements.toArray(new LookupElement[0]); } @NotNull @@ -130,7 +130,7 @@ public static PsiElement[] getRouteParameterPsiElements(Project project, String } - return results.toArray(new PsiElement[results.size()]); + return results.toArray(new PsiElement[0]); } @@ -1147,7 +1147,7 @@ public static Collection getRouteNameTarget(@NotNull Project project private static String getRouteNamePrefix(@NotNull PhpClass phpClass) { PhpDocCommentAnnotation phpClassContainer = AnnotationUtil.getPhpDocCommentAnnotationContainer(phpClass.getDocComment()); if(phpClassContainer != null) { - PhpDocTagAnnotation firstPhpDocBlock = phpClassContainer.getFirstPhpDocBlock(ROUTE_CLASSES.toArray(new String[ROUTE_CLASSES.size()])); + PhpDocTagAnnotation firstPhpDocBlock = phpClassContainer.getFirstPhpDocBlock(ROUTE_CLASSES.toArray(new String[0])); if(firstPhpDocBlock != null) { String name = firstPhpDocBlock.getPropertyValue("name"); if(name != null && StringUtils.isNotBlank(name)) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java index 3db3bb36e..78bd77189 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteParameterReference.java @@ -34,7 +34,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) { results.add(new PsiElementResolveResult(psiParameter)); } - return results.toArray(new ResolveResult[results.size()]); + return results.toArray(new ResolveResult[0]); } @NotNull diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java index e242b103b..e067c9dc8 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/XmlLineMarkerProvider.java @@ -4,8 +4,6 @@ import com.intellij.codeInsight.daemon.LineMarkerProvider; import com.intellij.codeInsight.daemon.RelatedItemLineMarkerInfo; import com.intellij.codeInsight.navigation.NavigationGutterIconBuilder; -import com.intellij.icons.AllIcons; -import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.patterns.XmlPatterns; import com.intellij.patterns.XmlTagPattern; import com.intellij.psi.PsiElement; @@ -14,20 +12,14 @@ import com.intellij.psi.xml.XmlTag; import fr.adrienbrault.idea.symfony2plugin.Symfony2Icons; import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent; -import fr.adrienbrault.idea.symfony2plugin.config.ServiceLineMarkerProvider; import fr.adrienbrault.idea.symfony2plugin.config.xml.XmlHelper; -import fr.adrienbrault.idea.symfony2plugin.dic.container.util.ServiceContainerUtil; -import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils; import fr.adrienbrault.idea.symfony2plugin.util.resource.FileResourceUtil; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.List; -import java.util.function.Supplier; /** * @author Daniel Espendiller diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteGuessTypoQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteGuessTypoQuickFix.java index a7798b3b5..0c7523ec4 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteGuessTypoQuickFix.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/inspection/RouteGuessTypoQuickFix.java @@ -74,21 +74,19 @@ public void applyFix(@NotNull Project project, PsiFile psiFile, @Nullable Editor }); } else if (parent instanceof StringLiteralExpression) { // PHP + DocTag - suggestionSelected = selectedValue -> { - WriteCommandAction.runWriteCommandAction(project, "Route Suggestion", null, () -> { - String contents = parent.getText(); - String wrap = "'"; - if (contents.length() > 0) { - String wrap2 = contents.substring(0, 1); - if (wrap2.equals("\"") || wrap2.equals("'")) { - wrap = wrap2; - } + suggestionSelected = selectedValue -> WriteCommandAction.runWriteCommandAction(project, "Route Suggestion", null, () -> { + String contents = parent.getText(); + String wrap = "'"; + if (contents.length() > 0) { + String wrap2 = contents.substring(0, 1); + if (wrap2.equals("\"") || wrap2.equals("'")) { + wrap = wrap2; } + } - StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); - parent.replace(firstFromText); - }); - }; + StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); + parent.replace(firstFromText); + }); } if (suggestionSelected == null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java index 2886acfd5..1f9d52c06 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java @@ -148,7 +148,7 @@ public static PsiElement[] findServiceDefinitions(@Nullable PhpClass phpClass) { psiElements.addAll(findServiceDefinitions(phpClass.getProject(), serviceName)); } - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } @Nullable diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java index 46de95e95..8dbc9bbee 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/cache/FileIndexCaches.java @@ -7,7 +7,6 @@ import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; -import com.intellij.psi.util.PsiModificationTracker; import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.ID; import fr.adrienbrault.idea.symfony2plugin.stubs.SymfonyProcessors; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java index fb9cac761..d61afc601 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TranslationStubIndex.java @@ -3,7 +3,6 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; @@ -18,7 +17,6 @@ import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil; import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil; import gnu.trove.THashMap; -import kotlin.Pair; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; @@ -29,7 +27,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.*; -import java.util.function.Consumer; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java index 1d66606ce..02572eccb 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigControllerStubIndex.java @@ -1,9 +1,6 @@ package fr.adrienbrault.idea.symfony2plugin.stubs.indexes; -import com.intellij.openapi.util.Pair; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.util.Consumer; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; import com.intellij.util.io.EnumeratorStringDescriptor; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java index 95347c9fc..8cb3388f3 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/TwigMacroFunctionStubIndex.java @@ -1,9 +1,6 @@ package fr.adrienbrault.idea.symfony2plugin.stubs.indexes; -import com.intellij.openapi.util.Pair; -import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.util.Consumer; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; import com.intellij.util.io.EnumeratorStringDescriptor; @@ -13,7 +10,6 @@ import fr.adrienbrault.idea.symfony2plugin.Symfony2ProjectComponent; import fr.adrienbrault.idea.symfony2plugin.stubs.dict.TwigMacroTagIndex; import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.externalizer.ObjectStreamDataExternalizer; -import fr.adrienbrault.idea.symfony2plugin.templating.dict.TwigMacroTag; import fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java index 94ca4cffa..5a34b587e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigPattern.java @@ -923,7 +923,7 @@ public static ElementPattern getTwigTypeDocBlockPattern() { patterns.add(PlatformPatterns.psiElement(TwigTokenTypes.COMMENT_TEXT).withText(PlatformPatterns.string().matches(s)).withLanguage(TwigLanguage.INSTANCE)); } - return PlatformPatterns.or(patterns.toArray(new ElementPattern[patterns.size()])); + return PlatformPatterns.or(patterns.toArray(new ElementPattern[0])); } /** @@ -1144,7 +1144,7 @@ static ElementPattern getApplyFilterPattern() { PlatformPatterns.psiElement(PsiWhiteSpace.class), PlatformPatterns.psiElement(TwigTokenTypes.WHITE_SPACE) ), - PlatformPatterns.psiElement(TwigTokenTypes.TAG_NAME).with(new PatternCondition("aa") { + PlatformPatterns.psiElement(TwigTokenTypes.TAG_NAME).with(new PatternCondition<>("aa") { @Override public boolean accepts(@NotNull PsiElement psiElement, ProcessingContext processingContext) { return "apply".equalsIgnoreCase(psiElement.getText()); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java index 43b8a7356..0bb71a22d 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java @@ -85,14 +85,14 @@ public TwigTemplateCompletionContributor() { extend( CompletionType.BASIC, TwigPattern.getTranslationKeyPattern("trans", "transchoice"), - new CompletionProvider() { + new CompletionProvider<>() { public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } PsiElement psiElement = parameters.getPosition(); - String domainName = TwigUtil.getPsiElementTranslationDomain(psiElement); + String domainName = TwigUtil.getPsiElementTranslationDomain(psiElement); resultSet.addAllElements(TranslationUtil.getTranslationLookupElementsOnDomain(psiElement.getProject(), domainName)); } @@ -104,13 +104,13 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC extend( CompletionType.BASIC, TwigPattern.getTransDomainPattern(), - new CompletionProvider() { + new CompletionProvider<>() { public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } - if(PsiElementUtils.getPrevSiblingOfType(parameters.getPosition(), PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER).withText(PlatformPatterns.string().oneOf("trans", "transchoice"))) == null) { + if (PsiElementUtils.getPrevSiblingOfType(parameters.getPosition(), PlatformPatterns.psiElement(TwigTokenTypes.IDENTIFIER).withText(PlatformPatterns.string().oneOf("trans", "transchoice"))) == null) { return; } @@ -189,11 +189,11 @@ private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collec extend( CompletionType.BASIC, TwigPattern.getApplyFilterPattern(), - new CompletionProvider() { + new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters completionParameters, @NotNull ProcessingContext processingContext, @NotNull CompletionResultSet completionResultSet) { Project project = completionParameters.getPosition().getProject(); - for(Map.Entry entry : TwigExtensionParser.getFilters(project).entrySet()) { + for (Map.Entry entry : TwigExtensionParser.getFilters(project).entrySet()) { completionResultSet.addElement(new TwigExtensionLookupElement(project, entry.getKey(), entry.getValue())); } } @@ -264,18 +264,18 @@ public void addCompletions(@NotNull CompletionParameters parameters, @NotNull Pr extend( CompletionType.BASIC, TwigPattern.getVariableTypePattern(), - new CompletionProvider() { + new CompletionProvider<>() { public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } PsiElement psiElement = parameters.getOriginalPosition(); - if(psiElement == null) { + if (psiElement == null) { return; } - for(Map.Entry entry: TwigTypeResolveUtil.collectScopeVariables(parameters.getOriginalPosition()).entrySet()) { + for (Map.Entry entry : TwigTypeResolveUtil.collectScopeVariables(parameters.getOriginalPosition()).entrySet()) { resultSet.addElement(LookupElementBuilder.create(entry.getKey()).withTypeText(TwigTypeResolveUtil.getTypeDisplayName(psiElement.getProject(), entry.getValue().getTypes())).withIcon(PhpIcons.CLASS)); } } @@ -413,15 +413,15 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC extend( CompletionType.BASIC, TwigPattern.getPrintBlockOrTagFunctionPattern("constant"), - new CompletionProvider() { + new CompletionProvider<>() { public void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext context, @NotNull CompletionResultSet resultSet) { PsiElement position = parameters.getPosition(); - if(!Symfony2ProjectComponent.isEnabled(position)) { + if (!Symfony2ProjectComponent.isEnabled(position)) { return; } PhpIndex instance = PhpIndex.getInstance(position.getProject()); - for(String constant : instance.getAllConstantNames(PrefixMatcher.ALWAYS_TRUE)) { + for (String constant : instance.getAllConstantNames(PrefixMatcher.ALWAYS_TRUE)) { resultSet.addElement(LookupElementBuilder.create(constant).withIcon(PhpIcons.CONSTANT)); } @@ -429,9 +429,9 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC String before = position.getText().substring(0, foo); String[] parts = before.split("::"); - if(parts.length >= 1) { + if (parts.length >= 1) { PhpClass phpClass = PhpElementsUtil.getClassInterface(position.getProject(), parts[0].replace("\\\\", "\\")); - if(phpClass != null) { + if (phpClass != null) { phpClass.getFields().stream().filter(Field::isConstant).forEach(field -> resultSet.addElement(LookupElementBuilder.create(phpClass.getPresentableFQN().replace("\\", "\\\\") + "::" + field.getName()).withIcon(PhpIcons.CONSTANT)) ); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java index 006d58c02..e0b36951f 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/completion/TwigHtmlCompletionContributor.java @@ -2,7 +2,6 @@ import com.intellij.codeInsight.completion.*; import com.intellij.codeInsight.lookup.LookupElement; -import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.patterns.ElementPattern; import com.intellij.patterns.PlatformPatterns; import com.intellij.psi.PsiElement; @@ -51,29 +50,29 @@ public TwigHtmlCompletionContributor() { TwigHtmlCompletionUtil.getHrefAttributePattern(), TwigHtmlCompletionUtil.getFormActionAttributePattern() ), - new CompletionProvider() { - @Override - protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { - return; - } + new CompletionProvider<>() { + @Override + protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + return; + } - List routesLookupElements = RouteHelper.getRoutesLookupElements(parameters.getPosition().getProject()); - for(LookupElement element: routesLookupElements) { - if(element instanceof RouteLookupElement) { - ((RouteLookupElement) element).withInsertHandler(TwigPathFunctionInsertHandler.getInstance()); + List routesLookupElements = RouteHelper.getRoutesLookupElements(parameters.getPosition().getProject()); + for (LookupElement element : routesLookupElements) { + if (element instanceof RouteLookupElement) { + ((RouteLookupElement) element).withInsertHandler(TwigPathFunctionInsertHandler.getInstance()); + } } - } - resultSet.addAllElements(routesLookupElements); - } - }); + resultSet.addAllElements(routesLookupElements); + } + }); // - extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetCssAttributePattern(), new CompletionProvider() { + extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetCssAttributePattern(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } @@ -84,10 +83,10 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi }); // - extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetJsAttributePattern(), new CompletionProvider() { + extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetJsAttributePattern(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } @@ -98,10 +97,10 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi }); // - extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetImageAttributePattern(), new CompletionProvider() { + extend(CompletionType.BASIC, TwigHtmlCompletionUtil.getAssetImageAttributePattern(), new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { - if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { + if (!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) { return; } @@ -114,11 +113,11 @@ protected void addCompletions(@NotNull CompletionParameters parameters, Processi // // "> // value""> - extend(CompletionType.BASIC, TWIG_TRANSLATIONS, new CompletionProvider() { + extend(CompletionType.BASIC, TWIG_TRANSLATIONS, new CompletionProvider<>() { @Override protected void addCompletions(@NotNull CompletionParameters parameters, ProcessingContext processingContext, @NotNull CompletionResultSet resultSet) { PsiElement position = parameters.getOriginalPosition(); - if(position == null || !Symfony2ProjectComponent.isEnabled(position)) { + if (position == null || !Symfony2ProjectComponent.isEnabled(position)) { return; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java index 8c9bb3247..be5157df1 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigCreateContainer.java @@ -62,7 +62,7 @@ public Collection getBlockNames(int limit) { private static > Map sortByValue(Map map ) { List> list = new LinkedList<>(map.entrySet()); - list.sort(Comparator.comparing(o -> (o.getValue()))); + list.sort(Map.Entry.comparingByValue()); Collections.reverse(list); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java index 8721694be..b09514ea0 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigExtensionLookupElement.java @@ -90,7 +90,7 @@ private void buildTailText(@NotNull LookupElementPresentation presentation) { parameters.remove(0); } - presentation.setTailText(PhpPresentationUtil.formatParameters(null, parameters.toArray(new Parameter[parameters.size()])).toString(), true); + presentation.setTailText(PhpPresentationUtil.formatParameters(null, parameters.toArray(new Parameter[0])).toString(), true); } } } \ No newline at end of file diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateGuessTypoQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateGuessTypoQuickFix.java index 549c60af6..bdf165ea3 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateGuessTypoQuickFix.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/inspection/TemplateGuessTypoQuickFix.java @@ -76,21 +76,19 @@ public void applyFix(@NotNull Project project, PsiFile psiFile, @Nullable Editor }); } else if (parent instanceof StringLiteralExpression) { // PHP + DocTag - templateSuggestion = selectedValue -> { - WriteCommandAction.runWriteCommandAction(project, "Template Suggestion", null, () -> { - String contents = parent.getText(); - String wrap = "'"; - if (contents.length() > 0) { - String wrap2 = contents.substring(0, 1); - if (wrap2.equals("\"") || wrap2.equals("'")) { - wrap = wrap2; - } + templateSuggestion = selectedValue -> WriteCommandAction.runWriteCommandAction(project, "Template Suggestion", null, () -> { + String contents = parent.getText(); + String wrap = "'"; + if (contents.length() > 0) { + String wrap2 = contents.substring(0, 1); + if (wrap2.equals("\"") || wrap2.equals("'")) { + wrap = wrap2; } + } - StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); - parent.replace(firstFromText); - }); - }; + StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); + parent.replace(firstFromText); + }); } if (templateSuggestion == null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java index 5e2de7082..2f90502de 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigTypeResolveUtil.java @@ -341,7 +341,7 @@ private static Set collectIteratorReturns(@NotNull PsiElement psiElement private static Collection collectForArrayScopeVariablesFoo(@NotNull Project project, @NotNull Collection typeName, @NotNull PsiVariable psiVariable) { Collection previousElements = psiVariable.getTypes(); - String[] strings = typeName.toArray(new String[typeName.size()]); + String[] strings = typeName.toArray(new String[0]); for (int i = 1; i <= strings.length - 1; i++ ) { previousElements = resolveTwigMethodName(project, previousElements, strings[i]); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java index 082b04dc6..d72536faa 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java @@ -1464,12 +1464,12 @@ public static String getTwigMethodString(@Nullable PsiElement transPsiElement) { ElementPattern pattern = PlatformPatterns.psiElement(TwigTokenTypes.RBRACE); - String currentText = transPsiElement.getText(); + StringBuilder currentText = new StringBuilder(transPsiElement.getText()); for (PsiElement child = transPsiElement.getNextSibling(); child != null; child = child.getNextSibling()) { - currentText = currentText + child.getText(); + currentText.append(child.getText()); if (pattern.accepts(child)) { //noinspection unchecked - return currentText; + return currentText.toString(); } } @@ -2096,16 +2096,16 @@ private static TwigCreateContainer getOnCreateTemplateElements(@NotNull final Pr final TwigCreateContainer containerElement = new TwigCreateContainer(); - VfsUtil.processFilesRecursively(startDirectory, new Processor() { + VfsUtil.processFilesRecursively(startDirectory, new Processor<>() { @Override public boolean process(VirtualFile virtualFile) { - if(virtualFile.getFileType() != TwigFileType.INSTANCE) { + if (virtualFile.getFileType() != TwigFileType.INSTANCE) { return true; } PsiFile twigFile = PsiManager.getInstance(project).findFile(virtualFile); - if(twigFile instanceof TwigFile) { + if (twigFile instanceof TwigFile) { collect((TwigFile) twigFile); } @@ -2113,16 +2113,16 @@ public boolean process(VirtualFile virtualFile) { } private void collect(TwigFile twigFile) { - for(PsiElement psiElement: twigFile.getChildren()) { - if(psiElement instanceof TwigExtendsTag) { + for (PsiElement psiElement : twigFile.getChildren()) { + if (psiElement instanceof TwigExtendsTag) { for (String s : getTwigExtendsTagTemplates((TwigExtendsTag) psiElement)) { containerElement.addExtend(s); } - } else if(psiElement.getNode().getElementType() == TwigElementTypes.BLOCK_STATEMENT) { + } else if (psiElement.getNode().getElementType() == TwigElementTypes.BLOCK_STATEMENT) { PsiElement blockTag = psiElement.getFirstChild(); - if(blockTag instanceof TwigBlockTag) { + if (blockTag instanceof TwigBlockTag) { String name = ((TwigBlockTag) blockTag).getName(); - if(StringUtils.isNotBlank(name)) { + if (StringUtils.isNotBlank(name)) { containerElement.addBlock(name); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java index 31e2a8f92..d06214478 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/collector/IncludeVariableCollector.java @@ -101,8 +101,9 @@ private void collectIncludeContextVars(IElementType iElementType, PsiElement tag // include('template.html', with_context = false) // include('template.html', {foo: 'bar'}, with_context = false) for (int i = 1; i < group.length; i++) { - if(group[i].equals("with_context=false")) { + if (group[i].equals("with_context=false")) { addContextVar = false; + break; } } } @@ -119,9 +120,7 @@ private void collectIncludeContextVars(IElementType iElementType, PsiElement tag // add context vars if(addContextVar) { - for(Map.Entry entry: stringPsiVariableHashMap.entrySet()) { - variables.put(entry.getKey(), entry.getValue()); - } + variables.putAll(stringPsiVariableHashMap); } // add alias vars diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java index 50f15e097..2d6b63770 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/variable/resolver/FormVarsResolver.java @@ -22,8 +22,8 @@ public void resolve(Collection targets, Collection lastTwigTypeContainer = null; - for (Iterator collectionItr = previousElements.iterator(); collectionItr.hasNext(); ) { - lastTwigTypeContainer = (List) collectionItr.next(); + for (List element : previousElements) { + lastTwigTypeContainer = element; } for(TwigTypeContainer twigTypeContainer: lastTwigTypeContainer) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java index d05c98928..18595506c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/PhpTranslationKeyInspection.java @@ -12,7 +12,6 @@ import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil; import fr.adrienbrault.idea.symfony2plugin.translation.inspection.TranslationKeyGuessTypoQuickFix; import fr.adrienbrault.idea.symfony2plugin.translation.inspection.TwigTranslationKeyInspection; -import fr.adrienbrault.idea.symfony2plugin.util.ParameterBag; import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil; import fr.adrienbrault.idea.symfony2plugin.util.PsiElementUtils; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java index 5dfe3b83d..2c1c41f5e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReference.java @@ -35,7 +35,7 @@ public ResolveResult[] multiResolve(boolean incompleteCode) { results.add(new PsiElementResolveResult(psiElement)); } - return results.toArray(new ResolveResult[results.size()]); + return results.toArray(new ResolveResult[0]); } @NotNull diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationDomainGuessTypoQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationDomainGuessTypoQuickFix.java index 42710e403..02492f967 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationDomainGuessTypoQuickFix.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationDomainGuessTypoQuickFix.java @@ -82,21 +82,19 @@ public void applyFix(@NotNull Project project, PsiFile psiFile, @Nullable Editor }); } else if (parent instanceof StringLiteralExpression) { // PHP + DocTag - suggestionSelected = selectedValue -> { - WriteCommandAction.runWriteCommandAction(project, "Translation Domain Suggestion", null, () -> { - String contents = parent.getText(); - String wrap = "'"; - if (contents.length() > 0) { - String wrap2 = contents.substring(0, 1); - if (wrap2.equals("\"") || wrap2.equals("'")) { - wrap = wrap2; - } + suggestionSelected = selectedValue -> WriteCommandAction.runWriteCommandAction(project, "Translation Domain Suggestion", null, () -> { + String contents = parent.getText(); + String wrap = "'"; + if (contents.length() > 0) { + String wrap2 = contents.substring(0, 1); + if (wrap2.equals("\"") || wrap2.equals("'")) { + wrap = wrap2; } + } - StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); - parent.replace(firstFromText); - }); - }; + StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); + parent.replace(firstFromText); + }); } if (suggestionSelected == null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationKeyGuessTypoQuickFix.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationKeyGuessTypoQuickFix.java index df85d97f3..a5928e392 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationKeyGuessTypoQuickFix.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/inspection/TranslationKeyGuessTypoQuickFix.java @@ -84,21 +84,19 @@ public void applyFix(@NotNull Project project, PsiFile psiFile, @Nullable Editor }); } else if (parent instanceof StringLiteralExpression) { // PHP + DocTag - suggestionSelected = selectedValue -> { - WriteCommandAction.runWriteCommandAction(project, "Translation Key Suggestion", null, () -> { - String contents = parent.getText(); - String wrap = "'"; - if (contents.length() > 0) { - String wrap2 = contents.substring(0, 1); - if (wrap2.equals("\"") || wrap2.equals("'")) { - wrap = wrap2; - } + suggestionSelected = selectedValue -> WriteCommandAction.runWriteCommandAction(project, "Translation Key Suggestion", null, () -> { + String contents = parent.getText(); + String wrap = "'"; + if (contents.length() > 0) { + String wrap2 = contents.substring(0, 1); + if (wrap2.equals("\"") || wrap2.equals("'")) { + wrap = wrap2; } + } - StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); - parent.replace(firstFromText); - }); - }; + StringLiteralExpression firstFromText = PhpPsiElementFactory.createFirstFromText(project, StringLiteralExpression.class, wrap + selectedValue + wrap); + parent.replace(firstFromText); + }); } if (suggestionSelected == null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java index b711c490e..d82f94186 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/util/TranslationInsertUtil.java @@ -16,6 +16,7 @@ import org.jetbrains.yaml.psi.YAMLFile; import org.jetbrains.yaml.psi.YAMLKeyValue; +import java.util.Objects; import java.util.function.Function; /** @@ -115,12 +116,8 @@ public static XmlTag invokeTranslation(@NotNull final XmlFile xmlFile, @NotNull // version="2.0" XmlTag group = file.findFirstSubTag("group"); - if(group != null) { - return func20.apply(group); - } else { - // version="2.0" shortcut - return func20.apply(file); - } + // version="2.0" shortcut + return func20.apply(Objects.requireNonNullElse(group, file)); } return null; @@ -135,9 +132,9 @@ private static int getIdForNewXlfUnit(@NotNull XmlTag body, @NotNull String subT continue; } - Integer integer; + int integer; try { - integer = Integer.valueOf(id); + integer = Integer.parseInt(id); } catch (NumberFormatException e) { continue; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java index dbc07f694..f2d0a37ef 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/assets/TwigNamedAssetsServiceParser.java @@ -49,7 +49,7 @@ public void parser(InputStream file) { } } - namedAssets.put(key, files.toArray(new String[files.size()])); + namedAssets.put(key, files.toArray(new String[0])); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java index 3a9264abd..5ef6baa9a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/twig/utils/TwigFileUtil.java @@ -24,7 +24,7 @@ public class TwigFileUtil { */ @NotNull public static Collection collectParentFiles(boolean includeSelf, @NotNull Collection psiFiles) { - return collectParentFiles(includeSelf, psiFiles.toArray(new PsiFile[psiFiles.size()])); + return collectParentFiles(includeSelf, psiFiles.toArray(new PsiFile[0])); } /** diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java index d3b398570..08a47a2fd 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/ContainerSettingsForm.java @@ -3,7 +3,6 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.highlighter.XmlFileType; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java index bae89f90a..9ce087b2f 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodParameterReferenceSettingsForm.java @@ -84,7 +84,7 @@ public String getHelpTopic() { @Nullable @Override public JComponent createComponent() { - ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer() { + ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer<>() { @Override public MethodParameterSetting createElement() { //IdeFocusManager.getInstance(TwigSettingsForm.this.project).requestFocus(TwigNamespaceDialog.getWindows(), true); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java index 2d84b5b67..7b15d75cd 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/MethodSignatureTypeSettingsForm.java @@ -96,7 +96,7 @@ public String getHelpTopic() { @Nullable @Override public JComponent createComponent() { - ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer() { + ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer<>() { @Override public MethodSignatureSetting createElement() { //IdeFocusManager.getInstance(TwigSettingsForm.this.project).requestFocus(TwigNamespaceDialog.getWindows(), true); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java index e2e652a59..19eb28b77 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/RoutingSettingsForm.java @@ -96,7 +96,7 @@ public String getHelpTopic() { @Nullable @Override public JComponent createComponent() { - ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer() { + ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer<>() { @Override public RoutingFile createElement() { return null; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java index cc5168617..82fa1b997 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.java @@ -114,7 +114,7 @@ public void mouseClicked(MouseEvent e) { } }); - ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer() { + ToolbarDecorator tablePanel = ToolbarDecorator.createDecorator(this.tableView, new ElementProducer<>() { @Override public TwigPath createElement() { //IdeFocusManager.getInstance(TwigSettingsForm.this.project).requestFocus(TwigNamespaceDialog.getWindows(), true); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java index 00acd04de..185cf6aeb 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/AnnotationBackportUtil.java @@ -24,7 +24,7 @@ */ public class AnnotationBackportUtil { - public static Set NON_ANNOTATION_TAGS = new HashSet() {{ + public static Set NON_ANNOTATION_TAGS = new HashSet<>() {{ addAll(Arrays.asList(PhpDocUtil.ALL_TAGS)); add("@Annotation"); add("@inheritDoc"); @@ -80,11 +80,7 @@ public static Map getUseImportMap(@NotNull PhpDocComment phpDocC for (PhpUseList phpUseList : PhpCodeInsightUtil.collectImports(scope)) { for (PhpUse phpUse : phpUseList.getDeclarations()) { String alias = phpUse.getAliasName(); - if (alias != null) { - useImports.put(alias, phpUse.getFQN()); - } else { - useImports.put(phpUse.getName(), phpUse.getFQN()); - } + useImports.put(Objects.requireNonNullElseGet(alias, phpUse::getName), phpUse.getFQN()); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java index c6f629a02..78e8a9134 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/EventSubscriberUtil.java @@ -18,7 +18,6 @@ import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java index c327b4c2e..93a6d5832 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java @@ -307,7 +307,7 @@ static public PsiElement[] getPsiElementsBySignature(@NotNull Project project, @ } Collection phpNamedElementCollections = PhpIndex.getInstance(project).getBySignature(signature, null, 0); - return phpNamedElementCollections.toArray(new PsiElement[phpNamedElementCollections.size()]); + return phpNamedElementCollections.toArray(new PsiElement[0]); } @Nullable @@ -842,7 +842,7 @@ static private PsiElement getArrayKeyValueInsideSignaturePsi(Project project, St public static Method[] getImplementedMethods(@NotNull Method method) { ArrayList items = getImplementedMethods(method.getContainingClass(), method, new ArrayList<>(), new HashSet<>()); - return items.toArray(new Method[items.size()]); + return items.toArray(new Method[0]); } private static ArrayList getImplementedMethods(@Nullable PhpClass phpClass, @NotNull Method method, ArrayList implementedMethods, Set visitedClasses) { @@ -918,20 +918,20 @@ private static String getStringValue(@Nullable PsiElement psiElement, int depth) } public static String getPrevSiblingAsTextUntil(PsiElement psiElement, ElementPattern pattern, boolean includeMatching) { - String prevText = ""; + StringBuilder prevText = new StringBuilder(); for (PsiElement child = psiElement.getPrevSibling(); child != null; child = child.getPrevSibling()) { if(pattern.accepts(child)) { if(includeMatching) { return child.getText() + prevText; } - return prevText; + return prevText.toString(); } else { - prevText = child.getText() + prevText; + prevText.insert(0, child.getText()); } } - return prevText; + return prevText.toString(); } public static String getPrevSiblingAsTextUntil(PsiElement psiElement, ElementPattern pattern) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java index 2a23e1545..1a3edbfea 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java @@ -16,7 +16,6 @@ import com.jetbrains.php.lang.PhpLanguage; import com.jetbrains.php.lang.lexer.PhpTokenTypes; import com.jetbrains.php.lang.psi.elements.*; -import fr.adrienbrault.idea.symfony2plugin.translation.dict.TranslationUtil; import fr.adrienbrault.idea.symfony2plugin.util.yaml.YamlHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/YamlKeywordsCompletionProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/YamlKeywordsCompletionProvider.java index 85702c3e5..33983d75b 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/YamlKeywordsCompletionProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/YamlKeywordsCompletionProvider.java @@ -18,7 +18,7 @@ * @author Thomas Schulz */ public class YamlKeywordsCompletionProvider extends CompletionProvider { - private final static Map YAML_KEYWORDS = new HashMap() {{ + private final static Map YAML_KEYWORDS = new HashMap<>() {{ put("~", "null"); put("null", "null"); put("true", "bool"); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java index 67a1b0031..f6024ee32 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/dict/ServiceUtil.java @@ -102,7 +102,7 @@ public class ServiceUtil { * * TODO: replace with live fetch; now redundant because of @Event const in Symfony itself */ - public static final Map TAGS = new HashMap() {{ + public static final Map TAGS = new HashMap<>() {{ put("kernel.request", "\\Symfony\\Component\\HttpKernel\\Event\\GetResponseEvent"); put("kernel.view", "\\Symfony\\Component\\HttpKernel\\Event\\GetResponseForControllerResultEvent"); put("kernel.controller", "\\Symfony\\Component\\HttpKernel\\Event\\FilterControllerEvent"); @@ -612,7 +612,7 @@ public static Collection getParameterParameters(@NotNull Project project private static Collection getParameterParametersInner(@NotNull Project project) { Collection parameters = new HashSet<>(); - Collection phpClasses = new HashSet() {{ + Collection phpClasses = new HashSet<>() {{ addAll(PhpIndex.getInstance(project).getAnyByFQN("Symfony\\Component\\HttpKernel\\Kernel")); addAll(PhpIndex.getInstance(project).getAllSubclasses("Symfony\\Component\\HttpKernel\\Kernel")); }}; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java index 5e0a2835f..985da358b 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java @@ -72,7 +72,7 @@ static public PsiElement[] getChildrenFix(PsiElement psiElement) { PsiElement startElement = psiElement.getFirstChild(); if(startElement == null) { - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } psiElements.add(startElement); @@ -81,7 +81,7 @@ static public PsiElement[] getChildrenFix(PsiElement psiElement) { psiElements.add(child); } - return psiElements.toArray(new PsiElement[psiElements.size()]); + return psiElements.toArray(new PsiElement[0]); } /** @@ -1208,14 +1208,11 @@ public static Boolean getYamlKeyValueAsBoolean(@NotNull YAMLKeyValue yamlKeyValu } String textValue = ((YAMLScalar) value).getTextValue().toLowerCase(); - switch (textValue) { - case "false": - return false; - case "true": - return true; - default: - return null; - } + return switch (textValue) { + case "false" -> false; + case "true" -> true; + default -> null; + }; } /** 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 000c08f5e..193423312 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyLightCodeInsightFixtureTestCase.java @@ -176,7 +176,7 @@ public void assertNavigationContains(PsiElement psiElement, String targetShortcu targetShortcut = "\\" + targetShortcut; } - Set classTargets = new HashSet(); + Set classTargets = new HashSet<>(); for (GotoDeclarationHandler gotoDeclarationHandler : Extensions.getExtensions(GotoDeclarationHandler.EP_NAME)) { PsiElement[] gotoDeclarationTargets = gotoDeclarationHandler.getGotoDeclarationTargets(psiElement, 0, myFixture.getEditor()); @@ -255,7 +255,7 @@ private void assertNavigationMatch(ElementPattern pattern) { PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset()); - Set targetStrings = new HashSet(); + Set targetStrings = new HashSet<>(); for (GotoDeclarationHandler gotoDeclarationHandler : Extensions.getExtensions(GotoDeclarationHandler.EP_NAME)) { @@ -279,7 +279,7 @@ public void assertNavigationContainsFile(LanguageFileType languageFileType, Stri myFixture.configureByText(languageFileType, configureByText); PsiElement psiElement = myFixture.getFile().findElementAt(myFixture.getCaretOffset()); - Set targets = new HashSet(); + Set targets = new HashSet<>(); for (GotoDeclarationHandler gotoDeclarationHandler : Extensions.getExtensions(GotoDeclarationHandler.EP_NAME)) { PsiElement[] gotoDeclarationTargets = gotoDeclarationHandler.getGotoDeclarationTargets(psiElement, 0, myFixture.getEditor()); @@ -441,14 +441,11 @@ public void assertIndexNotContains(@NotNull ID id, @NotNull String... public void assertIndex(@NotNull ID id, boolean notCondition, @NotNull String... keys) { for (String key : keys) { - final Collection virtualFiles = new ArrayList(); + final Collection virtualFiles = new ArrayList<>(); - FileBasedIndex.getInstance().getFilesWithKey(id, new HashSet(Collections.singletonList(key)), new Processor() { - @Override - public boolean process(VirtualFile virtualFile) { - virtualFiles.add(virtualFile); - return true; - } + FileBasedIndex.getInstance().getFilesWithKey(id, new HashSet<>(Collections.singletonList(key)), virtualFile -> { + virtualFiles.add(virtualFile); + return true; }, GlobalSearchScope.allScope(getProject())); if(notCondition && virtualFiles.size() > 0) { @@ -475,7 +472,7 @@ public void assertIndexContainsKeyWithValue(@NotNull ID id, @NotN } public void assertLocalInspectionContains(String filename, String content, String contains) { - Set matches = new HashSet(); + Set matches = new HashSet<>(); Pair, Integer> localInspectionsAtCaret = getLocalInspectionsAtCaret(filename, content); for (ProblemDescriptor result : localInspectionsAtCaret.getFirst()) { @@ -491,7 +488,7 @@ public void assertLocalInspectionContains(String filename, String content, Strin } public void assertAnnotationContains(String filename, String content, String contains) { - List matches = new ArrayList(); + List matches = new ArrayList<>(); for (Annotation annotation : getAnnotationsAtCaret(filename, content)) { matches.add(annotation.toString()); if(annotation.getMessage().contains(contains)) { @@ -612,7 +609,7 @@ public void assertLineMarker(@NotNull PsiElement psiElement, @NotNull LineMarker final List elements = collectPsiElementsRecursive(psiElement); for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.getInstance().allForLanguage(psiElement.getLanguage())) { - Collection lineMarkerInfos = new ArrayList(); + Collection lineMarkerInfos = new ArrayList<>(); lineMarkerProvider.collectSlowLineMarkers(elements, lineMarkerInfos); if(lineMarkerInfos.size() == 0) { @@ -634,7 +631,7 @@ public void assertLineMarkerIsEmpty(@NotNull PsiElement psiElement) { final List elements = collectPsiElementsRecursive(psiElement); for (LineMarkerProvider lineMarkerProvider : LineMarkerProviders.getInstance().allForLanguage(psiElement.getLanguage())) { - Collection lineMarkerInfos = new ArrayList(); + Collection lineMarkerInfos = new ArrayList<>(); lineMarkerProvider.collectSlowLineMarkers(elements, lineMarkerInfos); if(lineMarkerInfos.size() > 0) { @@ -700,7 +697,7 @@ private void assertReferences(@NotNull ElementPattern pattern, PsiElement psi @NotNull private List collectPsiElementsRecursive(@NotNull PsiElement psiElement) { - final List elements = new ArrayList(); + final List elements = new ArrayList<>(); elements.add(psiElement.getContainingFile()); psiElement.acceptChildren(new PsiRecursiveElementVisitor() { @@ -823,41 +820,33 @@ public MyLookupElementConditionalInsertRunnable(@NotNull LookupElementInsert.Ass @Override public void run() { - CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() { - @Override - public void run() { - final CodeCompletionHandlerBase handler = new CodeCompletionHandlerBase(CompletionType.BASIC) { - - @Override - protected void completionFinished(final CompletionProgressIndicator indicator, boolean hasModifiers) { - - // find our lookup element - final LookupElement lookupElement = ContainerUtil.find(indicator.getLookup().getItems(), new Condition() { - @Override - public boolean value(LookupElement lookupElement) { - return insert.match(lookupElement); - } - }); - - if(lookupElement == null) { - fail("No matching lookup element found"); - } - - // overwrite behavior and force completion + insertHandler - CommandProcessor.getInstance().executeCommand(indicator.getProject(), new Runnable() { - @Override - public void run() { - CommandProcessor.getInstance().setCurrentCommandGroupId("Completion" + indicator.hashCode()); - indicator.getLookup().finishLookup(Lookup.AUTO_INSERT_SELECT_CHAR, lookupElement); - } - }, "Autocompletion", null); + CommandProcessor.getInstance().executeCommand(getProject(), () -> { + final CodeCompletionHandlerBase handler = new CodeCompletionHandlerBase(CompletionType.BASIC) { + + @Override + protected void completionFinished(final CompletionProgressIndicator indicator, boolean hasModifiers) { + + // find our lookup element + final LookupElement lookupElement = ContainerUtil.find( + indicator.getLookup().getItems(), + insert::match + ); + + if(lookupElement == null) { + fail("No matching lookup element found"); } - }; - Editor editor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile()); - handler.invokeCompletion(getProject(), editor); - PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); - } + // overwrite behavior and force completion + insertHandler + CommandProcessor.getInstance().executeCommand(indicator.getProject(), () -> { + CommandProcessor.getInstance().setCurrentCommandGroupId("Completion" + indicator.hashCode()); + indicator.getLookup().finishLookup(Lookup.AUTO_INSERT_SELECT_CHAR, lookupElement); + }, "Autocompletion", null); + } + }; + + Editor editor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(getEditor(), getFile()); + handler.invokeCompletion(getProject(), editor); + PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); }, null, null); } } diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java index 4216be4a9..755394c6c 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/SymfonyTempCodeInsightFixtureTestCase.java @@ -77,7 +77,7 @@ protected VirtualFile[] createFiles(@NotNull String... files) { virtualFiles.add(createFile(file)); } - return virtualFiles.toArray(new VirtualFile[virtualFiles.size()]); + return virtualFiles.toArray(new VirtualFile[0]); } protected VirtualFile createFile(@NotNull String file, @Nullable String content) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java index 61c60df72..526de2d57 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java @@ -67,10 +67,10 @@ public void testThatTemplateInsideRouteDefaultKeyCompletedAndNavigable() { } public void testThatDecoratesServiceTagProvidesReferences() { - Collection strings = new ArrayList() {{ - add(new String[] {"", "foo.bar_factory"}); - add(new String[] {"''", "'foo.bar_factory'"}); - add(new String[] {"\"\"", "\"foo.bar_factory\""}); + Collection strings = new ArrayList<>() {{ + add(new String[]{"", "foo.bar_factory"}); + add(new String[]{"''", "'foo.bar_factory'"}); + add(new String[]{"\"\"", "\"foo.bar_factory\""}); }}; for (String[] s : strings) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java index 8b8b4c4a1..d553e0f1d 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/ServiceLineMarkerProviderTest.java @@ -129,7 +129,7 @@ public void testYamlServiceLineMarker() { "namespace Service{\n" + " class YamlBar{}\n" + "}" - ), new LineMarker.TargetAcceptsPattern("Navigate to definition", PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + ), new LineMarker.TargetAcceptsPattern("Navigate to definition", PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext processingContext) { return yamlKeyValue.getKeyText().equals("foo"); @@ -147,7 +147,7 @@ public void testYamlServiceLineMarkerForClassName() { "namespace Service{\n" + " class YamlBar{}\n" + "}" - ), new LineMarker.TargetAcceptsPattern("Navigate to definition", PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition("KeyText") { + ), new LineMarker.TargetAcceptsPattern("Navigate to definition", PlatformPatterns.psiElement(YAMLKeyValue.class).with(new PatternCondition<>("KeyText") { @Override public boolean accepts(@NotNull YAMLKeyValue yamlKeyValue, ProcessingContext processingContext) { return yamlKeyValue.getKeyText().equals("Service\\YamlBar"); diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpMessageSubscriberGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpMessageSubscriberGotoCompletionRegistrarTest.java index 951a566fa..2ef491723 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpMessageSubscriberGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/php/PhpMessageSubscriberGotoCompletionRegistrarTest.java @@ -3,12 +3,8 @@ import com.intellij.patterns.PlatformPatterns; import com.jetbrains.php.lang.PhpFileType; import com.jetbrains.php.lang.psi.elements.Method; -import com.jetbrains.php.lang.psi.elements.PhpClass; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; -import java.util.Arrays; -import java.util.List; - /** * @author Stefano Arlandini * diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java index 6949c7f86..1ea35bd80 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/config/yaml/YamlGoToDeclarationHandlerTest.java @@ -7,7 +7,6 @@ import com.jetbrains.php.lang.psi.elements.Parameter; import com.jetbrains.php.lang.psi.elements.PhpClass; import com.jetbrains.php.lang.psi.elements.StringLiteralExpression; -import com.jetbrains.twig.elements.TwigElementTypes; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.yaml.YAMLFileType; diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java index bee00b497..57883c468 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/container/util/ServiceContainerUtilTest.java @@ -4,9 +4,7 @@ import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.util.Consumer; import com.intellij.util.containers.ContainerUtil; -import com.jetbrains.php.lang.psi.elements.Parameter; import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceInterface; import fr.adrienbrault.idea.symfony2plugin.dic.container.ServiceSerializable; import fr.adrienbrault.idea.symfony2plugin.dic.container.dict.ServiceTypeHint; @@ -14,14 +12,12 @@ import fr.adrienbrault.idea.symfony2plugin.stubs.ContainerCollectionResolver; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.yaml.psi.YAMLFile; import org.jetbrains.yaml.psi.YAMLScalar; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.function.Predicate; /** * @author Daniel Espendiller diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java index 212e4284b..c37649e80 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/EntityHelperTest.java @@ -90,7 +90,7 @@ public void testResolveShortcutName() { public void testGetModelClasses() { Collection modelClasses = EntityHelper.getModelClasses(getProject()); - Map map = new HashMap(); + Map map = new HashMap<>(); for (DoctrineModel modelClass : modelClasses) { map.put(modelClass.getRepositoryName(), modelClass.getDoctrineNamespace()); } @@ -116,11 +116,9 @@ public void testGetModelClasses() { public void testGetModelFieldTargets() { PsiElement[] names = EntityHelper.getModelFieldTargets(PhpElementsUtil.getClass(getProject(), "FooBundle\\Entity\\Yaml"), "name"); - assertNotNull(ContainerUtil.find(names, new Condition() { - @Override - public boolean value(PsiElement psiElement) { - return psiElement instanceof YAMLKeyValue && ((YAMLKeyValue) psiElement).getKeyText().equals("name"); - } - })); + assertNotNull(ContainerUtil.find( + names, + psiElement -> psiElement instanceof YAMLKeyValue && ((YAMLKeyValue) psiElement).getKeyText().equals("name") + )); } } diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java index fac96737a..3e357233d 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/DoctrineYamlGotoCompletionRegistrarTest.java @@ -24,11 +24,11 @@ public String getTestDataPath() { public void testRepositoryClass() { - Collection providers = new ArrayList() {{ - add(new String[] {"orm", "repositoryClass"}); - add(new String[] {"odm", "repositoryClass"}); - add(new String[] {"couchdb", "repositoryClass"}); - add(new String[] {"mongodb", "repositoryClass"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"orm", "repositoryClass"}); + add(new String[]{"odm", "repositoryClass"}); + add(new String[]{"couchdb", "repositoryClass"}); + add(new String[]{"mongodb", "repositoryClass"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java index 73f2e9331..9017452eb 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/type/DoctrineTypeGotoCompletionRegistrarTest.java @@ -137,14 +137,14 @@ public void testDocumentAndOdmFallback() { */ public void testPropertyFieldName() { - Collection providers = new ArrayList() {{ - add(new String[] {"document", "document", "field"}); - add(new String[] {"document", "embedded", "field"}); - add(new String[] {"orm", "entity", "field"}); - - add(new String[] {"document", "document", "id"}); - add(new String[] {"document", "embedded", "id"}); - add(new String[] {"orm", "entity", "id"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"document", "document", "field"}); + add(new String[]{"document", "embedded", "field"}); + add(new String[]{"orm", "entity", "field"}); + + add(new String[]{"document", "document", "id"}); + add(new String[]{"document", "embedded", "id"}); + add(new String[]{"orm", "entity", "id"}); }}; for (String[] provider : providers) { @@ -172,15 +172,15 @@ public void testPropertyFieldName() { */ public void testPropertyRelations() { - Collection providers = new ArrayList() {{ - add(new String[] {"orm", "entity", "one-to-one"}); - add(new String[] {"orm", "entity", "one-to-many"}); - add(new String[] {"orm", "entity", "many-to-one"}); - add(new String[] {"orm", "entity", "many-to-many"}); - add(new String[] {"mongodb", "document", "reference-one"}); - add(new String[] {"mongodb", "document", "reference-many"}); - add(new String[] {"mongodb", "document", "embed-many"}); - add(new String[] {"mongodb", "document", "embed-one"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"orm", "entity", "one-to-one"}); + add(new String[]{"orm", "entity", "one-to-many"}); + add(new String[]{"orm", "entity", "many-to-one"}); + add(new String[]{"orm", "entity", "many-to-many"}); + add(new String[]{"mongodb", "document", "reference-one"}); + add(new String[]{"mongodb", "document", "reference-many"}); + add(new String[]{"mongodb", "document", "embed-many"}); + add(new String[]{"mongodb", "document", "embed-one"}); }}; for (String[] provider : providers) { @@ -208,17 +208,17 @@ public void testPropertyRelations() { */ public void testYamlPropertyFieldNameNavigation() { - Collection providers = new ArrayList() {{ - add(new String[] {"orm", "id"}); - add(new String[] {"orm", "fields"}); - add(new String[] {"orm", "oneToOne"}); - add(new String[] {"orm", "oneToMany"}); - add(new String[] {"orm", "manyToOne"}); - add(new String[] {"orm", "manyToMany"}); - add(new String[] {"mondodb", "embedOne"}); - add(new String[] {"mondodb", "embedMany"}); - add(new String[] {"mondodb", "referenceOne"}); - add(new String[] {"mondodb", "referenceMany"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"orm", "id"}); + add(new String[]{"orm", "fields"}); + add(new String[]{"orm", "oneToOne"}); + add(new String[]{"orm", "oneToMany"}); + add(new String[]{"orm", "manyToOne"}); + add(new String[]{"orm", "manyToMany"}); + add(new String[]{"mondodb", "embedOne"}); + add(new String[]{"mondodb", "embedMany"}); + add(new String[]{"mondodb", "referenceOne"}); + add(new String[]{"mondodb", "referenceMany"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java index b42437892..de157cb89 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/metadata/util/DoctrineMetadataUtilTest.java @@ -128,7 +128,7 @@ public void testGetClassRepository() { */ public void testGetTables() { - Map items = new HashMap(); + Map items = new HashMap<>(); Collection> tables = DoctrineMetadataUtil.getTables(getProject()); for (Pair pair : tables) { @@ -154,7 +154,7 @@ public void testGetMetadataByTable() { */ public void testGetModels() { - Set classes = new HashSet(); + Set classes = new HashSet<>(); for (PhpClass phpClass : DoctrineMetadataUtil.getModels(getProject())) { classes.add(phpClass.getPresentableFQN()); } @@ -166,12 +166,10 @@ public void testGetModels() { * @see fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.util.DoctrineMetadataUtil#getObjectRepositoryLookupElements */ public void testGetObjectRepositoryLookupElements() { - assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.getObjectRepositoryLookupElements(getProject()), new Condition() { - @Override - public boolean value(LookupElement lookupElement) { - return lookupElement.getLookupString().equals("Foo\\Bar\\Repository\\FooBarRepository"); - } - })); + assertNotNull(ContainerUtil.find( + DoctrineMetadataUtil.getObjectRepositoryLookupElements(getProject()), + lookupElement -> lookupElement.getLookupString().equals("Foo\\Bar\\Repository\\FooBarRepository") + )); } /** @@ -196,12 +194,7 @@ public void testFindManagerByScope() { * @see fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.util.DoctrineMetadataUtil#findMetadataForRepositoryClass */ public void testFindMetadataForRepositoryClass() { - Condition condition = new Condition() { - @Override - public boolean value(VirtualFile virtualFile) { - return virtualFile.getName().equals("doctrine.odm.xml"); - } - }; + Condition condition = virtualFile -> virtualFile.getName().equals("doctrine.odm.xml"); assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(getProject(), "Foo\\Bar\\Repository\\FooBarRepository"), condition)); assertNotNull(ContainerUtil.find(DoctrineMetadataUtil.findMetadataForRepositoryClass(getProject(), "Entity\\BarRepository"), condition)); diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java index 7d4b1f195..1b5fc6e84 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormOptionsUtilTest.java @@ -78,7 +78,7 @@ public void testGetExtendedTypeClassesAsClassConstant() { public void testClassOptionsVisitorWithExtensionAndParents() { - final Set options = new HashSet(); + final Set options = new HashSet<>(); FormOptionsUtil.visitFormOptions(getProject(), "foo", (psiElement, option, formClass, optionEnum) -> options.add(option) @@ -89,14 +89,13 @@ public void testClassOptionsVisitorWithExtensionAndParents() { public void testClassOptionsVisitorWithExtensionAndParentsWithClassConstant() { - final Set optionsClass = new HashSet(); + final Set optionsClass = new HashSet<>(); - FormOptionsUtil.visitFormOptions(getProject(), "Options\\Bar\\Foobar", new FormOptionVisitor() { - @Override - public void visit(@NotNull PsiElement psiElement, @NotNull String option, @NotNull FormClass formClass, @NotNull FormOptionEnum optionEnum) { - optionsClass.add(option); - } - }); + FormOptionsUtil.visitFormOptions( + getProject(), + "Options\\Bar\\Foobar", + (psiElement, option, formClass, optionEnum) -> optionsClass.add(option) + ); assertContainsElements(optionsClass, "BarType"); } diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java index 93a757a6f..4436867e0 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/form/util/FormUtilTest.java @@ -189,13 +189,13 @@ public void testGetFormNameOfPhpClass() { // Symfony 2.8 // class name as type but stripped Type - Collection providers = new ArrayList() {{ - add(new String[] {"foo", "Foo"}); - add(new String[] {"foo", "FooType"}); - add(new String[] {"foo_bar", "FooBar"}); - add(new String[] {"foo_bar", "fooBar"}); - add(new String[] {"foo", "footype"}); - add(new String[] {"type", "type"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"foo", "Foo"}); + add(new String[]{"foo", "FooType"}); + add(new String[]{"foo_bar", "FooBar"}); + add(new String[]{"foo_bar", "fooBar"}); + add(new String[]{"foo", "footype"}); + add(new String[]{"type", "type"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java index 8c359701d..b798dc714 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/PhpRouteReferenceContributorTest.java @@ -26,11 +26,11 @@ protected String getTestDataPath() { public void testGenerateUrlProvidesNavigation() { - Collection providers = new ArrayList() {{ - add(new String[] {"Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface", "generate"}); - add(new String[] {"Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "generateUrl"}); - add(new String[] {"Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "redirectToRoute"}); - add(new String[] {"My\\Proxy\\Routing\\Controller", "generateUrl"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface", "generate"}); + add(new String[]{"Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "generateUrl"}); + add(new String[]{"Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller", "redirectToRoute"}); + add(new String[]{"My\\Proxy\\Routing\\Controller", "generateUrl"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java index d38f06dc4..c3238cb5e 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteHelperTest.java @@ -45,14 +45,14 @@ protected String getTestDataPath() { * @see fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper#getYamlRouteDefinitions */ public void testGetYamlRouteDefinitionsAsHashAndKeyValue() { - Collection providers = new ArrayList() {{ - add(new String[] {"'MyController::fooAction'", "MyController::fooAction"}); - add(new String[] {"MyController::fooAction", "MyController::fooAction"}); - add(new String[] {"\"MyController::fooAction\"", "MyController::fooAction"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"'MyController::fooAction'", "MyController::fooAction"}); + add(new String[]{"MyController::fooAction", "MyController::fooAction"}); + add(new String[]{"\"MyController::fooAction\"", "MyController::fooAction"}); }}; for (String[] provider : providers) { - Collection yamlDocuments = new ArrayList(); + Collection yamlDocuments = new ArrayList<>(); yamlDocuments.add(YamlPsiElementFactory.createFromText(getProject(), YAMLDocument.class, String.format( "route1:\n" + @@ -129,7 +129,7 @@ public void testGetYamlRouteDefinitionsForControllerKeyword() { * @see fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper#getXmlRouteDefinitions */ public void testGetXmlRouteDefinitions() { - Collection xmlFiles = new ArrayList(); + Collection xmlFiles = new ArrayList<>(); xmlFiles.add(createXmlFile("" + "\n" + @@ -245,12 +245,10 @@ public void testGetAllRoutes() { * @see fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper#getRoutesLookupElements */ public void testGetRoutesLookupElements() { - assertNotNull(ContainerUtil.find(RouteHelper.getRoutesLookupElements(getProject()), new Condition() { - @Override - public boolean value(LookupElement lookupElement) { - return "myfoobar_car_index".equals(lookupElement.getLookupString()); - } - })); + assertNotNull(ContainerUtil.find( + RouteHelper.getRoutesLookupElements(getProject()), + lookupElement -> "myfoobar_car_index".equals(lookupElement.getLookupString()) + )); } /** diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java index 3afa081ae..145dcea3a 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/RouteTest.java @@ -3,8 +3,6 @@ import com.google.common.collect.ImmutableMap; import fr.adrienbrault.idea.symfony2plugin.routing.Route; import fr.adrienbrault.idea.symfony2plugin.stubs.dict.StubIndexedRoute; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java index c4166006b..0a660df19 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/YamlLineMarkerProviderTest.java @@ -43,14 +43,14 @@ public void testDoctrineFirstLineModelNavigation() { public void testDoctrineMetadataRelation() { - Collection providers = new ArrayList() {{ - add(new String[] {"targetEntity", "Foo\\Apple"}); - add(new String[] {"targetEntity", "\\Foo\\Apple"}); - add(new String[] {"targetEntity", "Apple"}); - add(new String[] {"targetEntity", "'Apple'"}); - add(new String[] {"targetEntity", "\"Apple\""}); - add(new String[] {"targetDocument", "Apple"}); - add(new String[] {"targetDocument", "Car"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"targetEntity", "Foo\\Apple"}); + add(new String[]{"targetEntity", "\\Foo\\Apple"}); + add(new String[]{"targetEntity", "Apple"}); + add(new String[]{"targetEntity", "'Apple'"}); + add(new String[]{"targetEntity", "\"Apple\""}); + add(new String[]{"targetDocument", "Apple"}); + add(new String[]{"targetDocument", "Car"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java index af8555859..56d9ae404 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/routing/inspection/RouteSettingDeprecatedInspectionTest.java @@ -49,11 +49,11 @@ public void testYmlRoutePatternAreDeprecated() { public void testYmlRequirementsAreDeprecated() { - Collection providers = new ArrayList() {{ - add(new String[] {"_method: foo", "The '_method' requirement is deprecated"}); - add(new String[] {"'_method': foo", "The '_method' requirement is deprecated"}); - add(new String[] {"\"_method\": foo", "The '_method' requirement is deprecated"}); - add(new String[] {"'_scheme': foo", "The '_scheme' requirement is deprecated"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"_method: foo", "The '_method' requirement is deprecated"}); + add(new String[]{"'_method': foo", "The '_method' requirement is deprecated"}); + add(new String[]{"\"_method\": foo", "The '_method' requirement is deprecated"}); + add(new String[]{"'_scheme': foo", "The '_scheme' requirement is deprecated"}); }}; for (String[] s : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java index 2fbe4c0aa..af0750284 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/FileResourcesIndexTest.java @@ -1,6 +1,5 @@ package fr.adrienbrault.idea.symfony2plugin.tests.stubs.indexes; -import com.intellij.ide.highlighter.XmlFileType; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; @@ -8,7 +7,6 @@ import fr.adrienbrault.idea.symfony2plugin.stubs.dict.FileResourceContextTypeEnum; import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.FileResourcesIndex; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; -import org.jetbrains.yaml.YAMLFileType; import java.util.Map; import java.util.TreeMap; diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java index 26808f4bb..1ff6a9b31 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TranslationStubIndexTest.java @@ -1,18 +1,14 @@ package fr.adrienbrault.idea.symfony2plugin.tests.stubs.indexes; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.Processor; import com.intellij.util.containers.ArrayListSet; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.indexing.FileBasedIndex; -import com.jetbrains.twig.TwigFileType; import fr.adrienbrault.idea.symfony2plugin.stubs.indexes.TranslationStubIndex; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -148,7 +144,7 @@ public void testThatEmptyDomainAreNotAdded() { @NotNull private Set getDomainKeys(@NotNull String domain) { - Set uniqueKeySet = new ArrayListSet(); + Set uniqueKeySet = new ArrayListSet<>(); for(Set splits: FileBasedIndex.getInstance().getValues(TranslationStubIndex.KEY, domain, GlobalSearchScope.allScope(getProject()))) { ContainerUtil.addAll(uniqueKeySet, splits); diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java index bda236d03..f9bd3e36f 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java @@ -390,11 +390,11 @@ public void testGetTwigMacroNameAndParameter() { public void testGetControllerMethodShortcut() { myFixture.copyFileToProject("controller_method.php"); - Collection dataProvider = new ArrayList() {{ - add(new String[] {"foobarAction", "foobar"}); - add(new String[] {"foobar", "foobar"}); - add(new String[] {"editAction", "edit"}); - add(new String[] {"edit", "edit"}); + Collection dataProvider = new ArrayList<>() {{ + add(new String[]{"foobarAction", "foobar"}); + add(new String[]{"foobar", "foobar"}); + add(new String[]{"editAction", "edit"}); + add(new String[]{"edit", "edit"}); }}; for (String[] string : dataProvider) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java index 999bd8622..9744eb12b 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java @@ -6,7 +6,6 @@ import java.util.HashSet; import java.util.Set; -import java.util.function.Consumer; /** * @author Daniel Espendiller diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java index cead4c92a..e22813ecf 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/translation/PhpTranslationKeyInspectionTest.java @@ -1,7 +1,6 @@ package fr.adrienbrault.idea.symfony2plugin.tests.translation; import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase; -import fr.adrienbrault.idea.symfony2plugin.translation.PhpTranslationDomainInspection; import fr.adrienbrault.idea.symfony2plugin.translation.PhpTranslationKeyInspection; /** diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java index eebd26cd8..284f82c0f 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java @@ -113,21 +113,21 @@ public void testGetClassInsideNamespaceScope() { public void testIsInstanceOf() { myFixture.copyFileToProject("InstanceOf.php"); - Collection providers = new ArrayList() {{ - add(new String[] {"\\Instance\\Of\\Foo", "\\Instance\\Of\\Bar"}); - add(new String[] {"\\Instance\\Of\\Foo", "\\Instance\\Of\\Cool"}); - add(new String[] {"\\Instance\\Of\\Car", "\\Instance\\Of\\Bar"}); - add(new String[] {"\\Instance\\Of\\Car", "\\Instance\\Of\\Foo"}); - add(new String[] {"\\Instance\\Of\\Car", "\\Instance\\Of\\Cool"}); + Collection providers = new ArrayList<>() {{ + add(new String[]{"\\Instance\\Of\\Foo", "\\Instance\\Of\\Bar"}); + add(new String[]{"\\Instance\\Of\\Foo", "\\Instance\\Of\\Cool"}); + add(new String[]{"\\Instance\\Of\\Car", "\\Instance\\Of\\Bar"}); + add(new String[]{"\\Instance\\Of\\Car", "\\Instance\\Of\\Foo"}); + add(new String[]{"\\Instance\\Of\\Car", "\\Instance\\Of\\Cool"}); // backslash - add(new String[] {"Instance\\Of\\Car", "Instance\\Of\\Cool"}); - add(new String[] {"Instance\\Of\\Car", "\\Instance\\Of\\Cool"}); - add(new String[] {"\\Instance\\Of\\Car", "Instance\\Of\\Cool"}); + add(new String[]{"Instance\\Of\\Car", "Instance\\Of\\Cool"}); + add(new String[]{"Instance\\Of\\Car", "\\Instance\\Of\\Cool"}); + add(new String[]{"\\Instance\\Of\\Car", "Instance\\Of\\Cool"}); // dups - add(new String[] {"\\Instance\\Of\\Car", "Instance\\Of\\Apple"}); - add(new String[] {"\\Instance\\Of\\Foo", "Instance\\Of\\Apple"}); + add(new String[]{"\\Instance\\Of\\Car", "Instance\\Of\\Apple"}); + add(new String[]{"\\Instance\\Of\\Foo", "Instance\\Of\\Apple"}); }}; for (String[] provider : providers) { diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java index 859c09e29..4f52c10fc 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/yaml/YamlHelperLightTest.java @@ -255,12 +255,7 @@ public void testGetYamlArrayOnSequenceOrArrayElements() { List elements = YamlHelper.getYamlArrayOnSequenceOrArrayElements(fromText); assertNotNull(elements); - String join = StringUtils.join(ContainerUtil.map(elements, new Function() { - @Override - public String fun(PsiElement psiElement) { - return psiElement.getText(); - } - }), ","); + String join = StringUtils.join(ContainerUtil.map(elements, PsiElement::getText), ","); assertTrue(join.contains("foo")); assertTrue(join.contains("bar")); @@ -277,12 +272,7 @@ public void testGetYamlArrayOnSequenceOrArrayElementsForArray() { ); assertNotNull(fromText); - String join = StringUtils.join(ContainerUtil.map(YamlHelper.getYamlArrayOnSequenceOrArrayElements(fromText), new Function() { - @Override - public String fun(PsiElement psiElement) { - return psiElement.getText(); - } - }), ","); + String join = StringUtils.join(ContainerUtil.map(YamlHelper.getYamlArrayOnSequenceOrArrayElements(fromText), PsiElement::getText), ","); assertTrue(join.contains("foo")); assertTrue(join.contains("bar")); @@ -687,7 +677,7 @@ private int getIndentForTextContent(@NotNull String content) { private static class ListYamlTagVisitor implements YamlTagVisitor { - private List items = new ArrayList(); + private List items = new ArrayList<>(); @Override public void visit(@NotNull YamlServiceTag args) {