Skip to content

Commit

Permalink
OPP-67: Error in PhpStorm 2022.3
Browse files Browse the repository at this point in the history
- disabled RequireJsComponent initialization
  • Loading branch information
mbessolov committed Dec 24, 2022
1 parent 075790b commit bab4e15
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,17 @@ public void projectClosed() {

@Override
public void initComponent() {
if(ApplicationManager.getApplication().isUnitTestMode()) {
init();
} else {
StartupManager.getInstance(project).registerPostStartupActivity(() -> {
if(OroPlatformSettings.getInstance(project).isPluginEnabled()) {
init();
}
});
}
// RequireJS bundle was removed in OroCommerce 4.1
return;
// if(ApplicationManager.getApplication().isUnitTestMode()) {
// init();
// } else {
// StartupManager.getInstance(project).registerPostStartupActivity(() -> {
// if(OroPlatformSettings.getInstance(project).isPluginEnabled()) {
// init();
// }
// });
// }
}

private void init() {
Expand Down
7 changes: 6 additions & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<idea-plugin version="2">
<id>com.oroplatform.idea.oroplatform</id>
<name>Oro PHPStorm Plugin</name>
<name>OroPlatform</name>
<vendor url="https://github.com/orocrm/oro-phpstorm-plugin">Oro Inc.</vendor>

<description><![CDATA[
Expand All @@ -10,6 +10,11 @@ Plugin for the PHPStorm that will help to increase the development speed on the
]]></description>

<change-notes><![CDATA[
<h2>2022.3</h2>
<ul>
<li>Fixed compatibility with PHPStorm 2022.3</li>
</ul>
<h2>1.0.19</h2>
<ul>
<li>[#17] Fixed IllegalArgumentException in Twig templates used by layouts in PHPStorm 2020.3</li>
Expand Down

0 comments on commit bab4e15

Please sign in to comment.