Skip to content

Commit

Permalink
Merge pull request #1532 from magento/1517-Custom_theme_couldn't_be_d…
Browse files Browse the repository at this point in the history
…etected

1517: Custom theme couldn't be detected - fix
  • Loading branch information
VitaliyBoyko authored Apr 15, 2023
2 parents 8690530 + 7ae23e6 commit d3c9c9d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
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
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

0 comments on commit d3c9c9d

Please sign in to comment.