4.0.0-initial

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -5,7 +5,7 @@ name: Run automated tests
 
 on:
   pull_request:
-    branches: [ master, 3.2.0-develop ]
+    branches: [ master, 4.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).
 
+## 4.0.0
+
 ## 3.2.0
 
 ### Added

README.md

@@ -22,7 +22,7 @@
 
 ## Works with
 
-* PhpStorm >= 2020.3
+* PhpStorm >= 2021.1
 * JRE >= 11
 
 ## Features

build.gradle

@@ -15,16 +15,16 @@ repositories {
 }
 
 group 'com.magento.idea'
-version '3.2.0'
+version '4.0.0'
 
 apply plugin: 'org.jetbrains.intellij'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'groovy'
 apply plugin: 'org.jetbrains.changelog'
 
-def phpPluginVersion = System.getProperty("phpPluginVersion", "203.5981.175")
-def ideaVersion = System.getProperty("ideaVersion", "2020.3")
+def phpPluginVersion = System.getProperty("phpPluginVersion", "211.6693.111")
+def ideaVersion = System.getProperty("ideaVersion", "2021.1")
 def javaVersion = 11
 
 sourceCompatibility = javaVersion
@@ -41,7 +41,7 @@ intellij {
             'properties',
             'CSS',
             'JavaScriptLanguage',
-            'com.intellij.lang.jsgraphql:2.7.0',
+            'com.intellij.lang.jsgraphql:2.9.1',
             'platform-images',
             'copyright'
     ]

resources/META-INF/plugin.xml

@@ -7,7 +7,7 @@
 <idea-plugin require-restart="true">
     <id>com.magento.idea.magento2plugin</id>
     <name>Magento PhpStorm</name>
-    <version>3.2.0</version>
+    <version>4.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="203.5981.155"/>
+    <idea-version since-build="211.6693.111"/>
 
     <!-- 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/inspections/graphqls/fix/CreateResolverClassQuickFix.java

@@ -17,12 +17,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
 public class CreateResolverClassQuickFix implements LocalQuickFix {
     @Override
-    public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getFamilyName() {
+    public @NotNull String getFamilyName() {
         return new InspectionBundle().message(
                 "inspection.graphql.schema.resolver.fix.family"
         );

src/com/magento/idea/magento2plugin/reference/provider/ObserverNameReferenceProvider.java

@@ -15,8 +15,9 @@
 import org.jetbrains.annotations.NotNull;
 
 public class ObserverNameReferenceProvider extends PsiReferenceProvider {
+    @NotNull
     @Override
-    public PsiReference @NotNull [] getReferencesByElement(
+    public PsiReference [] getReferencesByElement(
             @NotNull final PsiElement element,
             @NotNull final ProcessingContext context
     ) {

src/com/magento/idea/magento2plugin/stubs/indexes/xml/DeclarativeSchemaElementsIndex.java

@@ -80,8 +80,9 @@ public int getVersion() {
         return 1;
     }
 
+    @NotNull
     @Override
-    public FileBasedIndex.@NotNull InputFilter getInputFilter() {
+    public FileBasedIndex.InputFilter getInputFilter() {
         return virtualFile -> (virtualFile.getFileType() == XmlFileType.INSTANCE
                 && virtualFile.getNameWithoutExtension().equals("db_schema"));
     }