From 4d7fa9f114c62ae2ec12257203ed21b0e4d69a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Sat, 23 May 2020 15:04:00 +0200
Subject: Fix IsAncestor/IsDescendant for taxonomies

Fixes #7305
---
 hugolib/page__tree.go    |  8 --------
 hugolib/taxonomy_test.go | 52 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/hugolib/page__tree.go b/hugolib/page__tree.go
index 5b53dc4cd..d2ef00e76 100644
--- a/hugolib/page__tree.go
+++ b/hugolib/page__tree.go
@@ -50,10 +50,6 @@ func (pt pageTree) IsAncestor(other interface{}) (bool, error) {
 		return ref1.n.p.IsHome(), nil
 	}
 
-	if !ref1.isSection() {
-		return false, nil
-	}
-
 	if ref1.key == ref2.key {
 		return true, nil
 	}
@@ -101,10 +97,6 @@ func (pt pageTree) IsDescendant(other interface{}) (bool, error) {
 		return ref2.n.p.IsHome(), nil
 	}
 
-	if !ref2.isSection() {
-		return false, nil
-	}
-
 	if ref1.key == ref2.key {
 		return true, nil
 	}
diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
index 1f43318fa..97058dd19 100644
--- a/hugolib/taxonomy_test.go
+++ b/hugolib/taxonomy_test.go
@@ -655,3 +655,55 @@ Category Paginator /categories/birds/|/categories/cats/|/categories/dogs/|/categ
 	b.AssertFileContent("public/categories/index.xml", `<link>http://example.com/categories/funny/</link>`)
 
 }
+
+func TestTaxonomiesDirectoryOverlaps(t *testing.T) {
+	t.Parallel()
+
+	b := newTestSitesBuilder(t).WithContent(
+		"abc/_index.md", "---\ntitle: \"abc\"\nabcdefgs: [abc]\n---",
+		"abc/p1.md", "---\ntitle: \"abc-p\"\n---",
+		"abcdefgh/_index.md", "---\ntitle: \"abcdefgh\"\n---",
+		"abcdefgh/p1.md", "---\ntitle: \"abcdefgh-p\"\n---",
+		"abcdefghijk/index.md", "---\ntitle: \"abcdefghijk\"\n---",
+	)
+
+	b.WithConfigFile("toml", `
+baseURL = "https://example.org"
+
+[taxonomies]
+  abcdef = "abcdefs"
+  abcdefg = "abcdefgs"
+  abcdefghi = "abcdefghis"
+`)
+
+	b.WithTemplatesAdded("index.html", `
+{{ range site.Pages }}Page: {{ template "print-page" . }}
+{{ end }}
+{{ $abc := site.GetPage "abcdefgs/abc" }}
+{{ $abcdefgs := site.GetPage "abcdefgs" }}
+abc: {{ template "print-page" $abc }}|IsAncestor: {{ $abc.IsAncestor $abcdefgs }}|IsDescendant: {{ $abc.IsDescendant $abcdefgs }}
+abcdefgs: {{ template "print-page" $abcdefgs }}|IsAncestor: {{ $abcdefgs.IsAncestor $abc }}|IsDescendant: {{ $abcdefgs.IsDescendant $abc }}
+
+{{ define "print-page" }}{{ .RelPermalink }}|{{ .Title }}|{{.Kind }}|Parent: {{ with .Parent }}{{ .RelPermalink }}{{ end }}|CurrentSection: {{ .CurrentSection.RelPermalink}}|FirstSection: {{ .FirstSection.RelPermalink }}{{ end }}
+
+`)
+
+	b.Build(BuildCfg{})
+
+	b.AssertFileContent("public/index.html", `
+    Page: /||home|Parent: |CurrentSection: /|
+    Page: /abc/|abc|section|Parent: /|CurrentSection: /abc/|
+    Page: /abc/p1/|abc-p|page|Parent: /abc/|CurrentSection: /abc/|
+    Page: /abcdefgh/|abcdefgh|section|Parent: /|CurrentSection: /abcdefgh/|
+    Page: /abcdefgh/p1/|abcdefgh-p|page|Parent: /abcdefgh/|CurrentSection: /abcdefgh/|
+    Page: /abcdefghijk/|abcdefghijk|page|Parent: /|CurrentSection: /|
+    Page: /abcdefghis/|Abcdefghis|taxonomyTerm|Parent: /|CurrentSection: /|
+    Page: /abcdefgs/|Abcdefgs|taxonomyTerm|Parent: /|CurrentSection: /|
+    Page: /abcdefs/|Abcdefs|taxonomyTerm|Parent: /|CurrentSection: /|
+    abc: /abcdefgs/abc/|abc|taxonomy|Parent: /abcdefgs/|CurrentSection: /abcdefgs/|
+    abcdefgs: /abcdefgs/|Abcdefgs|taxonomyTerm|Parent: /|CurrentSection: /|
+    abc: /abcdefgs/abc/|abc|taxonomy|Parent: /abcdefgs/|CurrentSection: /abcdefgs/|FirstSection: /|IsAncestor: false|IsDescendant: true
+    abcdefgs: /abcdefgs/|Abcdefgs|taxonomyTerm|Parent: /|CurrentSection: /|FirstSection: /|IsAncestor: true|IsDescendant: false
+`)
+
+}
-- 
cgit v1.2.3