Supporting partials with an underscore

Fixed #184
Fixed #185

Author: madskristensen

src/WebCompiler/Config/ConfigFileProcessor.cs

@@ -79,7 +79,7 @@ public void DeleteOutputFiles(string configFile)
         /// <summary>
         /// Compiles all configs with the same input file extension as the specified sourceFile
         /// </summary>
-        public IEnumerable<CompilerResult> SourceFileChanged(string configFile, 
+        public IEnumerable<CompilerResult> SourceFileChanged(string configFile,
                                                              string sourceFile,
                                                              string projectPath)
         {
@@ -124,7 +124,7 @@ private IEnumerable<CompilerResult> SourceFileChanged(string configFile,
                         foreach (var file in dependencies[key].DependentFiles.ToArray())
                         {
                             if (!compiledFiles.Contains(file.ToLowerInvariant()))
-                                SourceFileChanged(configFile, file, projectPath, compiledFiles);
+                                list.AddRange(SourceFileChanged(configFile, file, projectPath, compiledFiles));
                         }
                     }
                 }

src/WebCompiler/Dependencies/SassDependencyResolver.cs

@@ -29,7 +29,7 @@ public override void UpdateFileDependencies(string path)
             if (this.Dependencies != null)
             {
                 path = path.ToLowerInvariant();
-
+                
                 if (!Dependencies.ContainsKey(path))
                     Dependencies[path] = new Dependencies();
 
@@ -65,6 +65,19 @@ public override void UpdateFileDependencies(string path)
 
                     var dependencyFilePath = importedfile.FullName.ToLowerInvariant();
 
+                    if (!File.Exists(dependencyFilePath))
+                    {
+                        // Trim leading underscore to support Sass partials
+                        var dir = Path.GetDirectoryName(dependencyFilePath);
+                        var fileName = Path.GetFileName(dependencyFilePath);
+                        var cleanPath = Path.Combine(dir, "_" + fileName);
+
+                        if (!File.Exists(cleanPath))
+                            continue;
+
+                        dependencyFilePath = cleanPath;
+                    }
+
                     if (!Dependencies[path].DependentOn.Contains(dependencyFilePath))
                         Dependencies[path].DependentOn.Add(dependencyFilePath);
 

src/WebCompilerTest/Compile/ScssTest.cs

@@ -52,8 +52,9 @@ public void CompileScssError()
         [TestMethod, TestCategory("SCSS")]
         public void AssociateExtensionSourceFileChangedTest()
         {
-            var result = _processor.SourceFileChanged("../../artifacts/scssconfig.json","scss/test.scss", null);
-            Assert.AreEqual(2, result.Count<CompilerResult>());
+            var result = _processor.SourceFileChanged(new FileInfo("../../artifacts/scssconfig.json").FullName,new FileInfo( "../../artifacts/scss/_variables.scss").FullName, new DirectoryInfo("../../artifacts/").FullName);
+            Assert.AreEqual(1, result.Count<CompilerResult>());
+            Assert.IsTrue(File.Exists("../../artifacts/scss/test.css"));
         }
 
         [TestMethod, TestCategory("SCSS")]

src/WebCompilerTest/WebCompilerTest.csproj

@@ -105,7 +105,7 @@
     <None Include="artifacts\scss\error.scss" />
     <None Include="artifacts\scss\sub\relative.scss" />
     <None Include="artifacts\scss\test.scss" />
-    <None Include="artifacts\scss\variables.scss" />
+    <None Include="artifacts\scss\_variables.scss" />
     <None Include="artifacts\less\error.less" />
     <None Include="artifacts\less\test.less" />
     <None Include="artifacts\less\variables.less" />

src/WebCompilerTest/artifacts/less/test.less

@@ -1,4 +1,4 @@
-@import (reference) "variables.less";
+@import (reference) "../less/variables.less";
 @colorpicker-path: sub;
 
 /*! important comment*/