Skip to content

1517: Custom theme couldn't be detected - fix #1532

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
Apr 15, 2023
Merged

1517: Custom theme couldn't be detected - fix #1532

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
ab54b1b
1517: Custom theme couldn't be detected - fix
Apr 15, 2023
d7ae165
Merge branch '5.1.1-develop' of github.com:magento/magento2-phpstorm-…
Apr 15, 2023
7ae23e6
1517: Updated CHANGELOG.md
Apr 15, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).

- java.lang.NoClassDefFoundError: org/codehaus/plexus/util/StringUtils [#1530](https://github.com/magento/magento2-phpstorm-plugin/pull/1530)
- java.lang.Throwable: Must not start write action from within read action in the other thread - deadlock is coming [#1531](https://github.com/magento/magento2-phpstorm-plugin/pull/1531)
- Custom theme detection [#1532](https://github.com/magento/magento2-phpstorm-plugin/pull/1532)

## 5.1.0

Expand Down
2 changes: 1 addition & 1 deletion src/com/magento/idea/magento2plugin/util/RegExUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static class Magento {
= "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";

public static final String THEME_NAME
= "[a-z]+/[A-Z][a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";
= "[a-z]+/[a-zA-Z0-9_]+/[a-z][a-zA-Z0-9_]+";

public static final String MFTF_CURLY_BRACES
= ".*\\{\\{[^\\}]+\\}\\}.*";
Expand Down