Merge branch 'master' into fix-2494

Author: blindpirate

gradle.properties

@@ -22,7 +22,7 @@ platformBranch=.2
 platformBuild=
 pluginVersion=
 pluginBranch=
-pluginBuild=
+pluginBuild=.1
 useInstaller=false
 pycharmVersion=192.4787.5-EAP-SNAPSHOT
 clionVersion=192.4787.12-EAP-SNAPSHOT

mason/htmlmason/core/src/main/java/com/perl5/lang/htmlmason/idea/hierarchy/HTMLMasonTypeHierarchyTreeStructure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ protected static List<PsiElement> getLinearParents(PsiElement element) {
       if (recursionMap.contains(run)) {
         break;
       }
-      result.add(0, run);
+      result.addFirst(run);
       recursionMap.add(run);
 
       run = run.getParentComponent();

mason/htmlmason/core/src/main/java/com/perl5/lang/htmlmason/parser/psi/impl/HTMLMasonFileImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -545,28 +545,18 @@ private Map<Class<? extends HTMLMasonCompositeElement>, List<HTMLMasonCompositeE
 
       PsiTreeUtil.processElements(HTMLMasonFileImpl.this, element ->
       {
-        if (element instanceof HTMLMasonOnceBlock) {
-          onceResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonSharedBlock) {
-          sharedResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonCleanupBlock) {
-          cleanupResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonInitBlock &&
-                 HTMLMasonFileImpl.this.equals(PsiTreeUtil.getParentOfType(element, HTMLMasonArgsContainer.class))) {
-          initResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonArgsBlock &&
-                 HTMLMasonFileImpl.this.equals(PsiTreeUtil.getParentOfType(element, HTMLMasonArgsContainer.class))) {
-          argsResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonMethodDefinition) {
-          methodsResult.add((HTMLMasonCompositeElement)element);
-        }
-        else if (element instanceof HTMLMasonSubcomponentDefitnition) {
-          subComponentsResult.add((HTMLMasonCompositeElement)element);
+        switch (element) {
+          case HTMLMasonOnceBlock block -> onceResult.add(block);
+          case HTMLMasonSharedBlock block -> sharedResult.add(block);
+          case HTMLMasonCleanupBlock block -> cleanupResult.add(block);
+          case HTMLMasonInitBlock block
+            when HTMLMasonFileImpl.this.equals(PsiTreeUtil.getParentOfType(element, HTMLMasonArgsContainer.class)) -> initResult.add(block);
+          case HTMLMasonArgsBlock block
+            when HTMLMasonFileImpl.this.equals(PsiTreeUtil.getParentOfType(element, HTMLMasonArgsContainer.class)) -> argsResult.add(block);
+          case HTMLMasonMethodDefinition definition -> methodsResult.add(definition);
+          case HTMLMasonSubcomponentDefitnition defitnition -> subComponentsResult.add(defitnition);
+          default -> {
+          }
         }
 
         return true;

mojo/src/test/java/run/MojoProjectTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ public void testGenerateAppAction() {
     if (projects.size() != 1) {
       fail("Expected an application, got: " + projects);
     }
-    assertInstanceOf(projects.get(0), MojoApp.class);
-    LOG.info("Got: " + projects.get(0));
+    assertInstanceOf(projects.getFirst(), MojoApp.class);
+    LOG.info("Got: " + projects.getFirst());
   }
 
   private @NotNull List<MojoProject> runMojoGenerateActionAndGetProjects(@NotNull MojoGenerateAction action) {
@@ -86,8 +86,8 @@ public void testGeneratePluginAction() {
     if (projects.size() != 1) {
       fail("Expected a plugin, got: " + projects);
     }
-    assertInstanceOf(projects.get(0), MojoPlugin.class);
-    LOG.info("Got: " + projects.get(0));
+    assertInstanceOf(projects.getFirst(), MojoPlugin.class);
+    LOG.info("Got: " + projects.getFirst());
   }
 
   private void assertMojoAvailable() {

plugin/core/src/main/java/com/perl5/lang/perl/documentation/PerlDocUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -320,7 +320,7 @@ public void visitElement(@NotNull PsiElement element) {
       }
     });
 
-    return result.isEmpty() ? null : result.get(0);
+    return result.isEmpty() ? null : result.getFirst();
   }
 
   public static String renderPodFile(PodFileImpl file) {
@@ -375,17 +375,17 @@ else if (elementType != TokenType.WHITE_SPACE && elementType != COMMENT_LINE) {
     }
     PsiElement run = podSection;
 
-    // detecting first section
     while (true) {
       PsiElement prevSibling = run.getPrevSibling();
+      //noinspection IfCanBeSwitch
       if (prevSibling == null) {
         break;
       }
       if (prevSibling instanceof PodSection && ((PodSection)prevSibling).hasContent()) {
         break;
       }
-      if (prevSibling instanceof PodTitledSection) {
-        podSection = (PodTitledSection)prevSibling;
+      if (prevSibling instanceof PodTitledSection section) {
+        podSection = section;
       }
       run = prevSibling;
     }
@@ -417,7 +417,7 @@ else if (elementType != TokenType.WHITE_SPACE && elementType != COMMENT_LINE) {
       if (run instanceof PodLinkTarget) {
         String bcLink = ((PodLinkTarget)run).getPodLink();
         if (StringUtil.isNotEmpty(bcLink)) {
-          breadCrumbs.add(0, PodRenderUtil.getHTMLPsiLink(bcLink, ((PodLinkTarget)run).getPodLinkText()));
+          breadCrumbs.addFirst(PodRenderUtil.getHTMLPsiLink(bcLink, ((PodLinkTarget)run).getPodLinkText()));
         }
       }
       if (run instanceof PsiFile) {

plugin/core/src/main/java/com/perl5/lang/perl/documentation/PerlDocumentationProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -223,31 +223,23 @@ protected static boolean isOp(PsiElement element) {
    */
   @Contract("null->null")
   public static @Nullable PsiElement findPodElement(@Nullable PsiElement element) {
-    if (element == null) {
-      return null;
-    }
-    else if (element instanceof PerlBuiltInSubDefinition) {
-      String subName = StringUtil.notNullize(((PerlBuiltInSubDefinition)element).getName());
-      if ("default".equals(subName)) {
-        return PerlDocUtil.resolveDescriptor(SWITCH_DOC_LINK, element, false);
-      }
-      else {
-        return PerlDocUtil.getPerlFuncDocFromText(element, subName);
+    return switch (element) {
+      case null -> null;
+      case PerlBuiltInSubDefinition definition -> {
+        String subName = StringUtil.notNullize(definition.getName());
+        if ("default".equals(subName)) {
+          yield PerlDocUtil.resolveDescriptor(SWITCH_DOC_LINK, element, false);
+        }
+        else {
+          yield PerlDocUtil.getPerlFuncDocFromText(element, subName);
+        }
       }
-    }
-    else if (element instanceof PerlSubElement) {
-      return findPodElement((PerlSubElement)element);
-    }
-    else if (element instanceof PerlFileImpl) {
-      return findPodElement((PerlFileImpl)element);
-    }
-    else if (element instanceof PerlNamespaceDefinitionElement) {
-      return findPodElement((PerlNamespaceDefinitionElement)element);
-    }
-    else if (element instanceof PerlVariable) {
-      return PerlDocUtil.getPerlVarDoc((PerlVariable)element);
-    }
-    return null;
+      case PerlSubElement subElement -> findPodElement(subElement);
+      case PerlFileImpl file -> findPodElement(file);
+      case PerlNamespaceDefinitionElement definitionElement -> findPodElement(definitionElement);
+      case PerlVariable variable -> PerlDocUtil.getPerlVarDoc(variable);
+      default -> null;
+    };
   }
 
   /**

plugin/core/src/main/java/com/perl5/lang/perl/extensions/generation/PerlCodeGeneratorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -144,13 +144,13 @@ public class PerlCodeGeneratorImpl implements PerlCodeGenerator {
       }
 
       if (!superArgs.isEmpty()) {
-        superArgs.remove(0);
+        superArgs.removeFirst();
       }
 
-      if (!arguments.isEmpty() && !arguments.get(0).isEmpty()) {
+      if (!arguments.isEmpty() && !arguments.getFirst().isEmpty()) {
         //noinspection StringConcatenationInsideStringBufferAppend
         code.append(
-          arguments.get(0).toStringShort() + "->SUPER::" + perlSubBase.getSubName() + "(" + StringUtil.join(superArgs, ", ") + ");\n");
+          arguments.getFirst().toStringShort() + "->SUPER::" + perlSubBase.getSubName() + "(" + StringUtil.join(superArgs, ", ") + ");\n");
       }
       code.append("}");
       return code.toString();

plugin/core/src/main/java/com/perl5/lang/perl/extensions/mojo/MojoBaseProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ public PerlFeaturesTable getFeaturesTable(PerlUseStatementElement useStatement,
     if (allOptions != null) {
       allOptions.removeAll(getOptions().keySet());
 
-      if (!allOptions.isEmpty() && !MOJO_BASE.equals(allOptions.get(0))) {
-        loadedPackages.add(allOptions.get(0));
+      if (!allOptions.isEmpty() && !MOJO_BASE.equals(allOptions.getFirst())) {
+        loadedPackages.add(allOptions.getFirst());
       }
     }
 
@@ -83,7 +83,7 @@ public void changeParentsList(@NotNull PerlUseStatementElement useStatement, @No
       else {
         allOptions.removeAll(getOptions().keySet());
         if (!allOptions.isEmpty()) {
-          currentList.add(allOptions.get(0));
+          currentList.add(allOptions.getFirst());
         }
       }
     }

plugin/core/src/main/java/com/perl5/lang/perl/extensions/mojo/MojoLightDelegatingSubDefinition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public MojoLightDelegatingSubDefinition(@NotNull PerlUseStatementElement useStat
       if (it instanceof PerlSubDefinition) {
         List<PerlSubArgument> list = new ArrayList<>(((PerlSubDefinition)it).getSubArgumentsList());
         if (!list.isEmpty()) {
-          list.remove(0);
+          list.removeFirst();
         }
         argumentsRef.set(list);
         return false;

plugin/core/src/main/java/com/perl5/lang/perl/extensions/packageprocessor/impl/MroProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 Alexandr Evstigneev
+ * Copyright 2015-2024 Alexandr Evstigneev
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public class MroProcessor extends PerlPragmaProcessorBase implements PerlMroProv
   public @NotNull PerlMroType getMroType(PerlUseStatementElement useStatement) {
     List<String> parameters = useStatement.getImportParameters();
 
-    if (parameters != null && !parameters.isEmpty() && "c3".equals(parameters.get(0))) {
+    if (parameters != null && !parameters.isEmpty() && "c3".equals(parameters.getFirst())) {
       return PerlMroType.C3;
     }
     return PerlMroType.DFS;