From 36effd18c90e01af4f16edbbf6830b069337f274 Mon Sep 17 00:00:00 2001 From: Daniel Espendiller Date: Wed, 1 Mar 2023 18:04:17 +0100 Subject: [PATCH] java language level feature migration records syntax on private usages --- .../action/TwigExtractLanguageAction.java | 26 ++-------- .../MethodSignatureTypeProvider.java | 3 +- .../ConstantEnumCompletionContributor.java | 4 +- ...tePropertyServiceInjectionContributor.java | 10 +--- .../PhpCommandGotoCompletionRegistrar.java | 10 +--- .../config/ConfigLineMarkerProvider.java | 17 +------ .../config/ServiceLineMarkerProvider.java | 6 +-- .../php/PhpConfigReferenceContributor.java | 10 ++-- .../config/utils/ConfigUtil.java | 18 +------ ...ServiceArgumentParameterHintsProvider.java | 12 +---- .../container/util/ServiceContainerUtil.java | 6 +-- .../intention/YamlSuggestIntentionAction.java | 24 +++------ .../ServiceContainerRemoteFileStorage.java | 2 - .../symfony2plugin/doctrine/DoctrineUtil.java | 4 +- .../ObjectManagerFindContextTypeProvider.java | 4 +- .../ObjectRepositoryResultTypeProvider.java | 4 +- .../QueryBuilderGotoDeclarationHandler.java | 3 +- .../form/FormTypeReferenceContributor.java | 11 ++-- ...scriptCompletionNavigationContributor.java | 3 +- .../profiler/dict/LocalProfilerRequest.java | 2 +- .../profiler/utils/ProfilerUtil.java | 2 +- .../routing/PhpLineMarkerProvider.java | 4 +- .../symfony2plugin/routing/RouteHelper.java | 12 ++--- .../stubs/ServiceIndexUtil.java | 13 +---- .../stubs/dict/TwigMacroTagIndex.java | 30 ++--------- .../indexes/TwigMacroFunctionStubIndex.java | 4 +- .../StringSetDataExternalizer.java | 4 +- .../templating/TwigLineMarkerProvider.java | 51 +++---------------- .../TwigTemplateCompletionContributor.java | 7 ++- .../TwigTemplateGoToDeclarationHandler.java | 2 +- .../templating/dict/TwigMacroTag.java | 26 ++-------- .../dict/TwigMacroTagInterface.java | 4 +- .../path/JsonFileIndexTwigNamespaces.java | 28 ++++------ .../templating/util/TwigUtil.java | 4 +- .../variable/resolver/FormVarsResolver.java | 1 - ...ionPlaceholderGotoCompletionRegistrar.java | 19 +++---- .../TranslationReferenceContributor.java | 3 +- .../translation/dict/TranslationUtil.java | 30 ++++------- .../ui/dict/UiFilePathPresentable.java | 24 +-------- .../ui/utils/dict/UiPathColumnInfo.java | 2 +- .../util/DocHashTagReferenceContributor.java | 3 +- .../symfony2plugin/util/MethodMatcher.java | 3 +- .../MethodParameterReferenceContributor.java | 4 +- .../symfony2plugin/util/PhpElementsUtil.java | 6 +-- .../PhpStringLiteralExpressionReference.java | 3 +- .../symfony2plugin/util/PsiElementUtils.java | 4 +- .../idea/symfony2plugin/util/VersionUtil.java | 2 +- .../PhpClassReferenceInsertHandler.java | 3 +- .../util/psi/ParentPathPatternCondition.java | 1 + .../util/resource/FileResourceUtil.java | 7 +-- .../symfony2plugin/util/yaml/YamlHelper.java | 15 ++---- .../TwigMacroFunctionStubIndexTest.java | 2 +- .../tests/templating/util/TwigUtilTest.java | 6 +-- 53 files changed, 116 insertions(+), 392 deletions(-) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java index 77a128184..e1511d1ca 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/TwigExtractLanguageAction.java @@ -165,23 +165,7 @@ public void actionPerformed(AnActionEvent event) { } - private static class MyOnOkCallback implements TranslatorKeyExtractorDialog.OnOkCallback { - private final Project project; - private final Editor editor; - private final String finalDefaultDomain; - private final int finalStartOffset; - private final int finalEndOffset; - private final String finalTranslationText; - - MyOnOkCallback(Project project, Editor editor, String finalDefaultDomain, int finalStartOffset, int finalEndOffset, String finalTranslationText) { - this.project = project; - this.editor = editor; - this.finalDefaultDomain = finalDefaultDomain; - this.finalStartOffset = finalStartOffset; - this.finalEndOffset = finalEndOffset; - this.finalTranslationText = finalTranslationText; - } - + private record MyOnOkCallback(Project project, Editor editor, String finalDefaultDomain, int finalStartOffset, int finalEndOffset, String finalTranslationText) implements TranslatorKeyExtractorDialog.OnOkCallback { @Override public void onClick(List files, final String keyName, final String domain, boolean navigateTo) { PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument()); @@ -191,7 +175,7 @@ public void onClick(List files, final String keyName, fina String insertString; // check for file context domain - if(finalDefaultDomain.equals(domain)) { + if (finalDefaultDomain.equals(domain)) { insertString = String.format("{{ '%s'|trans }}", keyName); } else { insertString = String.format("{{ '%s'|trans({}, '%s') }}", keyName, domain); @@ -204,16 +188,16 @@ public void onClick(List files, final String keyName, fina Collection targets = new ArrayList<>(); // so finally insert it; first file can be a navigation target - for(TranslationFileModel transPsiFile: files) { + for (TranslationFileModel transPsiFile : files) { PsiFile psiFile = transPsiFile.getPsiFile(); CommandProcessor.getInstance().executeCommand(psiFile.getProject(), () -> ApplicationManager.getApplication().runWriteAction(() -> - ContainerUtil.addIfNotNull(targets, TranslationInsertUtil.invokeTranslation(psiFile, keyName, finalTranslationText))), + ContainerUtil.addIfNotNull(targets, TranslationInsertUtil.invokeTranslation(psiFile, keyName, finalTranslationText))), "Translation Insert " + psiFile.getName(), null ); } - if(navigateTo && targets.size() > 0) { + if (navigateTo && targets.size() > 0) { PsiDocumentManager.getInstance(project).commitAndRunReadAction(() -> IdeHelper.navigateToPsiElement(targets.iterator().next()) ); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java index 15b056f08..14d61014a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/assistant/signature/MethodSignatureTypeProvider.java @@ -40,7 +40,7 @@ public char getKey() { @Nullable @Override public PhpType getType(PsiElement e) { - if (!Settings.getInstance(e.getProject()).pluginEnabled || !(e instanceof MethodReference)) { + if (!Settings.getInstance(e.getProject()).pluginEnabled || !(e instanceof MethodReference methodReference)) { return null; } @@ -49,7 +49,6 @@ public PhpType getType(PsiElement e) { return null; } - MethodReference methodReference = (MethodReference) e; Collection matchedSignatures = getSignatureSetting(methodReference.getName(), signatures); if(matchedSignatures.size() == 0) { return null; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java index d1861c3d2..6940bc129 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/ConstantEnumCompletionContributor.java @@ -151,12 +151,10 @@ protected void addCompletions(@NotNull CompletionParameters completionParameters return; } - if (!(psiElement.getParent().getParent() instanceof BinaryExpression)) { + if (!(psiElement.getParent().getParent() instanceof BinaryExpression binaryExpression)) { return; } - BinaryExpression binaryExpression = (BinaryExpression) psiElement.getParent().getParent(); - // OK: $response->getStatusCode() == Response::HTTP_BAD_GATEWAY // @TODO: error we are complete outside of context: $response->getStatusCode() == Response::HTTP_BAD_GATEWAY || $response->getStatusCode() == diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/IncompletePropertyServiceInjectionContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/IncompletePropertyServiceInjectionContributor.java index 1a7792488..87f2d569d 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/IncompletePropertyServiceInjectionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/IncompletePropertyServiceInjectionContributor.java @@ -443,15 +443,7 @@ private String getCompletedText(@NotNull CompletionParameters completionParamete return null; } - private static class LookupElementInsertHandler implements InsertHandler { - private final String propertyName; - private final String typePhpClass; - - public LookupElementInsertHandler(String propertyName, String typePhpClass) { - this.propertyName = propertyName; - this.typePhpClass = typePhpClass; - } - + private record LookupElementInsertHandler(String propertyName, String typePhpClass) implements InsertHandler { @Override public void handleInsert(@NotNull InsertionContext context, @NotNull LookupElement item) { SmartPsiElementPointer parentOfType2 = (SmartPsiElementPointer) item.getObject(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java index ff9bac769..44a7df344 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java @@ -221,16 +221,10 @@ private Map getCommandConfigurationMap(@NotNull PhpClass php return targets; } - private static class CommandDefPsiElementFilter implements Processor { - private final String methodName; - - public CommandDefPsiElementFilter(String methodName) { - this.methodName = methodName; - } - + private record CommandDefPsiElementFilter(String methodName) implements Processor { @Override public boolean process(PsiElement psiElement) { - if(!(psiElement instanceof MethodReference)) { + if (!(psiElement instanceof MethodReference)) { return false; } 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 3fffaecd7..99524dd3a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java @@ -96,22 +96,7 @@ private void visitConfigKey(@NotNull Collection> resul result.add(builder.createLineMarkerInfo(psiElement)); } - private static class MyClassIdLazyValue implements Supplier> { - @NotNull - private final Project project; - - @NotNull - private final Collection configuration; - - @NotNull - private final String root; - - MyClassIdLazyValue(@NotNull Project project, @NotNull Collection configuration, @NotNull String root) { - this.project = project; - this.configuration = configuration; - this.root = root; - } - + private record MyClassIdLazyValue(@NotNull Project project, @NotNull Collection configuration, @NotNull String root) implements Supplier> { @Override public Collection get() { return ConfigUtil.getTreeSignatureTargets(project, root, configuration); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java index 61a6a314b..4136b2e94 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ServiceLineMarkerProvider.java @@ -387,10 +387,8 @@ private void constraintMessagePropertyMarker(@NotNull PsiElement psiElement, @No } } - private static class MyCollectionNotNullLazyValue implements Supplier> { - private final Collection targets; - - public MyCollectionNotNullLazyValue(@NotNull Collection targets) { + private record MyCollectionNotNullLazyValue(Collection targets) implements Supplier> { + private MyCollectionNotNullLazyValue(@NotNull Collection targets) { this.targets = targets; } 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 4465fd258..b2ebe9f58 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 @@ -148,12 +148,10 @@ public boolean acceptsTarget(@NotNull PsiElement target) { } ArrayCreationExpression arrayCreationExpression = PhpElementsUtil.getCompletableArrayCreationElement(psiElement); - if(arrayCreationExpression == null || !(arrayCreationExpression.getContext() instanceof PhpReturn)) { + if(arrayCreationExpression == null || !(arrayCreationExpression.getContext() instanceof PhpReturn phpReturn)) { return new PsiReference[0]; } - PhpReturn phpReturn = (PhpReturn) arrayCreationExpression.getContext(); - Method method = PsiTreeUtil.getParentOfType(phpReturn, Method.class); if(method == null) { return new PsiReference[0]; @@ -176,12 +174,11 @@ public boolean acceptsTarget(@NotNull PsiElement target) { private static boolean phpStringLiteralExpressionClassReference(String signature, int index, PsiElement psiElement) { - if (!(psiElement.getContext() instanceof ParameterList)) { + if (!(psiElement.getContext() instanceof ParameterList parameterList)) { return false; } - ParameterList parameterList = (ParameterList) psiElement.getContext(); - if (!(parameterList.getContext() instanceof NewExpression)) { + if (!(parameterList.getContext() instanceof NewExpression newExpression)) { return false; } @@ -189,7 +186,6 @@ private static boolean phpStringLiteralExpressionClassReference(String signature return false; } - NewExpression newExpression = (NewExpression) parameterList.getContext(); ClassReference classReference = newExpression.getClassReference(); if(classReference == null) { return false; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java index 244762e9f..71cb62a48 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java @@ -137,23 +137,7 @@ private static void visitTreeSignatures(@NotNull Collection classes, @ } } - private static class TreeVisitor { - @NotNull - private final PhpClass phpClass; - - @NotNull - private final PsiElement psiElement; - - @NotNull - private final String contents; - - public TreeVisitor(@NotNull PhpClass phpClass, @NotNull PsiElement psiElement, @NotNull String contents) { - - this.phpClass = phpClass; - this.psiElement = psiElement; - this.contents = contents; - } - } + private record TreeVisitor(@NotNull PhpClass phpClass, @NotNull PsiElement psiElement, @NotNull String contents) {} /** * app/config[..].yml diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java index ef777563d..345217770 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/ServiceArgumentParameterHintsProvider.java @@ -221,15 +221,5 @@ private String createTypeHintFromParameter(@NotNull Project project, Parameter p return parameter.getName(); } - private static class Match { - @NotNull - private final String parameter; - - private final int targetOffset; - - Match(@NotNull String parameter, int targetOffset) { - this.parameter = parameter; - this.targetOffset = targetOffset; - } - } + private record Match(@NotNull String parameter, int targetOffset) {} } 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 74d0425d4..5d2601848 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 @@ -530,16 +530,14 @@ public static ServiceTypeHint getYamlConstructorTypeHint(@NotNull YAMLScalar yam } } } - } else if(context instanceof YAMLSequenceItem) { + } else if(context instanceof YAMLSequenceItem sequenceItem) { // arguments: ['@foobar'] - YAMLSequenceItem sequenceItem = (YAMLSequenceItem) context; PsiElement yamlSequenceItem = sequenceItem.getContext(); if(yamlSequenceItem instanceof YAMLSequence) { YAMLSequence yamlArray = (YAMLSequence) sequenceItem.getContext(); PsiElement yamlKeyValue = yamlArray.getContext(); - if(yamlKeyValue instanceof YAMLKeyValue) { - YAMLKeyValue yamlKeyValueArguments = (YAMLKeyValue) yamlKeyValue; + if(yamlKeyValue instanceof YAMLKeyValue yamlKeyValueArguments) { if(yamlKeyValueArguments.getKeyText().equals("arguments")) { YAMLMapping parentMapping = yamlKeyValueArguments.getParentMapping(); if(parentMapping != null) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java index a08b1c46d..da34767d7 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/intention/YamlSuggestIntentionAction.java @@ -72,29 +72,17 @@ public void invoke(@NotNull Project project, @NotNull PsiFile psiFile, @Nullable /** * This class replace a service name by plain text modification. * This resolve every crazy yaml use case and lexer styles like: - * - * - @, @? - * - "@foo", '@foo', @foo + *

+ * - @, @? + * - "@foo", '@foo', @foo */ - private static class MyInsertCallback implements ServiceSuggestDialog.Callback { - - @NotNull - private final Editor editor; - - @NotNull - private final PsiElement psiElement; - - public MyInsertCallback(@NotNull Editor editor, @NotNull PsiElement psiElement) { - this.editor = editor; - this.psiElement = psiElement; - } - + private record MyInsertCallback(@NotNull Editor editor, @NotNull PsiElement psiElement) implements ServiceSuggestDialog.Callback { @Override public void insert(@NotNull String selected) { String text = this.psiElement.getText(); int i = getServiceChar(text); - if(i < 0) { + if (i < 0) { HintManager.getInstance().showErrorHint(editor, "No valid char in text range"); return; } @@ -113,7 +101,7 @@ public void insert(@NotNull String selected) { private int getServiceChar(@NotNull String text) { int i = text.lastIndexOf("@?"); - if(i >= 0) { + if (i >= 0) { return i + 1; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java index ceb5543de..aae915942 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/webDeployment/ServiceContainerRemoteFileStorage.java @@ -44,8 +44,6 @@ public void build(@NotNull Project project, @NotNull Collection file inputStream = new ResetOnCloseInputStream(new ByteArrayInputStream( IOUtils.getInputStreamBytes(fileObject.getContent().getInputStream())) ); - } catch (FileSystemException ignored) { - continue; } catch (IOException ignored) { continue; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java index f8e617c3a..bb22e0d20 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/DoctrineUtil.java @@ -126,12 +126,10 @@ public static Collection> getClassRepositoryPair(@NotNull P } PhpPsiElement phpClass = phpDocComment.getNextPsiSibling(); - if (!(phpClass instanceof PhpClass)) { + if (!(phpClass instanceof PhpClass phpClassScope)) { return false; } - PhpClass phpClassScope = (PhpClass) phpClass; - pairs.add(Pair.create( phpClassScope.getPresentableFQN(), getAnnotationRepositoryClass(phpDocTag, phpClassScope)) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindContextTypeProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindContextTypeProvider.java index d800a70c8..b5a2fba98 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindContextTypeProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectManagerFindContextTypeProvider.java @@ -38,12 +38,10 @@ public char getKey() { @Nullable @Override public PhpType getType(PsiElement e) { - if (!(e instanceof MethodReference) || !Settings.getInstance(e.getProject()).pluginEnabled) { + if (!(e instanceof MethodReference methodRef) || !Settings.getInstance(e.getProject()).pluginEnabled) { return null; } - MethodReference methodRef = (MethodReference) e; - String refSignature = ((MethodReference)e).getSignature(); if(StringUtil.isEmpty(refSignature)) { return null; 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 9be88bdf4..0304a3b13 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java @@ -56,12 +56,10 @@ public char getKey() { @Nullable @Override public PhpType getType(PsiElement e) { - if (!(e instanceof MethodReference) || !Settings.getInstance(e.getProject()).pluginEnabled) { + if (!(e instanceof MethodReference methodRef) || !Settings.getInstance(e.getProject()).pluginEnabled) { return null; } - MethodReference methodRef = (MethodReference) e; - String refSignature = ((MethodReference)e).getSignature(); if(StringUtil.isEmpty(refSignature)) { return null; 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 c7e9f65de..f70aaaf3c 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 @@ -31,13 +31,12 @@ public class QueryBuilderGotoDeclarationHandler implements GotoDeclarationHandle @Override public PsiElement[] getGotoDeclarationTargets(PsiElement psiElement, int offset, Editor editor) { - if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof StringLiteralExpression)) { + if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof StringLiteralExpression context)) { return new PsiElement[0]; } List psiElements = new ArrayList<>(); - StringLiteralExpression context = (StringLiteralExpression) psiElement.getContext(); attachPropertyGoto(context, psiElements); attachJoinGoto(context, psiElements); attachPartialGoto(context, psiElements, offset); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java index 48a8554e5..c92ebbb8d 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/form/FormTypeReferenceContributor.java @@ -64,7 +64,7 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @No } ArrayHashElement arrayHash = PsiTreeUtil.getParentOfType(psiElement, ArrayHashElement.class); - if(arrayHash != null && arrayHash.getKey() instanceof StringLiteralExpression) { + if(arrayHash != null && arrayHash.getKey() instanceof StringLiteralExpression key) { ArrayCreationExpression arrayCreation = PsiTreeUtil.getParentOfType(psiElement, ArrayCreationExpression.class); if(arrayCreation == null) { @@ -77,7 +77,6 @@ public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @No return new PsiReference[0]; } - StringLiteralExpression key = (StringLiteralExpression) arrayHash.getKey(); if(key == null) { return new PsiReference[0]; } @@ -153,12 +152,10 @@ public boolean acceptsTarget(@NotNull PsiElement target) { @NotNull @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement psiElement, @NotNull ProcessingContext processingContext) { - if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList)) { + if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList parameterList)) { return new PsiReference[0]; } - ParameterList parameterList = (ParameterList) psiElement.getContext(); - PsiElement methodReference = parameterList.getContext(); if (!(methodReference instanceof MethodReference)) { return new PsiReference[0]; @@ -206,12 +203,10 @@ public boolean acceptsTarget(@NotNull PsiElement target) { return new PsiReference[0]; } - if(!(parameterList.getContext() instanceof MethodReference)) { + if(!(parameterList.getContext() instanceof MethodReference method)) { return new PsiReference[0]; } - MethodReference method = (MethodReference) parameterList.getContext(); - // Symfony 2 and 3 BC fix if(!(PhpElementsUtil.isMethodReferenceInstanceOf(method, "\\Symfony\\Component\\OptionsResolver\\OptionsResolverInterface", "setDefaults") || PhpElementsUtil.isMethodReferenceInstanceOf(method, "\\Symfony\\Component\\OptionsResolver\\OptionsResolver", "setDefaults")) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/javascript/JavascriptCompletionNavigationContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/javascript/JavascriptCompletionNavigationContributor.java index d9f68848f..0f4d4bb50 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/javascript/JavascriptCompletionNavigationContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/javascript/JavascriptCompletionNavigationContributor.java @@ -40,11 +40,10 @@ private static class CompletionParametersCompletionProvider extends CompletionPr @Override protected void addCompletions(@NotNull CompletionParameters parameters, @NotNull ProcessingContext context, @NotNull CompletionResultSet result) { PsiElement psiElement = parameters.getOriginalPosition(); - if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof JSLiteralExpression)) { + if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof JSLiteralExpression jsLiteral)) { return; } - JSLiteralExpression jsLiteral = (JSLiteralExpression) psiElement.getContext(); if (!isAcceptedUrlPattern(jsLiteral)) { return; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java index f8b4dd5c2..1b63b7e7c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/dict/LocalProfilerRequest.java @@ -55,7 +55,7 @@ public int getStatusCode() { } try { - return Integer.valueOf(this.separatedLine.get(6)); + return Integer.parseInt(this.separatedLine.get(6)); } catch (NumberFormatException e) { return 0; } 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 fcfee4760..552cfe553 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 @@ -136,7 +136,7 @@ public static Collection createRequestsFromIndexHtml(@ int statusCode = 0; if(row.containsKey("status")) { try { - statusCode = Integer.valueOf(row.get("status").getSecond()); + statusCode = Integer.parseInt(row.get("status").getSecond()); } catch (NumberFormatException ignored) { } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java index 1c30771d3..21a3a7de1 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/PhpLineMarkerProvider.java @@ -54,12 +54,10 @@ private void attachRouteActions(@NotNull Collection> l } PsiElement psiElement = leaf.getParent(); - if (!(psiElement instanceof MethodReference) || !"controller".equalsIgnoreCase(((MethodReference) psiElement).getName()) || !PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) psiElement, "\\Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait", "controller")) { + if (!(psiElement instanceof MethodReference methodCall) || !"controller".equalsIgnoreCase(((MethodReference) psiElement).getName()) || !PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) psiElement, "\\Symfony\\Component\\Routing\\Loader\\Configurator\\Traits\\RouteTrait", "controller")) { return; } - MethodReference methodCall = (MethodReference) psiElement; - PsiElement[] methods = RouteHelper.getPhpController(methodCall); if(methods.length > 0) { NavigationGutterIconBuilder builder = NavigationGutterIconBuilder.create(Symfony2Icons.TWIG_CONTROLLER_LINE_MARKER). 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 19dfe67d0..3a77e686a 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/routing/RouteHelper.java @@ -675,24 +675,21 @@ private static Route convertRouteConfig(@NotNull String routeName, @NotNull Arra hashValue.getHashElements().forEach(hashElementCollection::add); Set variables = new HashSet<>(); - if(hashElementCollection.size() >= 1 && hashElementCollection.get(0).getValue() instanceof ArrayCreationExpression) { - ArrayCreationExpression value = (ArrayCreationExpression) hashElementCollection.get(0).getValue(); + if(hashElementCollection.size() >= 1 && hashElementCollection.get(0).getValue() instanceof ArrayCreationExpression value) { if(value != null) { variables.addAll(PhpElementsUtil.getArrayKeyValueMap(value).values()); } } Map defaults = new HashMap<>(); - if(hashElementCollection.size() >= 2 && hashElementCollection.get(1).getValue() instanceof ArrayCreationExpression) { - ArrayCreationExpression value = (ArrayCreationExpression) hashElementCollection.get(1).getValue(); + if(hashElementCollection.size() >= 2 && hashElementCollection.get(1).getValue() instanceof ArrayCreationExpression value) { if(value != null) { defaults = PhpElementsUtil.getArrayKeyValueMap(value); } } Maprequirements = new HashMap<>(); - if(hashElementCollection.size() >= 3 && hashElementCollection.get(2).getValue() instanceof ArrayCreationExpression) { - ArrayCreationExpression value = (ArrayCreationExpression) hashElementCollection.get(2).getValue(); + if(hashElementCollection.size() >= 3 && hashElementCollection.get(2).getValue() instanceof ArrayCreationExpression value) { if(value != null) { requirements = PhpElementsUtil.getArrayKeyValueMap(value); } @@ -700,8 +697,7 @@ private static Route convertRouteConfig(@NotNull String routeName, @NotNull Arra StringBuilder path = new StringBuilder(); List> tokens = new ArrayList<>(); - if(hashElementCollection.size() >= 4 && hashElementCollection.get(3).getValue() instanceof ArrayCreationExpression) { - ArrayCreationExpression tokenArray = (ArrayCreationExpression) hashElementCollection.get(3).getValue(); + if(hashElementCollection.size() >= 4 && hashElementCollection.get(3).getValue() instanceof ArrayCreationExpression tokenArray) { if(tokenArray != null) { List result = StreamSupport.stream(tokenArray.getHashElements().spliterator(), false) .collect(Collectors.toList()); 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 1f9d52c06..67d29d9bc 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/ServiceIndexUtil.java @@ -398,18 +398,7 @@ private static Map> getParentServicesInner( return services; } - private static class MyServiceIdLazyValue implements Supplier> { - @NotNull - private final Project project; - - @NotNull - private final Collection ids; - - MyServiceIdLazyValue(@NotNull Project project, @NotNull Collection ids) { - this.project = project; - this.ids = ids; - } - + private record MyServiceIdLazyValue(@NotNull Project project, @NotNull Collection ids) implements Supplier> { @Override public Collection get() { Collection psiElements = new HashSet<>(); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java index 1f16ae03e..97e47354d 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/dict/TwigMacroTagIndex.java @@ -11,31 +11,7 @@ /** * @author Daniel Espendiller */ -public class TwigMacroTagIndex implements TwigMacroTagInterface, Serializable { - - @NotNull - private final String name; - - @Nullable - private final String parameters; - - public TwigMacroTagIndex(@NotNull String name, @Nullable String parameters) { - this.name = name; - this.parameters = parameters; - } - - @NotNull - @Override - public String getName() { - return name; - } - - @Nullable - @Override - public String getParameters() { - return parameters; - } - +public record TwigMacroTagIndex(@NotNull String name, @Nullable String parameters) implements TwigMacroTagInterface, Serializable { @Override public int hashCode() { return new HashCodeBuilder() @@ -47,7 +23,7 @@ public int hashCode() { @Override public boolean equals(Object obj) { return obj instanceof TwigMacroTagInterface && - Objects.equals(((TwigMacroTagInterface) obj).getName(), this.name) && - Objects.equals(((TwigMacroTagInterface) obj).getParameters(), this.parameters); + Objects.equals(((TwigMacroTagInterface) obj).name(), this.name) && + Objects.equals(((TwigMacroTagInterface) obj).parameters(), this.parameters); } } 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 8cb3388f3..b82b7796e 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 @@ -47,9 +47,9 @@ public DataIndexer getIndexer() { } TwigUtil.visitMacros(psiFile, pair -> { - String templateName = pair.getFirst().getName(); + String templateName = pair.getFirst().name(); if (templateName.length() < 255) { - map.put(templateName, new TwigMacroTagIndex(templateName, pair.getFirst().getParameters())); + map.put(templateName, new TwigMacroTagIndex(templateName, pair.getFirst().parameters())); } }); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java index 4d721e051..8328be146 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/stubs/indexes/externalizer/StringSetDataExternalizer.java @@ -23,10 +23,8 @@ public class StringSetDataExternalizer implements DataExternalizer> public synchronized void save(@NotNull DataOutput out, Set value) throws IOException { out.writeInt(value.size()); - Iterator var = value.iterator(); - while(var.hasNext()) { - String s = (String)var.next(); + for (String s : value) { EnumeratorStringDescriptor.INSTANCE.save(out, s); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java index 28869a1fe..9734084df 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigLineMarkerProvider.java @@ -260,14 +260,7 @@ private LineMarkerInfo attachBlockImplements(@NotNull PsiElement psiElement, return builder.createLineMarkerInfo(psiElement); } - private static class BlockImplementationLazyValue implements Supplier> { - @NotNull - private final PsiElement psiElement; - - BlockImplementationLazyValue(@NotNull PsiElement psiElement) { - this.psiElement = psiElement; - } - + private record BlockImplementationLazyValue(@NotNull PsiElement psiElement) implements Supplier> { @Override public Collection get() { return TwigBlockUtil.getBlockImplementationTargets(psiElement); @@ -277,14 +270,7 @@ public Collection get() { /** * Provides lazy targets for given template scope */ - private static class BlockOverwriteLazyValue implements Supplier> { - @NotNull - private final PsiElement psiElement; - - BlockOverwriteLazyValue(@NotNull PsiElement psiElement) { - this.psiElement = psiElement; - } - + private record BlockOverwriteLazyValue(@NotNull PsiElement psiElement) implements Supplier> { @Override public Collection get() { return TwigBlockUtil.getBlockOverwriteTargets(psiElement); @@ -375,25 +361,14 @@ protected Icon getIcon(PsiElement psiElement) { } } - private static class MyTemplateIncludeLazyValue implements Supplier> { - @NotNull - private final TwigFile twigFile; - - @NotNull - private final Collection templateNames; - - MyTemplateIncludeLazyValue(@NotNull TwigFile twigFile, @NotNull Collection templateNames) { - this.twigFile = twigFile; - this.templateNames = templateNames; - } - + private record MyTemplateIncludeLazyValue(@NotNull TwigFile twigFile, @NotNull Collection templateNames) implements Supplier> { @Override public Collection get() { Collection twigFiles = new ArrayList<>(); Project project = twigFile.getProject(); - for(String templateName: this.templateNames) { + for (String templateName : this.templateNames) { // collect files which contains given template name for inclusion twigFiles.addAll(FileBasedIndex.getInstance().getContainingFiles( TwigIncludeStubIndex.KEY, @@ -407,21 +382,21 @@ public Collection get() { for (VirtualFile virtualFile : twigFiles) { // resolve virtual file PsiFile myTwigFile = PsiManager.getInstance(project).findFile(virtualFile); - if(!(myTwigFile instanceof TwigFile)) { + if (!(myTwigFile instanceof TwigFile)) { continue; } Collection fileTargets = new ArrayList<>(); TwigUtil.visitTemplateIncludes((TwigFile) myTwigFile, templateInclude -> { - if(this.templateNames.contains(templateInclude.getTemplateName()) || this.templateNames.contains(TwigUtil.normalizeTemplateName(templateInclude.getTemplateName()))) { + if (this.templateNames.contains(templateInclude.getTemplateName()) || this.templateNames.contains(TwigUtil.normalizeTemplateName(templateInclude.getTemplateName()))) { fileTargets.add(templateInclude.getPsiElement()); } } ); // navigate to include pattern; else fallback to file scope - if(fileTargets.size() > 0) { + if (fileTargets.size() > 0) { targets.addAll(fileTargets); } else { targets.add(myTwigFile); @@ -460,17 +435,7 @@ protected Icon getIcon(PsiElement psiElement) { /** * Find "extends" which are targeting the given template file */ - private static class TemplateExtendsLazyTargets implements Supplier> { - @NotNull - private final Project project; - @NotNull - private final VirtualFile virtualFile; - - TemplateExtendsLazyTargets(@NotNull Project project, @NotNull VirtualFile virtualFile) { - this.project = project; - this.virtualFile = virtualFile; - } - + private record TemplateExtendsLazyTargets(@NotNull Project project, @NotNull VirtualFile virtualFile) implements Supplier> { @Override public Collection get() { return PsiElementUtils.convertVirtualFilesToPsiFiles(project, TwigUtil.getTemplatesExtendingFile(project, virtualFile)); 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 0bb71a22d..c9cbd7840 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java @@ -170,7 +170,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, ProcessingC private void attachLookupElements(@NotNull CompletionResultSet resultSet, Collection psiFiles) { for (PsiFile psiFile : psiFiles) { for (TwigMacroTagInterface entry : TwigUtil.getMacros(psiFile)) { - resultSet.addElement(LookupElementBuilder.create(entry.getName()).withTypeText(entry.getParameters(), true).withIcon(TwigIcons.TwigFileIcon)); + resultSet.addElement(LookupElementBuilder.create(entry.name()).withTypeText(entry.parameters(), true).withIcon(TwigIcons.TwigFileIcon)); } } } @@ -223,7 +223,7 @@ public void addCompletions(@NotNull CompletionParameters parameters, @NotNull Pr TwigMacroTag twigMacro = pair.getFirst(); resultSet.addElement(LookupElementBuilder - .create(twigMacro.getName()) + .create(twigMacro.name()) .withIcon(TwigIcons.TwigFileIcon) .withInsertHandler(FunctionInsertHandler.getInstance()) ); @@ -1145,11 +1145,10 @@ private Collection> getTargetFunctionCallWithPara for (PsiElement psiElement : psiElements) { PsiElement variableContext = psiElement.getContext(); - if(!(variableContext instanceof ParameterList)) { + if(!(variableContext instanceof ParameterList parameterList)) { continue; } - ParameterList parameterList = (ParameterList) variableContext; PsiElement context = parameterList.getContext(); // @TODO: support functions also if (context instanceof MethodReference) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java index 1e0119304..200f41d22 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateGoToDeclarationHandler.java @@ -499,7 +499,7 @@ private Collection getSelfMacros(@NotNull PsiElement psiElement) { String funcName = psiElement.getText(); TwigUtil.visitMacros(psiElement.getContainingFile(), pair -> { - if (funcName.equals(pair.getFirst().getName())) { + if (funcName.equals(pair.getFirst().name())) { psiElements.add(pair.getSecond()); } }); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java index 76084fbd8..8214bb173 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTag.java @@ -8,32 +8,12 @@ * * @author Daniel Espendiller */ -public class TwigMacroTag implements TwigMacroTagInterface { - - @NotNull - private final String name; - - @Nullable - private final String parameters; - +public record TwigMacroTag(@NotNull String name, @Nullable String parameters) implements TwigMacroTagInterface { /** * {% macro input(name, value, type, size) %} * - * @param name macro name + * @param name macro name * @param parameters Raw parameter string (name, value, type, size) */ - public TwigMacroTag(@NotNull String name, @Nullable String parameters) { - this.name = name; - this.parameters = parameters; - } - - @NotNull - public String getName() { - return name; - } - - @Nullable - public String getParameters() { - return parameters; - } + public TwigMacroTag {} } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java index 9fbf70328..8590f4012 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/dict/TwigMacroTagInterface.java @@ -10,8 +10,8 @@ */ public interface TwigMacroTagInterface { @NotNull - String getName(); + String name(); @Nullable - String getParameters(); + String parameters(); } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java index ae09cfa1b..1e07f3ded 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/path/JsonFileIndexTwigNamespaces.java @@ -61,17 +61,9 @@ private static Collection getNamespacesInner(@NotNull Project project) return twigPaths; } - private static class MyJsonCachedValueProvider implements CachedValueProvider> { - private final PsiFile psiFile; - - public MyJsonCachedValueProvider(PsiFile psiFile) { - this.psiFile = psiFile; - } - - @Nullable + private record MyJsonCachedValueProvider(PsiFile psiFile) implements CachedValueProvider> { @Override public Result> compute() { - Collection twigPaths = new ArrayList<>(); String text = psiFile.getText(); @@ -81,36 +73,36 @@ public Result> compute() { } catch (JsonSyntaxException | JsonIOException | IllegalStateException ignored) { } - if(configJson == null) { + if (configJson == null) { return Result.create(twigPaths, psiFile, psiFile.getVirtualFile()); } - for(TwigPathJson twigPath : configJson.getNamespaces()) { + for (TwigPathJson twigPath : configJson.getNamespaces()) { String path = twigPath.getPath(); - if(path == null || path.equals(".")) { + if (path == null || path.equals(".")) { path = ""; } path = StringUtils.stripStart(path.replace("\\", "/"), "/"); PsiDirectory parent = psiFile.getParent(); - if(parent == null) { + if (parent == null) { continue; } // current directory check and subfolder VirtualFile twigRoot; - if(path.length() > 0) { + if (path.length() > 0) { twigRoot = VfsUtil.findRelativeFile(parent.getVirtualFile(), path.split("/")); } else { twigRoot = psiFile.getParent().getVirtualFile(); } - if(twigRoot == null) { + if (twigRoot == null) { continue; } String relativePath = VfsExUtil.getRelativeProjectPath(psiFile.getProject(), twigRoot); - if(relativePath == null) { + if (relativePath == null) { continue; } @@ -118,13 +110,13 @@ public Result> compute() { TwigUtil.NamespaceType pathType = TwigUtil.NamespaceType.ADD_PATH; String type = twigPath.getType(); - if("bundle".equalsIgnoreCase(type)) { + if ("bundle".equalsIgnoreCase(type)) { pathType = TwigUtil.NamespaceType.BUNDLE; } String namespacePath = StringUtils.stripStart(relativePath, "/"); - if(StringUtils.isNotBlank(namespace)) { + if (StringUtils.isNotBlank(namespace)) { twigPaths.add(new TwigPath(namespacePath, namespace, pathType, true)); } else { twigPaths.add(new TwigPath(namespacePath, TwigUtil.MAIN, pathType, true)); 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 d72536faa..909d90f07 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 @@ -625,7 +625,7 @@ public static Collection getImportedMacros(@NotNull PsiFile psiFile, for (PsiFile file : foreignPsiFile) { visitMacros(file, pair -> { - if(macroName.equals(pair.getFirst().getName())) { + if(macroName.equals(pair.getFirst().name())) { psiElements.add(pair.getSecond()); } }); @@ -711,7 +711,7 @@ private static void visitImportedMacrosNamespaces(@NotNull PsiFile psiFile, @Not if(macroFiles.size() > 0) { for (PsiFile macroFile : macroFiles) { TwigUtil.visitMacros(macroFile, tagPair -> consumer.consume(Pair.create( - new TwigMacro(asName + '.' + tagPair.getFirst().getName(), template).withParameter(tagPair.getFirst().getParameters()), + new TwigMacro(asName + '.' + tagPair.getFirst().name(), template).withParameter(tagPair.getFirst().parameters()), tagPair.getSecond() ))); } 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 2d6b63770..3e6cc7479 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 @@ -9,7 +9,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; -import java.util.Iterator; import java.util.List; /** diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java index 108c9cf96..8eb47f05c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationPlaceholderGotoCompletionRegistrar.java @@ -205,40 +205,33 @@ public GotoCompletionProvider getProvider(@NotNull PsiElement psiElement) { /** * {{ 'symfony.great'|trans({'fof'}, 'symfony')) }} */ - private static class MyTwigTransFilterCompletionContributor implements GotoCompletionContributor { - @NotNull - private final String filter; - - MyTwigTransFilterCompletionContributor(@NotNull String filter) { - this.filter = filter; - } - + private record MyTwigTransFilterCompletionContributor(@NotNull String filter) implements GotoCompletionContributor { @Nullable @Override public GotoCompletionProvider getProvider(@NotNull PsiElement psiElement) { PsiElement parent = psiElement.getParent(); - if(parent.getNode().getElementType() != TwigElementTypes.LITERAL) { + if (parent.getNode().getElementType() != TwigElementTypes.LITERAL) { return null; } PsiElement functionCall = parent.getParent(); - if(functionCall.getNode().getElementType() != TwigElementTypes.FUNCTION_CALL) { + if (functionCall.getNode().getElementType() != TwigElementTypes.FUNCTION_CALL) { return null; } // find translation key: 'symfony.great' PsiElement function = PsiElementUtils.getPrevSiblingOfType(functionCall, TwigPattern.getTranslationKeyPattern(this.filter)); - if(function == null) { + if (function == null) { return null; } String key = function.getText(); - if(StringUtils.isBlank(key)) { + if (StringUtils.isBlank(key)) { return null; } String domain = TwigUtil.getPsiElementTranslationDomain(function); - if(StringUtils.isBlank(domain)) { + if (StringUtils.isBlank(domain)) { return null; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java index 7128b5290..269b7ebc6 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/TranslationReferenceContributor.java @@ -27,11 +27,10 @@ public void registerReferenceProviders(PsiReferenceRegistrar psiReferenceRegistr @NotNull @Override public PsiReference @NotNull [] getReferencesByElement(@NotNull PsiElement psiElement, @NotNull ProcessingContext processingContext) { - if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList)) { + if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList parameterList)) { return new PsiReference[0]; } - ParameterList parameterList = (ParameterList) psiElement.getContext(); PsiElement methodReferenceOrNewExpression = parameterList.getContext(); if (!( diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java index fb1577952..601202127 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/translation/dict/TranslationUtil.java @@ -473,11 +473,10 @@ private static void visitNodes(@NotNull String xpath, @NotNull Document document return; } - if(!(result instanceof NodeList)) { + if(!(result instanceof NodeList nodeList)) { return; } - NodeList nodeList = (NodeList) result; for (int i = 0; i < nodeList.getLength(); i++) { Element node = (Element) nodeList.item(i); String textContent = node.getTextContent(); @@ -504,39 +503,28 @@ private static void visitNodes(@NotNull String xpath, @NotNull Document document /** * - * foo - * foo + * foo + * foo * */ - private static class MyXlfTranslationConsumer implements Consumer> { - @NotNull - private final Set placeholder; - - @NotNull - private final String key; - - MyXlfTranslationConsumer(@NotNull Set placeholder, @NotNull String key) { - this.placeholder = placeholder; - this.key = key; - } + private record MyXlfTranslationConsumer(@NotNull Set placeholder, @NotNull String key) implements Consumer> { @Override public void consume(Pair pair) { - if(!(pair.getSecond() instanceof Element) || !"source".equalsIgnoreCase(pair.getSecond().getNodeName())) { + if (!(pair.getSecond() instanceof Element source) || !"source".equalsIgnoreCase(pair.getSecond().getNodeName())) { return; } - Element source = (Element) pair.getSecond(); - if(!key.equalsIgnoreCase(source.getTextContent())) { + if (!key.equalsIgnoreCase(source.getTextContent())) { return; } visitNodeText(source); Node transUnit = source.getParentNode(); - if(transUnit instanceof Element) { + if (transUnit instanceof Element) { NodeList target = ((Element) transUnit).getElementsByTagName("target"); - if(target.getLength() > 0) { + if (target.getLength() > 0) { visitNodeText(target.item(0)); } } @@ -544,7 +532,7 @@ public void consume(Pair pair) { private void visitNodeText(@NotNull Node target) { String nodeValue = target.getTextContent(); - if(StringUtils.isNotBlank(nodeValue)) { + if (StringUtils.isNotBlank(nodeValue)) { placeholder.addAll( TranslationUtil.getPlaceholderFromTranslation(nodeValue) ); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java index adfc1faa0..ef3119b17 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/dict/UiFilePathPresentable.java @@ -5,26 +5,4 @@ /** * @author Daniel Espendiller */ -public class UiFilePathPresentable { - - @NotNull - private final String path; - - @NotNull - private final String info; - - public UiFilePathPresentable(@NotNull String path, @NotNull String info) { - this.path = path; - this.info = info; - } - - @NotNull - public String getPath() { - return path; - } - - @NotNull - public String getInfo() { - return info; - } -} +public record UiFilePathPresentable(@NotNull String path, @NotNull String info) {} diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java index cc3ef3a4a..fce5f7b86 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/utils/dict/UiPathColumnInfo.java @@ -36,7 +36,7 @@ public TypeColumn(Project project) { @Nullable @Override public String valueOf(UiFilePathInterface file) { - return UiSettingsUtil.getPresentableFilePath(project, file).getInfo(); + return UiSettingsUtil.getPresentableFilePath(project, file).info(); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java index e3323a89e..a1843f674 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/DocHashTagReferenceContributor.java @@ -200,11 +200,10 @@ public boolean isValid() { } PsiElement resolvedReference = psiReference.resolve(); - if (!(resolvedReference instanceof Method)) { + if (!(resolvedReference instanceof Method method)) { return false; } - Method method = (Method) resolvedReference; Parameter[] methodParameter = method.getParameters(); if(methodParameter.length -1 < currentIndex.getIndex()) { return false; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java index d7d064691..4cf1e46f2 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodMatcher.java @@ -241,10 +241,9 @@ public MethodMatchParameter match() { return null; } - if (!(parameterList.getContext() instanceof MethodReference)) { + if (!(parameterList.getContext() instanceof MethodReference methodReference)) { return null; } - MethodReference methodReference = (MethodReference) parameterList.getContext(); ParameterBag currentIndex = PsiElementUtils.getCurrentParameterIndex(arrayCreationExpression); if (currentIndex == null || currentIndex.getIndex() != this.parameterIndex) { diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java index f3bc1a441..9fe965438 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/MethodParameterReferenceContributor.java @@ -55,12 +55,10 @@ public void registerReferenceProviders(PsiReferenceRegistrar psiReferenceRegistr return new PsiReference[0]; } - if(!(parameterList.getContext() instanceof MethodReference)) { + if(!(parameterList.getContext() instanceof MethodReference method)) { return new PsiReference[0]; } - MethodReference method = (MethodReference) parameterList.getContext(); - List psiReferences = new ArrayList<>(); // get config in method scope; so we can pipe them 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 93a6d5832..557c021ae 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java @@ -778,11 +778,10 @@ static public String getArrayHashValue(ArrayCreationExpression arrayCreationExpr return null; } - if(!(translationArrayHashElement.getValue() instanceof StringLiteralExpression)) { + if(!(translationArrayHashElement.getValue() instanceof StringLiteralExpression valueString)) { return null; } - StringLiteralExpression valueString = (StringLiteralExpression) translationArrayHashElement.getValue(); if(valueString == null) { return null; } @@ -1096,11 +1095,10 @@ public static PsiElement[] getMethodParameterReferences(@NotNull Method method, public static MethodReferenceBag getMethodParameterReferenceBag(PsiElement psiElement, int wantIndex) { PsiElement variableContext = psiElement.getContext(); - if(!(variableContext instanceof ParameterList)) { + if(!(variableContext instanceof ParameterList parameterList)) { return null; } - ParameterList parameterList = (ParameterList) variableContext; if (!(parameterList.getContext() instanceof MethodReference)) { return null; } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java index df9947e48..47025905e 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpStringLiteralExpressionReference.java @@ -39,11 +39,10 @@ public PhpStringLiteralExpressionReference addCall(String className, String meth @NotNull @Override public PsiReference[] getReferencesByElement(@NotNull PsiElement psiElement, @NotNull ProcessingContext processingContext) { - if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList)) { + if (!Symfony2ProjectComponent.isEnabled(psiElement) || !(psiElement.getContext() instanceof ParameterList parameterList)) { return new PsiReference[0]; } - ParameterList parameterList = (ParameterList) psiElement.getContext(); PsiElement methodReference = parameterList.getContext(); if (!(methodReference instanceof MethodReference)) { return new PsiReference[0]; 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 1a3edbfea..e8748b23b 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PsiElementUtils.java @@ -28,12 +28,10 @@ public class PsiElementUtils { public static String getMethodParameter(PsiElement parameter) { - if (!(parameter instanceof StringLiteralExpression)) { + if (!(parameter instanceof StringLiteralExpression stringLiteralExpression)) { return null; } - StringLiteralExpression stringLiteralExpression = (StringLiteralExpression) parameter; - String stringValue = stringLiteralExpression.getText(); String value = stringValue.substring(stringLiteralExpression.getValueRange().getStartOffset(), stringLiteralExpression.getValueRange().getEndOffset()); diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java index feef736e6..2512372b9 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/VersionUtil.java @@ -6,6 +6,6 @@ public class VersionUtil { public static boolean productVersionGreaterThanOrEqual(int major, int minor) { ApplicationInfo instance = ApplicationInfo.getInstance(); - return Integer.valueOf(instance.getMajorVersion()) > major || (Integer.valueOf(instance.getMajorVersion()).equals(major) && Integer.valueOf(instance.getMinorVersionMainPart()) >= minor); + return Integer.parseInt(instance.getMajorVersion()) > major || (Integer.valueOf(instance.getMajorVersion()).equals(major) && Integer.parseInt(instance.getMinorVersionMainPart()) >= minor); } } diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java index 75d9cc6e9..bac14cd89 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpClassReferenceInsertHandler.java @@ -16,12 +16,11 @@ public class PhpClassReferenceInsertHandler implements InsertHandler { @NotNull private final Class[] classes; + @SafeVarargs public ParentPathPatternCondition(@NotNull Class... parentClasses) { super("Parent path pattern"); this.classes = parentClasses; diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java index 235072034..c0a47cc2c 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/resource/FileResourceUtil.java @@ -332,11 +332,8 @@ public FileVisitResult visitFileFailed(Path file, IOException exc) { return psiFiles; } - private static class FileResourceNotNullLazyValue implements Supplier> { - private final Project project; - private final VirtualFile virtualFile; - - public FileResourceNotNullLazyValue(@NotNull Project project, @NotNull VirtualFile virtualFile) { + private record FileResourceNotNullLazyValue(Project project, VirtualFile virtualFile) implements Supplier> { + private FileResourceNotNullLazyValue(@NotNull Project project, @NotNull VirtualFile virtualFile) { this.project = project; this.virtualFile = virtualFile; } 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 985da358b..9fe53dee8 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 @@ -730,11 +730,10 @@ public static void visitTagsOnServiceDefinition(@NotNull YAMLKeyValue yamlServic for(YAMLSequenceItem yamlSequenceItem: ((YAMLSequence) tagsValue).getItems()) { final YAMLValue itemValue = yamlSequenceItem.getValue(); - if(itemValue instanceof YAMLMapping) { + if(itemValue instanceof final YAMLMapping yamlHash) { // tags: // - {name: foobar} - final YAMLMapping yamlHash = (YAMLMapping) itemValue; String tagName = YamlHelper.getYamlKeyValueAsString(yamlHash, "name"); if(tagName != null) { visitor.visit(new YamlServiceTag(serviceId, tagName, yamlHash)); @@ -1136,16 +1135,12 @@ private static String getClassFromServiceDefinition(@NotNull YAMLKeyValue yamlKe */ public static void visitServiceCallArgument(@NotNull YAMLScalar yamlScalar, @NotNull Consumer consumer) { PsiElement context = yamlScalar.getContext(); - if(context instanceof YAMLSequenceItem) { + if(context instanceof YAMLSequenceItem argumentSequenceItem) { // [@foobar, @foobar] - YAMLSequenceItem argumentSequenceItem = (YAMLSequenceItem) context; - if (argumentSequenceItem.getContext() instanceof YAMLSequence) { - YAMLSequence yamlCallParameterArray = (YAMLSequence) argumentSequenceItem.getContext(); + if (argumentSequenceItem.getContext() instanceof YAMLSequence yamlCallParameterArray) { PsiElement callSequenceItem = yamlCallParameterArray.getContext(); - if(callSequenceItem instanceof YAMLSequenceItem) { - YAMLSequenceItem enclosingItem = (YAMLSequenceItem) callSequenceItem; - if (enclosingItem.getContext() instanceof YAMLSequence) { - YAMLSequence yamlCallArray = (YAMLSequence) enclosingItem.getContext(); + if(callSequenceItem instanceof YAMLSequenceItem enclosingItem) { + if (enclosingItem.getContext() instanceof YAMLSequence yamlCallArray) { PsiElement seqItem = yamlCallArray.getContext(); if(seqItem instanceof YAMLSequenceItem) { // - [ setFoo, [@args_bar] ] diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java index d2eb5e36d..c4ae82517 100644 --- a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java +++ b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/stubs/indexes/TwigMacroFunctionStubIndexTest.java @@ -19,7 +19,7 @@ public void testThatMacrosAreInIndex() { assertIndexContains(TwigMacroFunctionStubIndex.KEY, "foobar", "foobar2"); assertIndexContainsKeyWithValue(TwigMacroFunctionStubIndex.KEY, "foobar2", value -> - "(foobar, foo)".equals(value.getParameters()) + "(foobar, foo)".equals(value.parameters()) ); } } 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 f9bd3e36f..5cf8e9620 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 @@ -924,15 +924,15 @@ public void testGetMacros() { assertEquals( "(name, value, type, size)", - macros.stream().filter(twigMacroTag -> "input".equals(twigMacroTag.getName())).findFirst().get().getParameters() + macros.stream().filter(twigMacroTag -> "input".equals(twigMacroTag.name())).findFirst().get().parameters() ); assertNull( - macros.stream().filter(twigMacroTag -> "foobar".equals(twigMacroTag.getName())).findFirst().get().getParameters() + macros.stream().filter(twigMacroTag -> "foobar".equals(twigMacroTag.name())).findFirst().get().parameters() ); assertNull( - macros.stream().filter(twigMacroTag -> "foobar_if".equals(twigMacroTag.getName())).findFirst().get().getParameters() + macros.stream().filter(twigMacroTag -> "foobar_if".equals(twigMacroTag.name())).findFirst().get().parameters() ); }