FIX: Allow SS4 includes without full path (fixes #6)

kinglozzer · Feb 26, 2021 · 9821143 · 9821143
1 parent 0d5e3bc
commit 9821143
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/com/kinglozzer/silverstripe/util/SilverstripeFileUtil.java b/src/main/java/com/kinglozzer/silverstripe/util/SilverstripeFileUtil.java
@@ -36,9 +36,18 @@ public static List<SilverstripePsiFile> findIncludeTemplate(Project project, Str
 
             String templatePath = templatePathFragments[1];
             // In SS4, we have to make sure the entire path matches. In SS3, just the file name matching is enough
+            // Special case - "Includes" directory at any level
             if (SilverstripeVersionUtil.isSilverstripe4OrMore(project)) {
                 if (templatePath.equals(key)) {
                     result.add(file);
+                } else {
+                    // In SS4, <% include Foo %> should still match "templates/Includes/Foo.ss" without including
+                    // the full path - so we manually inject "Includes/" and check again
+                    int lastSlash = key.lastIndexOf("/");
+                    String includeKey = key.substring(0, lastSlash) + "/Includes/" + key.substring(lastSlash + 1);
+                    if (templatePath.equals(includeKey)) {
+                        result.add(file);
+                    }
                 }
             } else if (templatePath.endsWith(key)) {
                 result.add(file);