Skip to content

Commit a7ae676

Browse files
Fixed plugin generation for complex non primitive types
1 parent 87216d7 commit a7ae676

File tree

8 files changed

+435
-250
lines changed

8 files changed

+435
-250
lines changed

src/com/magento/idea/magento2plugin/actions/generation/ImportReferences/PhpClassReferenceExtractor.java

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/com/magento/idea/magento2plugin/actions/generation/ImportReferences/PhpClassReferenceResolver.java

Lines changed: 0 additions & 164 deletions
This file was deleted.

src/com/magento/idea/magento2plugin/actions/generation/PluginGenerateMethodHandlerBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.jetbrains.php.lang.psi.elements.Method;
3030
import com.jetbrains.php.lang.psi.elements.PhpClass;
3131
import com.jetbrains.php.lang.psi.elements.PhpPsiElement;
32-
import com.magento.idea.magento2plugin.actions.generation.ImportReferences.PhpClassReferenceResolver;
32+
import com.magento.idea.magento2plugin.actions.generation.references.PhpClassReferenceResolver;
3333
import com.magento.idea.magento2plugin.actions.generation.data.code.PluginMethodData;
3434
import com.magento.idea.magento2plugin.actions.generation.generator.code.PluginMethodsGenerator;
3535
import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import com.jetbrains.php.lang.psi.elements.Method;
2222
import com.jetbrains.php.lang.psi.elements.PhpClass;
2323
import com.jetbrains.php.lang.psi.elements.PhpPsiElement;
24-
import com.magento.idea.magento2plugin.actions.generation.ImportReferences.PhpClassReferenceResolver;
2524
import com.magento.idea.magento2plugin.actions.generation.data.PluginFileData;
2625
import com.magento.idea.magento2plugin.actions.generation.data.code.PluginMethodData;
2726
import com.magento.idea.magento2plugin.actions.generation.generator.code.PluginMethodsGenerator;
2827
import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
2928
import com.magento.idea.magento2plugin.actions.generation.generator.util.FileFromTemplateGenerator;
29+
import com.magento.idea.magento2plugin.actions.generation.references.PhpClassReferenceResolver;
3030
import com.magento.idea.magento2plugin.actions.generation.util.CodeStyleSettings;
3131
import com.magento.idea.magento2plugin.actions.generation.util.CollectInsertedMethods;
3232
import com.magento.idea.magento2plugin.actions.generation.util.FillTextBufferWithPluginMethods;
@@ -46,10 +46,9 @@
4646
import javax.swing.JOptionPane;
4747
import org.jetbrains.annotations.NotNull;
4848

49-
@SuppressWarnings({
50-
"PMD.ExcessiveImports"
51-
})
49+
@SuppressWarnings({"PMD.ExcessiveImports"})
5250
public class PluginClassGenerator extends FileGenerator {
51+
5352
private final PluginFileData pluginFileData;
5453
private final Project project;
5554
private final ValidatorBundle validatorBundle;
@@ -86,8 +85,10 @@ public PluginClassGenerator(
8685
* Generate plugin.
8786
*
8887
* @param actionName String
88+
*
8989
* @return PsiFile
9090
*/
91+
@Override
9192
public PsiFile generate(final String actionName) {
9293
final PsiFile[] pluginFile = {null};
9394
WriteCommandAction.runWriteCommandAction(project, () -> {
@@ -227,6 +228,7 @@ private PhpClass createPluginClass(final String actionName) {
227228
return getFirstClassOfFile.execute((PhpFile) pluginFile);
228229
}
229230

231+
@Override
230232
protected void fillAttributes(final Properties attributes) {
231233
attributes.setProperty("NAME", pluginFileData.getPluginClassName());
232234
attributes.setProperty("NAMESPACE", pluginFileData.getNamespace());

0 commit comments

Comments
 (0)