Support TSR when wildcard follows named param

clevergo · Sep 21, 2020 · 0a26903 · 0a26903
1 parent 1490139
commit 0a26903
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tree.go b/tree.go
@@ -397,7 +397,7 @@ walk: // Outer loop for walking the tree
  // No handle found. Check if a handle for this path + a
  // trailing slash exists for TSR recommendation
  n = n.children[0]
- tsr = (n.path == "/" && n.route != nil)
+ tsr = (n.path == "/" && n.route != nil) || (n.path == "" && n.indices == "/")
  }
 
  return

diff --git a/tree_test.go b/tree_test.go
@@ -363,6 +363,7 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
  "/no/a",
  "/no/b",
  "/api/hello/:name",
+ "/vendor/:x/*y",
  }
  for _, route := range routes {
  recv := catchPanic(func() {
@@ -386,6 +387,7 @@ func TestTreeTrailingSlashRedirect(t *testing.T) {
  "/admin/config/",
  "/admin/config/permissions/",
  "/doc/",
+ "/vendor/x",
  }
  for _, route := range tsrRoutes {
  handler, tsr := tree.getValue(route, nil, false)