Skip to content

Commit f904f74

Browse files
author
Vitaliy Boyko
committed
Merge branch '2.0.1-develop' of github.com:magento/magento2-phpstorm-plugin into forwardport-2.0.1->2.1.0
2 parents 06be179 + 184a422 commit f904f74

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
66

7+
## 2.0.1
8+
9+
### Fixed
10+
11+
- Directories structure for the override in theme action
12+
- Constant disabling plugin on startup if Magento not in the root
13+
- New module generation for the default Magento version
14+
715
## 2.0.0
816

917
### Added

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.intellij.psi.PsiDirectory;
1414
import com.intellij.psi.PsiFile;
1515
import com.maddyhome.idea.copyright.actions.UpdateCopyrightProcessor;
16+
import com.magento.idea.magento2plugin.actions.generation.generator.util.DirectoryGenerator;
1617
import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
1718
import com.magento.idea.magento2plugin.indexes.ModuleIndex;
1819
import com.magento.idea.magento2plugin.magento.packages.Areas;
@@ -126,16 +127,9 @@ private PsiDirectory getTargetDirectory(
126127
PsiDirectory directory, //NOPMD
127128
final List<String> pathComponents
128129
) {
130+
final DirectoryGenerator generator = DirectoryGenerator.getInstance();
129131
for (final String directoryName : pathComponents) {
130-
if (directory.findSubdirectory(directoryName) != null) { //NOPMD
131-
directory = directory.findSubdirectory(directoryName);
132-
} else {
133-
final PsiDirectory finalDirectory = directory;
134-
ApplicationManager.getApplication().runWriteAction(() -> {
135-
finalDirectory.createSubdirectory(directoryName);
136-
});
137-
return finalDirectory;
138-
}
132+
directory = generator.findOrCreateSubdirectory(directory, directoryName);
139133
}
140134

141135
return directory;

0 commit comments

Comments
 (0)