Fix for #284. Correctly figure out less and scss dependencies when @import directive is inside other rules like @media. (#286)

samfromlv · madskristensen · commit 313198e2a0cf · 2017-01-17T07:43:15.000-08:00
diff --git a/src/WebCompiler/Dependencies/SassDependencyResolver.cs b/src/WebCompiler/Dependencies/SassDependencyResolver.cs
@@ -50,7 +50,7 @@ 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 = Regex.Matches(content, @"(?<=^@import(?:[\s]+))(?:(?:\(\w+\)))?\s*(?:url)?(?<url>[^;]+)", RegexOptions.Multiline);
+                var matches = Regex.Matches(content, @"(?<=@import(?:[\s]+))(?:(?:\(\w+\)))?\s*(?:url)?(?<url>[^;]+)", RegexOptions.Multiline);
                 foreach (Match match in matches)
                 {
                     var importedfiles = GetFileInfos(info, match);

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public override void UpdateFileDependencies(string path)`
`50`	`50`	`string content = File.ReadAllText(info.FullName);`
`51`	`51`
`52`	`52`	`//match both <@import "myFile.scss";> and <@import url("myFile.scss");> syntax`
`53`		`- var matches = Regex.Matches(content, @"(?<=^@import(?:[\s]+))(?:(?:\(\w+\)))?\s*(?:url)?(?<url>[^;]+)", RegexOptions.Multiline);`
	`53`	`+ var matches = Regex.Matches(content, @"(?<=@import(?:[\s]+))(?:(?:\(\w+\)))?\s*(?:url)?(?<url>[^;]+)", RegexOptions.Multiline);`
`54`	`54`	`foreach (Match match in matches)`
`55`	`55`	`{`
`56`	`56`	`var importedfiles = GetFileInfos(info, match);`