From 238cb93c3c613ef76649c31cd6bfee0eaee3db16 Mon Sep 17 00:00:00 2001 From: Vitaliy Boyko Date: Fri, 23 Oct 2020 14:51:29 +0300 Subject: [PATCH 1/2] Fixed directory structure for the override in theme action --- CHANGELOG.md | 8 ++++++++ .../generator/OverrideInThemeGenerator.java | 12 +++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 001ba2bad..7205f6d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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). +## 2.0.1 + +### Fixed + +- Directories structure for the override in theme action +- Constant disabling plugin on startup if Magento not in the root +- New module generation for the default Magento version + ## 2.0.0 ### Added diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java index c62e73fc3..89cb289ca 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java @@ -13,6 +13,7 @@ import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import com.maddyhome.idea.copyright.actions.UpdateCopyrightProcessor; +import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator; import com.magento.idea.magento2plugin.bundles.ValidatorBundle; import com.magento.idea.magento2plugin.indexes.ModuleIndex; import com.magento.idea.magento2plugin.magento.packages.Areas; @@ -126,16 +127,9 @@ private PsiDirectory getTargetDirectory( PsiDirectory directory, //NOPMD final List pathComponents ) { + DirectoryGenerator generator = DirectoryGenerator.getInstance(); for (final String directoryName : pathComponents) { - if (directory.findSubdirectory(directoryName) != null) { //NOPMD - directory = directory.findSubdirectory(directoryName); - } else { - final PsiDirectory finalDirectory = directory; - ApplicationManager.getApplication().runWriteAction(() -> { - finalDirectory.createSubdirectory(directoryName); - }); - return finalDirectory; - } + directory = generator.findOrCreateSubdirectory(directory, directoryName); } return directory; From d77ecafd0abf680ee0bd5d367590cc2d3064d0ee Mon Sep 17 00:00:00 2001 From: Vitaliy Boyko Date: Fri, 23 Oct 2020 15:10:02 +0300 Subject: [PATCH 2/2] Static fix --- .../actions/generation/generator/OverrideInThemeGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java index 89cb289ca..6b62c665b 100644 --- a/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java +++ b/src/com/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java @@ -127,7 +127,7 @@ private PsiDirectory getTargetDirectory( PsiDirectory directory, //NOPMD final List pathComponents ) { - DirectoryGenerator generator = DirectoryGenerator.getInstance(); + final DirectoryGenerator generator = DirectoryGenerator.getInstance(); for (final String directoryName : pathComponents) { directory = generator.findOrCreateSubdirectory(directory, directoryName); }