3.0.0 innitial

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 2.1.0-develop ]
+    branches: [ master, 3.0.0-develop ]
 
 jobs:
   build-linux:

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). 
 
+## 3.0.0
+
 ## 2.1.0
 
 ### Added

build.gradle

@@ -15,15 +15,15 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '2.1.0'
+version '3.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "201.7223.91")
-def ideaVersion = System.getProperty("ideaVersion", "2020.1.1")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "202.8194.11")
+def ideaVersion = System.getProperty("ideaVersion", "2020.2.4")
 def javaVersion = 1.8
 
 sourceCompatibility = javaVersion

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin>
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>2.1.0</version>
+    <version>3.0.0</version>
     <vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>
 
     <description><![CDATA[
@@ -24,7 +24,7 @@
     </change-notes>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-    <idea-version since-build="201.7223.91"/>
+    <idea-version since-build="202.8194.7"/>
 
     <!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
          on how to target different products -->

src/com/magento/idea/magento2plugin/linemarker/graphql/GraphQlResolverClassLineMarkerProvider.java

@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.linemarker.graphql;
 
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
@@ -29,7 +30,7 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElements, @NotNull Collection<? super LineMarkerInfo<?>> collection) {
         if (psiElements.size() > 0) {
             if (!Settings.isEnabled(psiElements.get(0).getProject())) {
                 return;

src/com/magento/idea/magento2plugin/linemarker/php/ClassConfigurationLineMarkerProvider.java

@@ -1,7 +1,8 @@
-/**
+/*
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.linemarker.php;
 
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
@@ -13,32 +14,32 @@
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.indexes.XmlIndex;
 import com.magento.idea.magento2plugin.project.Settings;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Created by dkvashnin on 11/15/15.
  */
 public class ClassConfigurationLineMarkerProvider implements LineMarkerProvider {
+
     @Nullable
     @Override
     public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
         return null;
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> list, @NotNull Collection<LineMarkerInfo> collection) {
-        if (list.size() > 0) {
-            if (!Settings.isEnabled(list.get(0).getProject())) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> elements, @NotNull Collection<? super LineMarkerInfo<?>> result) {
+        if (elements.size() > 0) {
+            if (!Settings.isEnabled(elements.get(0).getProject())) {
                 return;
             }
         }
-        for (PsiElement psiElement: list) {
+        for (PsiElement psiElement: elements) {
             if (psiElement instanceof PhpClass) {
                 List<XmlTag> results = new ArrayList<XmlTag>();
 
@@ -57,7 +58,7 @@ public void collectSlowLineMarkers(@NotNull List<PsiElement> list, @NotNull Coll
 
                 PsiElement className = ((PhpClass) psiElement).getNameIdentifier();
                 if (className != null) {
-                    collection.add(builder.createLineMarkerInfo(className));
+                    result.add(builder.createLineMarkerInfo(className));
                 }
             }
         }

src/com/magento/idea/magento2plugin/linemarker/php/GraphQlResolverUsageLineMarkerProvider.java

@@ -28,7 +28,7 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElements, @NotNull Collection<? super LineMarkerInfo<?>> collection) {
         if (psiElements.size() > 0) {
             if (!Settings.isEnabled(psiElements.get(0).getProject())) {
                 return;

src/com/magento/idea/magento2plugin/linemarker/php/PluginLineMarkerProvider.java

@@ -31,7 +31,7 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElements, @NotNull Collection<? super LineMarkerInfo<?>> collection) {
         if (psiElements.size() > 0) {
             if (!Settings.isEnabled(psiElements.get(0).getProject())) {
                 return;

src/com/magento/idea/magento2plugin/linemarker/php/PluginTargetLineMarkerProvider.java

@@ -33,8 +33,8 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull final PsiElement psiElement) {
 
     @Override
     public void collectSlowLineMarkers(
-            @NotNull final List<PsiElement> psiElements,
-            @NotNull final Collection<LineMarkerInfo> collection
+            final @NotNull List<? extends PsiElement> psiElements,
+            final @NotNull Collection<? super LineMarkerInfo<?>> collection
     ) {
         if (!psiElements.isEmpty() && !Settings.isEnabled(psiElements.get(0).getProject())) {
             return;

src/com/magento/idea/magento2plugin/linemarker/php/WebApiLineMarkerProvider.java

@@ -35,7 +35,7 @@ public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement psiElement) {
     }
 
     @Override
-    public void collectSlowLineMarkers(@NotNull List<PsiElement> psiElements, @NotNull Collection<LineMarkerInfo> collection) {
+    public void collectSlowLineMarkers(@NotNull List<? extends PsiElement> psiElements, @NotNull Collection<? super LineMarkerInfo<?>> collection) {
         if (psiElements.size() > 0) {
             if (!Settings.isEnabled(psiElements.get(0).getProject())) {
                 return;