Merge pull request #2213 from Haehnchen/feature/bundle-namespace-twig

switch off old template Bundle naming convention by default (eg ::base.html.twig)
Haehnchen · Aug 24, 2023 · c7f4a48 · c7f4a48
2 parents 246f189 + ce6f951
commit c7f4a48
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/Settings.java
@@ -61,7 +61,7 @@ public class Settings implements PersistentStateComponent<Settings> {
     public boolean codeFoldingTwigConstant = true;
     public boolean featureTwigIcon = true;
 
-    public boolean twigBundleNamespaceSupport = true;
+    public boolean twigBundleNamespaceSupport = false;
 
     public boolean dismissEnableNotification = false;
 

diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form b/src/main/java/fr/adrienbrault/idea/symfony2plugin/ui/TwigSettingsForm.form
@@ -60,7 +60,7 @@
                 <properties>
                   <selected value="true"/>
                   <text value="Support Bundle Namespaces"/>
-                  <toolTipText value="Example: Foobar:Bar:Foo.html.twig"/>
+                  <toolTipText value="Example: Foobar:Bar:Foo.html.twig (for older Symfony Versions)"/>
                 </properties>
               </component>
             </children>

diff --git a/...ienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java b/...ienbrault/idea/symfony2plugin/tests/templating/path/BundleTwigNamespaceExtensionTest.java
@@ -3,6 +3,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.VfsTestUtil;
 import com.intellij.util.containers.ContainerUtil;
+import fr.adrienbrault.idea.symfony2plugin.Settings;
 import fr.adrienbrault.idea.symfony2plugin.extension.TwigNamespaceExtensionParameter;
 import fr.adrienbrault.idea.symfony2plugin.templating.path.BundleTwigNamespaceExtension;
 import fr.adrienbrault.idea.symfony2plugin.templating.path.TwigPath;
@@ -28,6 +29,8 @@ public String getTestDataPath() {
     }
 
     public void testThatBundleNamespacesAreAdded() {
+        Settings.getInstance(getProject()).twigBundleNamespaceSupport = true;
+
         Collection<TwigPath> namespaces = new BundleTwigNamespaceExtension()
             .getNamespaces(new TwigNamespaceExtensionParameter(getProject()));