Support comma separated imports

Fixed #191

Author: madskristensen

src/WebCompiler/Dependencies/SassDependencyResolver.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text.RegularExpressions;
 
 namespace WebCompiler
 {
@@ -29,7 +30,7 @@ public override void UpdateFileDependencies(string path)
             if (this.Dependencies != null)
             {
                 path = path.ToLowerInvariant();
-                
+
                 if (!Dependencies.ContainsKey(path))
                     Dependencies[path] = new Dependencies();
 
@@ -49,60 +50,72 @@ public override void UpdateFileDependencies(string path)
                 string content = File.ReadAllText(info.FullName);
 
                 //match both <@import "myFile.scss";> and <@import url("myFile.scss");> syntax
-                var matches = System.Text.RegularExpressions.Regex.Matches(content, "@import([\\s]+)(\\([\\S]+\\)([\\s]+))?(url\\()?('|\"|)(?<url>[^'\"\\):?:]+)('|\"|\\))");
-                foreach (System.Text.RegularExpressions.Match match in matches)
+                var matches = Regex.Matches(content, @"(?<=^@import(?:[\s]+))(?:(?:\(\w+\)))?\s*(?:url)?(?<url>.+?)$", RegexOptions.Multiline);
+                foreach (Match match in matches)
                 {
-                    FileInfo importedfile = GetFileInfo(info, match);
-
-                    if (importedfile == null)
-                        continue;
+                    var importedfiles = GetFileInfos(info, match);
 
-                    //if the file doesn't end with the correct extension, an import statement without extension is probably used, to re-add the extension (#175)
-                    if (string.Compare(importedfile.Extension, FileExtension, StringComparison.OrdinalIgnoreCase) != 0)
+                    foreach (FileInfo importedfile in importedfiles)
                     {
-                        importedfile = new FileInfo(importedfile.FullName + this.FileExtension);
-                    }
+                        if (importedfile == null)
+                            continue;
 
-                    var dependencyFilePath = importedfile.FullName.ToLowerInvariant();
+                        var theFile = importedfile;
 
-                    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 the file doesn't end with the correct extension, an import statement without extension is probably used, to re-add the extension (#175)
+                        if (string.Compare(importedfile.Extension, FileExtension, StringComparison.OrdinalIgnoreCase) != 0)
+                        {
+                            theFile = new FileInfo(importedfile.FullName + this.FileExtension);
+                        }
 
-                        if (!File.Exists(cleanPath))
-                            continue;
+                        var dependencyFilePath = theFile.FullName.ToLowerInvariant();
 
-                        dependencyFilePath = cleanPath;
-                    }
+                        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);
+                        if (!Dependencies[path].DependentOn.Contains(dependencyFilePath))
+                            Dependencies[path].DependentOn.Add(dependencyFilePath);
 
-                    if (!Dependencies.ContainsKey(dependencyFilePath))
-                        Dependencies[dependencyFilePath] = new Dependencies();
+                        if (!Dependencies.ContainsKey(dependencyFilePath))
+                            Dependencies[dependencyFilePath] = new Dependencies();
 
-                    if (!Dependencies[dependencyFilePath].DependentFiles.Contains(path))
-                        Dependencies[dependencyFilePath].DependentFiles.Add(path);
+                        if (!Dependencies[dependencyFilePath].DependentFiles.Contains(path))
+                            Dependencies[dependencyFilePath].DependentFiles.Add(path);
+                    }
                 }
             }
         }
 
-        private static FileInfo GetFileInfo(FileInfo info, System.Text.RegularExpressions.Match match)
+        private static IEnumerable<FileInfo> GetFileInfos(FileInfo info, System.Text.RegularExpressions.Match match)
         {
-            string url = match.Groups["url"].Value;
+            string url = match.Groups["url"].Value.Replace("'", "\"").Replace("(", "").Replace(")", "").Replace(";", "").Trim();
+            var list = new List<FileInfo>();
 
-            try
-            {
-                return new FileInfo(Path.Combine(info.DirectoryName, match.Groups["url"].Value));
-            }
-            catch (Exception)
+            foreach (string name in url.Split(new[] { "\"," }, StringSplitOptions.RemoveEmptyEntries))
             {
-                // Not a valid file name
-                return null;
+                try
+                {
+                    string value = name.Replace("\"", "").Replace("/", "\\").Trim();
+                    list.Add(new FileInfo(Path.Combine(info.DirectoryName, value)));
+                }
+                catch (Exception ex)
+                {
+                    // Not a valid file name
+                    System.Diagnostics.Debug.Write(ex);
+                }
             }
+
+            return list;
         }
     }
 }

src/WebCompilerTest/Compile/ScssTest.cs

@@ -57,6 +57,14 @@ public void AssociateExtensionSourceFileChangedTest()
             Assert.IsTrue(File.Exists("../../artifacts/scss/test.css"));
         }
 
+        [TestMethod, TestCategory("SCSS")]
+        public void CommaListOfImportsSourcefileChanged()
+        {
+            var result = _processor.SourceFileChanged(new FileInfo("../../artifacts/scssconfig.json").FullName, new FileInfo("../../artifacts/scss/sub/foo.scss").FullName, new DirectoryInfo("../../artifacts/").FullName);
+            Assert.AreEqual(1, result.Count<CompilerResult>());
+            Assert.IsTrue(File.Exists("../../artifacts/scss/test.css"));
+        }
+
         [TestMethod, TestCategory("SCSS")]
         public void OtherExtensionTypeSourceFileChangedTest()
         {

src/WebCompilerTest/WebCompilerTest.csproj

@@ -73,6 +73,7 @@
   <ItemGroup>
     <Content Include="artifacts\less\sub\logo.png" />
     <None Include="artifacts\coffeeconfig.json.defaults" />
+    <None Include="artifacts\scss\sub\foo.scss" />
     <None Include="artifacts\stylusconfig.json" />
     <None Include="artifacts\less\sub\relative.less" />
     <None Include="artifacts\babelconfigError.json" />

src/WebCompilerTest/artifacts/scss/sub/foo.scss

@@ -0,0 +1,3 @@
+div {
+    background: url(../foo.png);
+}

src/WebCompilerTest/artifacts/scss/sub/relative.scss

@@ -1,3 +1,3 @@
-body {
+div {
     background: url(../foo.png);
 }

src/WebCompilerTest/artifacts/scss/test.scss

@@ -1,4 +1,4 @@
-@import "variables";
+@import "variables",  "sub/foo";
 
 body {
     background-color: $background;