Skip to content

remove unused "getTemplateNameByOverwrite" for Twig #1465

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 1 commit into from
May 21, 2020
Merged

remove unused "getTemplateNameByOverwrite" for Twig #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 0 additions & 44 deletions src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2094,50 +2094,6 @@ public static String buildStringFromTwigCreateContainer(@NotNull Project project

}

/**
* Gets a template name from "app" or bundle getParent overwrite
*
* app/Resources/AcmeBlogBundle/views/Blog/index.html.twig
* src/Acme/UserBundle/Resources/views/index.html.twig
*/
@Nullable
public static String getTemplateNameByOverwrite(@NotNull Project project, @NotNull VirtualFile virtualFile) {

String relativePath = VfsUtil.getRelativePath(virtualFile, ProjectUtil.getProjectDir(project));
if(relativePath == null) {
return null;
}

// app/Resources/AcmeBlogBundle/views/Blog/index.html.twig
Matcher matcher = Pattern.compile("app/Resources/([^/]*Bundle)/views/(.*)$").matcher(relativePath);
if (matcher.find()) {
return normalizeTemplateName(matcher.group(1) + ":" + matcher.group(2));
}

// src/Acme/UserBundle/Resources/views/index.html.twig
SymfonyBundleUtil symfonyBundleUtil = new SymfonyBundleUtil(project);
SymfonyBundle containingBundle = symfonyBundleUtil.getContainingBundle(virtualFile);
if(containingBundle == null) {
return null;
}

String relative = containingBundle.getRelative(virtualFile);
if(relative == null) {
return null;
}

if(!relative.startsWith("Resources/views/")) {
return null;
}

String parentBundleName = containingBundle.getParentBundleName();
if(parentBundleName == null) {
return null;
}

return normalizeTemplateName(containingBundle.getName() + ":" + relative.substring("Resources/views/".length(), relative.length()));
}

/**
* {% include "foo/#{segment.typeKey}.html.twig" with {'segment': segment} %}
* {% include "foo/#{1 + 2}.html.twig" %}
Expand Down
27 changes: 0 additions & 27 deletions ...test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTempTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,33 +20,6 @@
* @author Daniel Espendiller <[email protected]>
*/
public class TwigUtilTempTest extends SymfonyTempCodeInsightFixtureTestCase {

/**
* @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getTemplateNameByOverwrite
*/
public void testTemplateOverwriteNameGeneration() {
createFiles(
"app/Resources/TwigUtilIntegrationBundle/views/layout.html.twig",
"app/Resources/TwigUtilIntegrationBundle/views/Foo/layout.html.twig",
"app/Resources/TwigUtilIntegrationBundle/views/Foo/Bar/layout.html.twig"
);

assertEquals(
"TwigUtilIntegrationBundle:layout.html.twig",
TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/layout.html.twig".split("/")))
);

assertEquals(
"TwigUtilIntegrationBundle:Foo/layout.html.twig",
TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/Foo/layout.html.twig".split("/")))
);

assertEquals(
"TwigUtilIntegrationBundle:Foo/Bar/layout.html.twig",
TwigUtil.getTemplateNameByOverwrite(getProject(), VfsUtil.findRelativeFile(getProject().getBaseDir(), "app/Resources/TwigUtilIntegrationBundle/views/Foo/Bar/layout.html.twig".split("/")))
);
}

/**
* @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getPresentableTemplateName
*/
Expand Down
11 changes: 0 additions & 11 deletions src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/TwigUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@ public String getTestDataPath() {
return "src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/util/fixtures";
}

/**
* @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#getTemplateNameByOverwrite
*/
public void testTemplateOverwriteNavigation() {
if(System.getenv("PHPSTORM_ENV") != null) return;

assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:layout.html.twig' %}", "/views/layout.html.twig");
assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:Foo/layout.html.twig' %}", "/views/Foo/layout.html.twig");
assertNavigationContainsFile(TwigFileType.INSTANCE, "{% extends '<caret>TwigUtilIntegrationBundle:Foo/Bar/layout.html.twig' %}", "/views/Foo/Bar/layout.html.twig");
}

/**
* @see fr.adrienbrault.idea.symfony2plugin.templating.util.TwigUtil#isValidStringWithoutInterpolatedOrConcat
*/
Expand Down