From e8a587048e53807d8b91935a68ff0295f7a6fd08 Mon Sep 17 00:00:00 2001 From: Cedric Ziel Date: Fri, 17 Aug 2018 11:50:40 +0200 Subject: [PATCH 1/2] Remove unnecessary null check --- .../symfony2plugin/action/bundle/NewBundleCommandAction.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java index 90f7c63aa..2dec95769 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java @@ -50,9 +50,7 @@ protected void run(@NotNull Result result) throws Throwable { return; } - if(bundleFile != null) { - new OpenFileDescriptor(getProject(), bundleFile.getContainingFile().getVirtualFile(), 0).navigate(true); - } + new OpenFileDescriptor(getProject(), bundleFile.getContainingFile().getVirtualFile(), 0).navigate(true); } @Override From 4b6c480dde27342527f7dec591b168e8563a24c8 Mon Sep 17 00:00:00 2001 From: Cedric Ziel Date: Fri, 17 Aug 2018 11:52:12 +0200 Subject: [PATCH 2/2] Adjust resource path for bundle file creation Fixes: #1213 --- .../idea/symfony2plugin/util/psi/PhpBundleFileFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java index ac0bba1fa..3e4e9d69f 100644 --- a/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java +++ b/src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java @@ -69,7 +69,7 @@ public static PsiElement createBundleFile(@NotNull PhpClass bundleClass, @NotNul throw new Exception("File already exists"); } - String COMPILER_TEMPLATE = "/resources/fileTemplates/" + template + ".php"; + String COMPILER_TEMPLATE = "/fileTemplates/" + template + ".php"; String fileTemplateContent = getFileTemplateContent(COMPILER_TEMPLATE); if(fileTemplateContent == null) { throw new Exception("Template content error"); @@ -154,7 +154,7 @@ public static PsiElement createCompilerPass(@NotNull PhpClass bundleClass, @NotN groupStatement.addRangeBefore(methodReference, semicolon, groupStatement.getLastChild()); } - String COMPILER_TEMPLATE = "/resources/fileTemplates/compiler_pass.php"; + String COMPILER_TEMPLATE = "/fileTemplates/compiler_pass.php"; String fileTemplateContent = getFileTemplateContent(COMPILER_TEMPLATE); if(fileTemplateContent == null) { throw new Exception("Template content error");