Skip to content

Adjust resource path for bundle file creation #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 17, 2018
Merged

Adjust resource path for bundle file creation #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8a5870
Remove unnecessary null check
cedricziel Aug 17, 2018
4b6c480
Adjust resource path for bundle file creation
cedricziel Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/action/bundle/NewBundleCommandAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/util/psi/PhpBundleFileFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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");
Expand Down