Skip to content

Fixed directory structure for the override in theme action #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 23, 2020
Merged

Fixed directory structure for the override in theme action #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238cb93
Fixed directory structure for the override in theme action
Oct 23, 2020
d77ecaf
Static fix
Oct 23, 2020
cd74ecc
Merge branch '2.0.1-develop' into coreected-file-structure-for-overri…
Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 3 additions & 9 deletions ...om/magento/idea/magento2plugin/actions/generation/generator/OverrideInThemeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -126,16 +127,9 @@ private PsiDirectory getTargetDirectory(
PsiDirectory directory, //NOPMD
final List<String> pathComponents
) {
final 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;
Expand Down