Clean up

Author: madskristensen

CHANGELOG.md

@@ -4,6 +4,7 @@
 - [ ] Preview window (#6)
 - [ ] File globbing pattern support (#49)
 - [ ] Run compilers from a node server
+- [x] Sass/LESS dependent file support
 
 Features that have a checkmark are complete and available for
 download in the

src/WebCompiler/Dependencies/DependencyResolverBase.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WebCompiler
 {
@@ -11,12 +9,12 @@ namespace WebCompiler
     /// </summary>
     public abstract class DependencyResolverBase
     {
-        private Dictionary<string, WebCompiler.Dependencies> _dependencies;
+        private Dictionary<string, Dependencies> _dependencies;
 
         /// <summary>
         /// Stores all resolved dependencies
         /// </summary>
-        protected Dictionary<string, WebCompiler.Dependencies> Dependencies
+        protected Dictionary<string, Dependencies> Dependencies
         {
             get
             {
@@ -40,17 +38,17 @@ public Dictionary<string, Dependencies> GetDependencies(string projectRootPath)
         {
             if (_dependencies == null)
             {
-                _dependencies = new Dictionary<string, WebCompiler.Dependencies>();
+                _dependencies = new Dictionary<string, Dependencies>();
 
                 List<string> files = new List<string>();
-                foreach(var pattern in this.SearchPatterns)
+                foreach (var pattern in this.SearchPatterns)
                 {
-                    files.AddRange(System.IO.Directory.GetFiles(projectRootPath, pattern, System.IO.SearchOption.AllDirectories));
+                    files.AddRange(Directory.GetFiles(projectRootPath, pattern, SearchOption.AllDirectories));
                 }
-                
+
                 foreach (var path in (from p in files select p.ToLowerInvariant()))
                 {
-                    this.UpdateFileDependencies(path);
+                    UpdateFileDependencies(path);
                 }
             }
 
@@ -61,6 +59,5 @@ public Dictionary<string, Dependencies> GetDependencies(string projectRootPath)
         /// Updates the dependencies for the given file
         /// </summary>
         public abstract void UpdateFileDependencies(string path);
-
     }
 }

src/WebCompiler/Dependencies/DependencyService.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace WebCompiler
 {

src/WebCompiler/Dependencies/LessDependencyResolver.cs

@@ -1,19 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WebCompiler
+namespace WebCompiler
 {
     class LessDependencyResolver : SassDependencyResolver
     {
         public override string[] SearchPatterns
         {
-            get
-            {
-                return new string[] { "*.less" };
-            }
+            get { return new string[] { "*.less" }; }
         }
     }
 }

src/WebCompiler/Dependencies/SassDependencyResolver.cs

@@ -1,21 +1,13 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WebCompiler
 {
     class SassDependencyResolver : DependencyResolverBase
     {
-        
         public override string[] SearchPatterns
         {
-            get
-            {
-                return new string[] { "*.scss","*.sass"};
-            }
+            get { return new[] { "*.scss", "*.sass" }; }
         }
 
         /// <summary>
@@ -28,18 +20,18 @@ public override void UpdateFileDependencies(string path)
             {
                 path = path.ToLowerInvariant();
 
-                if (!this.Dependencies.ContainsKey(path))
-                    this.Dependencies[path] = new WebCompiler.Dependencies();
+                if (!Dependencies.ContainsKey(path))
+                    Dependencies[path] = new Dependencies();
 
                 //remove the dependencies registration of this file
                 this.Dependencies[path].DependentOn = new HashSet<string>();
                 //remove the dependentfile registration of this file for all other files
-                foreach (var dependenciesPath in this.Dependencies.Keys)
+                foreach (var dependenciesPath in Dependencies.Keys)
                 {
                     var lowerDependenciesPath = path.ToLowerInvariant();
-                    if (this.Dependencies[lowerDependenciesPath].DependentFiles.Contains(path))
+                    if (Dependencies[lowerDependenciesPath].DependentFiles.Contains(path))
                     {
-                        this.Dependencies[lowerDependenciesPath].DependentFiles.Remove(path);
+                        Dependencies[lowerDependenciesPath].DependentFiles.Remove(path);
                     }
                 }
 
@@ -50,17 +42,17 @@ public override void UpdateFileDependencies(string path)
                 var matches = System.Text.RegularExpressions.Regex.Matches(content, "@import\\s+(url\\()?(['\"])(.*?)(\\2)\\)?;");
                 foreach (System.Text.RegularExpressions.Match match in matches)
                 {
-                    FileInfo importedfile = new FileInfo(System.IO.Path.Combine(info.DirectoryName, match.Groups[3].Value));
+                    FileInfo importedfile = new FileInfo(Path.Combine(info.DirectoryName, match.Groups[3].Value));
                     var dependencyFilePath = importedfile.FullName.ToLowerInvariant();
 
-                    if (!this.Dependencies[path].DependentOn.Contains(dependencyFilePath))
-                        this.Dependencies[path].DependentOn.Add(dependencyFilePath);
+                    if (!Dependencies[path].DependentOn.Contains(dependencyFilePath))
+                        Dependencies[path].DependentOn.Add(dependencyFilePath);
 
-                    if (!this.Dependencies.ContainsKey(dependencyFilePath))
-                        this.Dependencies[dependencyFilePath] = new WebCompiler.Dependencies();
+                    if (!Dependencies.ContainsKey(dependencyFilePath))
+                        Dependencies[dependencyFilePath] = new Dependencies();
 
-                    if (!this.Dependencies[dependencyFilePath].DependentFiles.Contains(path))
-                        this.Dependencies[dependencyFilePath].DependentFiles.Add(path);
+                    if (!Dependencies[dependencyFilePath].DependentFiles.Contains(path))
+                        Dependencies[dependencyFilePath].DependentFiles.Add(path);
                 }
             }
         }