Merge pull request #2075 from Haehnchen/feature/java-language

java language level feature migration records syntax on private usages

Author: Haehnchen

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<TranslationFileModel> files, final String keyName, final String domain, boolean navigateTo) {
             PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
@@ -191,7 +175,7 @@ public void onClick(List<TranslationFileModel> 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<TranslationFileModel> files, final String keyName, fina
             Collection<PsiElement> 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())
                 );

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<MethodSignatureSetting> matchedSignatures = getSignatureSetting(methodReference.getName(), signatures);
         if(matchedSignatures.size() == 0) {
             return null;

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() ==

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<LookupElement> {
-        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<LookupElement> {
         @Override
         public void handleInsert(@NotNull InsertionContext context, @NotNull LookupElement item) {
             SmartPsiElementPointer<PhpClass> parentOfType2 = (SmartPsiElementPointer<PhpClass>) item.getObject();

src/main/java/fr/adrienbrault/idea/symfony2plugin/completion/command/PhpCommandGotoCompletionRegistrar.java

@@ -221,16 +221,10 @@ private Map<String, CommandArg> getCommandConfigurationMap(@NotNull PhpClass php
             return targets;
         }
 
-        private static class CommandDefPsiElementFilter implements Processor<PsiElement> {
-            private final String methodName;
-
-            public CommandDefPsiElementFilter(String methodName) {
-                this.methodName = methodName;
-            }
-
+        private record CommandDefPsiElementFilter(String methodName) implements Processor<PsiElement> {
             @Override
             public boolean process(PsiElement psiElement) {
-                if(!(psiElement instanceof MethodReference)) {
+                if (!(psiElement instanceof MethodReference)) {
                     return false;
                 }
 

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/ConfigLineMarkerProvider.java

@@ -96,22 +96,7 @@ private void visitConfigKey(@NotNull Collection<? super LineMarkerInfo<?>> resul
         result.add(builder.createLineMarkerInfo(psiElement));
     }
 
-    private static class MyClassIdLazyValue implements Supplier<Collection<? extends PsiElement>> {
-        @NotNull
-        private final Project project;
-
-        @NotNull
-        private final Collection<String> configuration;
-
-        @NotNull
-        private final String root;
-
-        MyClassIdLazyValue(@NotNull Project project, @NotNull Collection<String> configuration, @NotNull String root) {
-            this.project = project;
-            this.configuration = configuration;
-            this.root = root;
-        }
-
+    private record MyClassIdLazyValue(@NotNull Project project, @NotNull Collection<String> configuration, @NotNull String root) implements Supplier<Collection<? extends PsiElement>> {
         @Override
         public Collection<? extends PsiElement> get() {
             return ConfigUtil.getTreeSignatureTargets(project, root, configuration);

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<Collection<? extends PsiElement>> {
-        private final Collection<ClassServiceDefinitionTargetLazyValue> targets;
-
-        public MyCollectionNotNullLazyValue(@NotNull Collection<ClassServiceDefinitionTargetLazyValue> targets) {
+    private record MyCollectionNotNullLazyValue(Collection<ClassServiceDefinitionTargetLazyValue> targets) implements Supplier<Collection<? extends PsiElement>> {
+        private MyCollectionNotNullLazyValue(@NotNull Collection<ClassServiceDefinitionTargetLazyValue> targets) {
             this.targets = targets;
         }
 

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,20 +174,18 @@ 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;
         }
 
         if(PsiElementUtils.getParameterIndexValue(psiElement) != index) {
             return false;
         }
 
-        NewExpression newExpression = (NewExpression) parameterList.getContext();
         ClassReference classReference = newExpression.getClassReference();
         if(classReference == null) {
             return false;

src/main/java/fr/adrienbrault/idea/symfony2plugin/config/utils/ConfigUtil.java

@@ -137,23 +137,7 @@ private static void visitTreeSignatures(@NotNull Collection<PhpClass> 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

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) {}
 }