272: fix the composer.json generation with mo

Author: coderimus

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java

@@ -143,11 +143,11 @@ private String getDependenciesString(final List dependenciesList) {
                 result = result.concat(": \"" + dependencyData.getSecond() + "\"");
             }
 
-            if (dependencies.length != i + 1) {
+            if (!dependencyData.getFirst().isEmpty() && dependencies.length != i + 1) {
                 result = result.concat(",");
+                result = result.concat("\n");
             }
 
-            result = result.concat("\n");
         }
 
         return result;

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateFileInRoot/composer.json renamed to testData/actions/generation/generator/ModuleComposerJsonGenerator/generateFileInRootWithDependencies/composer.json

@@ -0,0 +1,21 @@
+{
+  "name": "test/module",
+  "version": "1.0.0-dev",
+  "description": "test-description",
+  "type": "magento2-module",
+  "require": {
+    "magento/framework": "*"
+  },
+  "license": [
+    "Test License 1",
+    "Test License 2"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Test\\Module\\": ""
+    }
+  }
+}

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateFileInRootWithoutDependencies/composer.json

@@ -0,0 +1,21 @@
+{
+  "name": "test/module",
+  "version": "1.0.0-dev",
+  "description": "test-description",
+  "type": "magento2-module",
+  "require": {
+    "magento/framework": "*"
+  },
+  "license": [
+    "Test License 1",
+    "Test License 2"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Test\\Module\\": ""
+    }
+  }
+}

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFile/composer.json renamed to testData/actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFileWithDependencies/composer.json

@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Foo_BarWithoutComposer"/>
+</config>

testData/actions/generation/generator/ModuleComposerJsonGenerator/generateModuleFileWithoutDependencies/composer.json

@@ -0,0 +1,6 @@
+<?php
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Foo_BarWithOutComposer',
+    __DIR__
+);

testData/project/magento2/app/code/Foo/BarWithoutComposer/etc/module.xml

@@ -15,37 +15,67 @@
 
 public class ModuleComposerJsonGeneratorTest extends BaseGeneratorTestCase {
 
-    public void testGenerateModuleFile() {
+    public void testGenerateModuleFileWithDependencies() {
         String filePath = this.getFixturePath(ComposerJson.FILE_NAME);
         PsiFile expectedFile = myFixture.configureByFile(filePath);
         PsiDirectory projectDir = getProjectDirectory();
 
-        PsiFile composerJson = generateComposerJson(true, projectDir);
+        String expectedDirectory = projectDir.getVirtualFile().getPath() + "/Test/Module";
+        PsiFile composerJson = generateComposerJson(true, projectDir, true);
 
         assertGeneratedFileIsCorrect(
             expectedFile,
-            projectDir.getVirtualFile().getPath() + "/Test/Module",
+            expectedDirectory,
             composerJson
         );
     }
 
-    public void testGenerateFileInRoot() {
+    public void testGenerateFileInRootWithDependencies() {
         String filePath = this.getFixturePath(ComposerJson.FILE_NAME);
         PsiFile expectedFile = myFixture.configureByFile(filePath);
         PsiDirectory projectDir = getProjectDirectory();
 
-        PsiFile composerJson = generateComposerJson(false, projectDir);
+        String composerJsonDirPath = projectDir.getVirtualFile().getPath();
+        PsiFile composerJson = generateComposerJson(false, projectDir, true);
+
+        assertGeneratedFileIsCorrect(expectedFile, composerJsonDirPath, composerJson);
+    }
+
+    public void testGenerateModuleFileWithoutDependencies() {
+        String filePath = this.getFixturePath(ComposerJson.FILE_NAME);
+        PsiFile expectedFile = myFixture.configureByFile(filePath);
+        PsiDirectory projectDir = getProjectDirectory();
+        String expectedDirectory = projectDir.getVirtualFile().getPath() + "/Test/Module";
+        PsiFile composerJson = generateComposerJson(true, projectDir, false);
 
         assertGeneratedFileIsCorrect(
-            expectedFile,
-            projectDir.getVirtualFile().getPath(),
-            composerJson
+                expectedFile,
+                expectedDirectory,
+                composerJson
+        );
+    }
+
+    public void testGenerateFileInRootWithoutDependencies() {
+        String filePath = this.getFixturePath(ComposerJson.FILE_NAME);
+        PsiFile expectedFile = myFixture.configureByFile(filePath);
+        PsiDirectory projectDir = getProjectDirectory();
+        PsiFile composerJson = generateComposerJson(false, projectDir, false);
+
+        assertGeneratedFileIsCorrect(
+                expectedFile,
+                projectDir.getVirtualFile().getPath(),
+                composerJson
         );
     }
 
-    private PsiFile generateComposerJson(boolean createModuleDirectories, PsiDirectory projectDir) {
+    private PsiFile generateComposerJson(
+            boolean createModuleDirectories,
+            PsiDirectory projectDir,
+            boolean withDependencies) {
         Project project = myFixture.getProject();
-        List<String> dependencies = new ArrayList<>(Arrays.asList("Foo_Bar", "Magento_Backend"));
+        List<String> dependencies = withDependencies ?
+                new ArrayList<>(Arrays.asList("Foo_Bar", "Magento_Backend"))
+                : new ArrayList<>(Arrays.asList("Foo_BarWithOutComposer"));
         List<String> licenses = new ArrayList<>(Arrays.asList("Test License 1", "Test License 2"));
         ModuleComposerJsonData composerJsonData = new ModuleComposerJsonData(
             "Test",