Skip to content

Commit d3c9c9d

Browse files
authored
Merge pull request #1532 from magento/1517-Custom_theme_couldn't_be_detected
1517: Custom theme couldn't be detected - fix
2 parents 8690530 + 7ae23e6 commit d3c9c9d

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Diff for: CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).
1010

1111
- java.lang.NoClassDefFoundError: org/codehaus/plexus/util/StringUtils [#1530](https://github.com/magento/magento2-phpstorm-plugin/pull/1530)
1212
- 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)
13+
- Custom theme detection [#1532](https://github.com/magento/magento2-phpstorm-plugin/pull/1532)
1314

1415
## 5.1.0
1516

Diff for: src/com/magento/idea/magento2plugin/util/RegExUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static class Magento {
6464
= "[A-Z][a-zA-Z0-9]+_[A-Z][a-zA-Z0-9]+";
6565

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

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

0 commit comments

Comments
 (0)