From 88e447c449608523d87c517396bde31a62f392b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Tue, 31 Jul 2018 16:53:03 +0200
Subject: [PATCH] tocss/scss: Improve _ prefix handling in SCSS imports

See #5008
---
 hugolib/resource_chain_test.go | 20 ++++++++++++++++++--
 resource/tocss/scss/tocss.go   |  2 ++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index 3d13d3912..3e199d318 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -114,7 +114,7 @@ func TestSCSSWithThemeOverrides(t *testing.T) {
 
 	b.WithSourceFile(filepath.Join(scssThemeDir, "components", "_imports.scss"), `
 @import "moo";
-
+@import "_boo";
 `)
 
 	b.WithSourceFile(filepath.Join(scssThemeDir, "components", "_moo.scss"), `
@@ -123,6 +123,14 @@ $moolor: #fff;
 moo {
   color: $moolor;
 }
+`)
+
+	b.WithSourceFile(filepath.Join(scssThemeDir, "components", "_boo.scss"), `
+$boolor: orange;
+
+boo {
+  color: $boolor;
+}
 `)
 
 	b.WithSourceFile(filepath.Join(scssThemeDir, "main.scss"), `
@@ -136,6 +144,14 @@ $moolor: #ccc;
 moo {
   color: $moolor;
 }
+`)
+
+	b.WithSourceFile(filepath.Join(scssDir, "components", "_boo.scss"), `
+$boolor: green;
+
+boo {
+  color: $boolor;
+}
 `)
 
 	b.WithTemplatesAdded("index.html", `
@@ -145,7 +161,7 @@ T1: {{ $r.Content }}
 `)
 	b.Build(BuildCfg{})
 
-	b.AssertFileContent(filepath.Join(workDir, "public/index.html"), `T1: moo{color:#ccc}`)
+	b.AssertFileContent(filepath.Join(workDir, "public/index.html"), `T1: moo{color:#ccc}boo{color:green}`)
 
 }
 
diff --git a/resource/tocss/scss/tocss.go b/resource/tocss/scss/tocss.go
index c50b054b7..5ba7793c0 100644
--- a/resource/tocss/scss/tocss.go
+++ b/resource/tocss/scss/tocss.go
@@ -93,6 +93,8 @@ func (t *toCSSTransformation) Transform(ctx *resource.ResourceTransformationCtx)
 			namePatterns = []string{"_%s.scss", "%s.scss", "_%s.sass", "%s.sass"}
 		}
 
+		name = strings.TrimPrefix(name, "_")
+
 		for _, namePattern := range namePatterns {
 			filenameToCheck := filepath.Join(basePath, fmt.Sprintf(namePattern, name))
 			fi, err := t.c.sfs.Fs.Stat(filenameToCheck)