Improve error message on missing shortcode inner content

Fixes #933

diff --git a/hugolib/shortcode.go b/hugolib/shortcode.go
index 41560c0f41ccdfcfc50b2e2ea1ae14e0ee2dfe60..f144fa38bac779662a8b19a89034e353b4a841ad 100644 (file)
--- a/hugolib/shortcode.go
+++ b/hugolib/shortcode.go
@@ -313,7 +313,7 @@ Loop:
                                        // return that error, more specific
                                        continue
                                }
-                               return sc, fmt.Errorf("Shortcode '%s' has no .Inner, yet a closing tag was provided", next.val)
+                               return sc, fmt.Errorf("Shortcode '%s' in page '%s' has no .Inner, yet a closing tag was provided", next.val, p.FullFilePath())
                        }
                        pt.consume(2)
                        return sc, nil

diff --git a/hugolib/shortcode_test.go b/hugolib/shortcode_test.go
index 92089f64487a2152ced1c111330a9293dd98bf62..5431e1cf419da4460b4ce94c8d0be9e6c133342f 100644 (file)
--- a/hugolib/shortcode_test.go
+++ b/hugolib/shortcode_test.go
@@ -184,7 +184,7 @@ func TestExtractShortcodes(t *testing.T) {
                        testScPlaceholderRegexp, ""},
                {"inner", `Some text. {{< inner >}}Inner Content{{< / inner >}}. Some more text.`, `inner([], false){[Inner Content]}`,
                        fmt.Sprintf("Some text. %s. Some more text.", testScPlaceholderRegexp), ""},
-               {"close, but not inner", "{{< tag >}}foo{{< /tag >}}", "", false, "Shortcode 'tag' has no .Inner.*"},
+               {"close, but not inner", "{{< tag >}}foo{{< /tag >}}", "", false, "Shortcode 'tag' in page 'simple.md' has no .Inner.*"},
                {"nested inner", `Inner->{{< inner >}}Inner Content->{{% inner2 param1 %}}inner2txt{{% /inner2 %}}Inner close->{{< / inner >}}<-done`,
                        `inner([], false){[Inner Content-> inner2([\"param1\"], true){[inner2txt]} Inner close->]}`,
                        fmt.Sprintf("Inner->%s<-done", testScPlaceholderRegexp), ""},