Merge branch '1.0.0-develop' of https://github.com/magento/magento2-phpstorm-plugin into 58-block-generation

� Conflicts:
�	src/com/magento/idea/magento2plugin/magento/packages/Package.java

Author: Vitaliy Boyko

.github/workflows/gradle.yml

@@ -0,0 +1,60 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Run automated tests
+
+on:
+  pull_request:
+    branches: [ master, 1.0.0-develop ]
+
+jobs:
+  build-linux:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Gradle wrapper
+      run: gradle wrapper
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Run automated tests
+      run: ./gradlew test -i
+
+  build-windows:
+
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Gradle wrapper
+        run: gradle wrapper
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run automated tests
+        run: ./gradlew test -i
+
+  build-macos:
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Gradle wrapper
+        run: gradle wrapper
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run automated tests
+        run: ./gradlew test -i

.gitignore

@@ -50,3 +50,5 @@ out
 .idea-sandbox
 build
 gradle
+gradlew
+gradlew.bat

README.md

@@ -7,12 +7,12 @@
 This is a plugin for Magento 2 development in the PhpStorm IDE. It is available via the [JetBrains Plugin Repository](https://plugins.jetbrains.com/plugin/8024)
 ## Installation
 
-1. Go to Settings / Preferences in the PhpStorm IDE
-2. Navigate to "Plugins"
-3. Click the "Browse repositories..." button and search for "Magento PhpStorm"
+1. Go to `Settings > Preferences` in the PhpStorm IDE
+2. Navigate to `Plugins`
+3. Click the `Browse repositories...` button and search for "Magento PhpStorm"
 4. Install the plugin and restart PhpStorm
-5. Go to Settings / Preferences / Languages & Frameworks / PHP / Magento in the PhpStorm IDE
-6. Check "Enable" and "OK" button. 
+5. Go to `Settings > Preferences > Languages & Frameworks > PHP > Magento` in the PhpStorm IDE
+6. Check `Enable` and `OK` button.
 
 ## Works with
 * PhpStorm >= 2019.3.3
@@ -21,20 +21,38 @@ This is a plugin for Magento 2 development in the PhpStorm IDE. It is available
 ## Features
 
 * Configuration smart completion and references for XML/JavaScript files
-* "Navigate to configuration" reference in scope of class/interface
-* "Go to plugin" reference in scope of class/interface and method
-* "Navigate to Web API configuration" reference in scope of class/interface and method
+* `Navigate to configuration` reference in scope of class/interface
+* `Go to plugin` reference in scope of class/interface and method
+* `Navigate to Web API configuration` reference in scope of class/interface and method
 * Plugin class methods generation
 * Plugin declaration inspection
-* RequireJs reference navigation and completion
+* RequireJS reference navigation and completion
 * MFTF reference navigation and completion
 * GraphQL navigation line markers
 * Code generation
 * Inspections for XML configuration
 
+## Setting up development environment
+
+1. Check out this repository
+1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
+1. Make sure that you on the latest develop branch (e.g `1.0.0-develop`)
+1. Right-click on the `build.gradle` file, choose "Import Gradle project"
+1. When the Gradle sections appeared in the right bar, navigate there and right-click `magento-2-php-storm-plguin > Tasks -> Intellij -> runIde`
+1. Click `Run "magento-2-php-storm-plugin"` to run the plugin. You should see a new instance of IntelliJ launched with the plugin installed. Make sure the plugin is enabled in IntelliJ settings and indexing is finished. Plugin features should be accessible at this point.
+
+## How to contribute
+1) Start with looking into [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/projects/2). Any ticket in `Ready for Development` and `Good First Issue` columns are a good candidates to start.
+2) Didn't satisfy your requirements? [Create a new issue](https://github.com/magento/magento2-phpstorm-plugin/issues/new). It can be for example:
+   - **Bug report** - Found a bug in the code? Let us know!
+   - **Enhancement** - Know how to improve existing functionality? Open an issue describe how to enhance the plugin.
+   - **New feature proposal** - Know how to make a killer feature? Do not hesitate to submit your proposal.
+3) The issue will appear in the `Ready for Grooming` column of the [Community Backlog](https://github.com/magento/magento2-phpstorm-plugin/projects/2). Once it will be discussed and approved the issue will be ready for development.
+
+### <img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" width="20"> Join [#phpstorm-plugin](https://magentocommeng.slack.com/archives/C010C2LUCEA) Slack channel for more details.
+
+
 ## License
 Each Magento source file included in this distribution is licensed under OSL-3.0 license.
 
 Please see [LICENSE.txt](https://github.com/magento/magento2-phpstorm-plugin/blob/master/LICENSE.txt) for the full text of the [Open Software License v. 3.0 (OSL-3.0)](http://opensource.org/licenses/osl-3.0.php).
-
-### <img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" width="20"> Join [#phpstorm-plugin](https://magentocommeng.slack.com/archives/C010C2LUCEA) channel for more details.

build.gradle

@@ -33,6 +33,12 @@ intellij {
 }
 
 sourceSets {
-    main.java.srcDirs = ['src']
-    main.resources.srcDirs = ['resources']
+    main {
+        java.srcDirs 'src'
+        resources.srcDir 'resources'
+    }
+    test {
+        java.srcDir 'tests'
+        resources.srcDir 'testData'
+    }
 }

gradlew

@@ -9,7 +9,9 @@
   },
   #end
   #if (${LICENSE})
-  ${LICENSE},
+  "license":
+  ${LICENSE}
+  ,
   #end
   "autoload": {
     "files": [

gradlew.bat

@@ -5,6 +5,7 @@
 package com.magento.idea.magento2plugin.actions.generation.data;
 
 import com.intellij.psi.PsiDirectory;
+import java.util.List;
 
 public class ModuleComposerJsonData {
     private final String packageName;
@@ -13,21 +14,24 @@ public class ModuleComposerJsonData {
     private final String moduleDescription;
     private final String composerPackageName;
     private final String moduleVersion;
+    private final List moduleLicense;
 
     public ModuleComposerJsonData(
         String packageName,
         String moduleName,
         PsiDirectory baseDir,
         String moduleDescription,
         String composerPackageName,
-        String moduleVersion
+        String moduleVersion,
+        List moduleLicense
     ) {
         this.packageName = packageName;
         this.moduleName = moduleName;
         this.baseDir = baseDir;
         this.moduleDescription = moduleDescription;
         this.composerPackageName = composerPackageName;
         this.moduleVersion = moduleVersion;
+        this.moduleLicense = moduleLicense;
     }
 
     public String getPackageName() {
@@ -53,4 +57,8 @@ public String getComposerPackageName() {
     public String getModuleVersion() {
         return this.moduleVersion;
     }
+
+    public List getModuleLicense() {
+        return this.moduleLicense;
+    }
 }

resources/fileTemplates/internal/Magento Module Composer.json.ft

@@ -3,9 +3,11 @@
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
-      <xy x="48" y="54" width="462" height="297"/>
+      <xy x="48" y="54" width="462" height="431"/>
     </constraints>
-    <properties/>
+    <properties>
+      <preferredSize width="350" height="391"/>
+    </properties>
     <border type="none"/>
     <children>
       <grid id="94766" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -49,7 +51,7 @@
           </grid>
         </children>
       </grid>
-      <grid id="e3588" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="e3588" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -59,7 +61,7 @@
         <children>
           <component id="ad3ba" class="javax.swing.JTextField" binding="packageName" default-binding="true">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -78,7 +80,7 @@
           </component>
           <component id="e4858" class="javax.swing.JTextField" binding="moduleName">
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -97,7 +99,7 @@
           </component>
           <component id="423dc" class="javax.swing.JTextField" binding="moduleVersion">
             <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -116,6 +118,47 @@
               <text value="Module Version"/>
             </properties>
           </component>
+          <component id="c5925" class="javax.swing.JLabel" binding="moduleLicenseLabel">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="License(s)"/>
+            </properties>
+          </component>
+          <component id="26905" class="javax.swing.JTextField" binding="moduleLicenseCustom">
+            <constraints>
+              <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties>
+              <editable value="true"/>
+              <enabled value="true"/>
+              <toolTipText value="Module's Custom License"/>
+            </properties>
+          </component>
+          <scrollpane id="a545e" binding="moduleLicenseScrollPanel">
+            <constraints>
+              <grid row="3" column="1" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="100"/>
+                <maximum-size width="-1" height="100"/>
+              </grid>
+            </constraints>
+            <properties>
+              <enabled value="false"/>
+            </properties>
+            <border type="none"/>
+            <children>
+              <component id="8bae" class="javax.swing.JList" binding="moduleLicense">
+                <constraints/>
+                <properties>
+                  <model/>
+                  <toolTipText value="Module's Lincese"/>
+                </properties>
+              </component>
+            </children>
+          </scrollpane>
         </children>
       </grid>
       <component id="4c5ac" class="javax.swing.JTextArea" binding="moduleDescription">