19
19
import com .magento .idea .magento2plugin .util .magento .GetComponentNameByDirectoryUtil ;
20
20
import com .magento .idea .magento2plugin .util .magento .GetMagentoModuleUtil ;
21
21
import java .util .List ;
22
+ import java .util .Objects ;
22
23
23
24
public class OverrideTemplateInThemeGenerator extends OverrideInThemeGenerator {
24
-
25
25
/**
26
26
* OverrideTemplateInThemeGenerator constructor.
27
27
*
@@ -41,10 +41,13 @@ public void execute(final PsiFile baseFile, final String themeName) {
41
41
42
42
final GetMagentoModuleUtil .MagentoModuleData moduleData =
43
43
GetMagentoModuleUtil .getByContext (baseFile .getContainingDirectory (), project );
44
- List <String > pathComponents ;
44
+ List <String > pathComponents ; //NOPMD
45
45
46
46
if (moduleData == null ) {
47
- if (baseFile .getVirtualFile ().getExtension ().equals (OverridableFileType .JS .getType ())) {
47
+ if (Objects .equals (
48
+ baseFile .getVirtualFile ().getExtension (),
49
+ OverridableFileType .JS .getType ())
50
+ ) {
48
51
pathComponents = getLibPathComponets (baseFile );
49
52
} else {
50
53
return ;
@@ -75,12 +78,21 @@ public void execute(final PsiFile baseFile, final String themeName) {
75
78
directory = getTargetDirectory (directory , pathComponents );
76
79
77
80
if (directory .findFile (baseFile .getName ()) != null ) {
78
- JBPopupFactory .getInstance ()
79
- .createMessage (
80
- validatorBundle .message ("validator.file.alreadyExists" , baseFile .getName ())
81
- )
82
- .showCenteredInCurrentWindow (project );
83
- directory .findFile (baseFile .getName ()).navigate (true );
81
+ final PsiDirectory finalDirectory1 = directory ;
82
+ ApplicationManager .getApplication ().invokeLater (() -> {
83
+ JBPopupFactory .getInstance ()
84
+ .createMessage (
85
+ validatorBundle .message (
86
+ "validator.file.alreadyExists" ,
87
+ baseFile .getName ()
88
+ )
89
+ ).showCenteredInCurrentWindow (project );
90
+ ApplicationManager .getApplication ().invokeLater (() -> {
91
+ Objects .requireNonNull (
92
+ finalDirectory1 .findFile (baseFile .getName ())
93
+ ).navigate (true );
94
+ });
95
+ });
84
96
return ;
85
97
}
86
98
0 commit comments