Merge pull request #1375 from am11/master

WEIgnore: Alow compilation just for preview.

Author: madskristensen

EditorExtensions/CoffeeScript/Compilers/CoffeeScriptCompiler.cs

@@ -8,6 +8,7 @@ namespace MadsKristensen.EditorExtensions.CoffeeScript
     [ContentType("CoffeeScript")]
     public class CoffeeScriptCompiler : JsCompilerBase
     {
+        protected override bool Previewing { get { return WESettings.Instance.CoffeeScript.ShowPreviewPane; } }
         public override string ServiceName { get { return "CoffeeScript"; } }
         public override bool MinifyInPlace { get { return WESettings.Instance.CoffeeScript.MinifyInPlace; } }
         public override bool GenerateSourceMap { get { return WESettings.Instance.CoffeeScript.GenerateSourceMaps && !MinifyInPlace; } }

EditorExtensions/HTML/Completion/HtmlLabelForAttributeCompletion.cs

@@ -2,7 +2,6 @@
 using System.Linq;
 using Microsoft.Html.Core;
 using Microsoft.Html.Editor.Intellisense;
-using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Utilities;
 using Microsoft.Web.Editor;
 
@@ -21,7 +20,6 @@ public CompletionType CompletionType
         public IList<HtmlCompletion> GetEntries(HtmlCompletionContext context)
         {
             var list = new HashSet<string>();
-            var glyph = GlyphService.GetGlyph(StandardGlyphGroup.GlyphGroupVariable, StandardGlyphItem.GlyphItemPublic);
 
             context.Document.HtmlEditorTree.RootNode.Accept(this, list);
 

EditorExtensions/HTML/Completion/InputIdAttributeCompletion.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Media;
 using Microsoft.Html.Core;
 using Microsoft.Html.Editor.Intellisense;
-using Microsoft.VisualStudio.Language.Intellisense;
 using Microsoft.VisualStudio.Utilities;
 using Microsoft.Web.Editor;
 
@@ -14,7 +12,6 @@ namespace MadsKristensen.EditorExtensions.Html
     public class InputIdAttributeCompletion : IHtmlCompletionListProvider, IHtmlTreeVisitor
     {
         private static readonly HashSet<string> _inputTypes = new HashSet<string>() { "input", "textarea", "select" };
-        private static ImageSource _glyph = GlyphService.GetGlyph(StandardGlyphGroup.GlyphGroupVariable, StandardGlyphItem.GlyphItemPublic);
 
         public CompletionType CompletionType
         {

EditorExtensions/LESS/Compilers/LessCompiler.cs

@@ -8,6 +8,7 @@ namespace MadsKristensen.EditorExtensions.Less
     [ContentType("LESS")]
     public class LessCompiler : CssCompilerBase
     {
+        protected override bool Previewing { get { return WESettings.Instance.Less.ShowPreviewPane; } }
         public override string TargetExtension { get { return ".css"; } }
         public override string ServiceName { get { return "LESS"; } }
         public override bool MinifyInPlace { get { return WESettings.Instance.Less.MinifyInPlace; } }

EditorExtensions/LiveScript/Compilers/LiveScriptCompiler.cs

@@ -8,6 +8,7 @@ namespace MadsKristensen.EditorExtensions.LiveScript
     [ContentType(LiveScriptContentTypeDefinition.LiveScriptContentType)]
     public class LiveScriptCompiler : JsCompilerBase
     {
+        protected override bool Previewing { get { return WESettings.Instance.LiveScript.ShowPreviewPane; } }
         public override string ServiceName { get { return "LiveScript"; } }
         public override bool MinifyInPlace { get { return WESettings.Instance.SweetJs.MinifyInPlace; } }
         public override bool GenerateSourceMap { get { return false; /*WESettings.Instance.LiveScript.GenerateSourceMaps && !WESettings.Instance.LiveScript.MinifyInPlace;*/ } }

EditorExtensions/SCSS/Compilers/ScssCompiler.cs

@@ -10,6 +10,7 @@ namespace MadsKristensen.EditorExtensions.Scss
     [ContentType(ScssContentTypeDefinition.ScssContentType)]
     public class ScssCompiler : CssCompilerBase
     {
+        protected override bool Previewing { get { return WESettings.Instance.Scss.ShowPreviewPane; } }
         public override string ServiceName { get { return "SCSS"; } }
         public override string TargetExtension { get { return ".css"; } }
         public override bool MinifyInPlace { get { return WESettings.Instance.Scss.MinifyInPlace; } }

EditorExtensions/Shared/Compilers/NodeExecutorBase.cs

@@ -10,6 +10,8 @@ namespace MadsKristensen.EditorExtensions
 {
     public abstract class NodeExecutorBase
     {
+        protected virtual bool Previewing { get { return false; } }
+
         ///<summary>Indicates whether this compiler will emit a source map file.  Will only return true if supported and enabled in user settings.</summary>
         public abstract bool MinifyInPlace { get; }
         public abstract bool GenerateSourceMap { get; }
@@ -18,20 +20,26 @@ public abstract class NodeExecutorBase
 
         public async Task<CompilerResult> CompileAsync(string sourceFileName, string targetFileName)
         {
+            bool onlyPreview = false;
+
             if (WEIgnore.TestWEIgnore(sourceFileName, this is ILintCompiler ? "linter" : "compiler", ServiceName.ToLowerInvariant()))
             {
                 Logger.Log(String.Format(CultureInfo.CurrentCulture, "{0}: The file {1} is ignored by .weignore. Skipping..", ServiceName, Path.GetFileName(sourceFileName)));
-                return await CompilerResultFactory.GenerateResult(sourceFileName, targetFileName, string.Empty, false, string.Empty, string.Empty, Enumerable.Empty<CompilerError>(), true);
+
+                if (!Previewing)
+                    return await CompilerResultFactory.GenerateResult(sourceFileName, targetFileName, string.Empty, false, string.Empty, string.Empty, Enumerable.Empty<CompilerError>(), true);
+
+                onlyPreview = true;
             }
 
             CompilerResult response = await NodeServer.CallServiceAsync(GetPath(sourceFileName, targetFileName));
 
-            return await ProcessResult(response, sourceFileName, targetFileName);
+            return await ProcessResult(response, onlyPreview, sourceFileName, targetFileName);
         }
 
         // Don't try-catch this method: We need to "address" all the bugs,
         // which may occur as the (node.js-based) service implement changes.
-        private async Task<CompilerResult> ProcessResult(CompilerResult result, string sourceFileName, string targetFileName)
+        private async Task<CompilerResult> ProcessResult(CompilerResult result, bool onlyPreview, string sourceFileName, string targetFileName)
         {
             if (result == null)
             {
@@ -50,17 +58,23 @@ private async Task<CompilerResult> ProcessResult(CompilerResult result, string s
 
             string resultString = PostProcessResult(result);
 
-            if (result.TargetFileName != null && (MinifyInPlace || !File.Exists(result.TargetFileName) ||
-                resultString != await FileHelpers.ReadAllTextRetry(result.TargetFileName)))
+            if (!onlyPreview)
             {
-                ProjectHelpers.CheckOutFileFromSourceControl(result.TargetFileName);
-                await FileHelpers.WriteAllTextRetry(result.TargetFileName, resultString);
-            }
-            if (GenerateSourceMap && (!File.Exists(result.MapFileName) ||
-                result.ResultMap != await FileHelpers.ReadAllTextRetry(result.MapFileName)))
-            {
-                ProjectHelpers.CheckOutFileFromSourceControl(result.MapFileName);
-                await FileHelpers.WriteAllTextRetry(result.MapFileName, result.ResultMap);
+                // Write output file
+                if (result.TargetFileName != null && (MinifyInPlace || !File.Exists(result.TargetFileName) ||
+                    resultString != await FileHelpers.ReadAllTextRetry(result.TargetFileName)))
+                {
+                    ProjectHelpers.CheckOutFileFromSourceControl(result.TargetFileName);
+                    await FileHelpers.WriteAllTextRetry(result.TargetFileName, resultString);
+                }
+
+                // Write map file
+                if (GenerateSourceMap && (!File.Exists(result.MapFileName) ||
+                    result.ResultMap != await FileHelpers.ReadAllTextRetry(result.MapFileName)))
+                {
+                    ProjectHelpers.CheckOutFileFromSourceControl(result.MapFileName);
+                    await FileHelpers.WriteAllTextRetry(result.MapFileName, result.ResultMap);
+                }
             }
 
             return CompilerResult.UpdateResult(result, resultString);

EditorExtensions/SweetJs/Compilers/SweetJsCompiler.cs

@@ -8,6 +8,7 @@ namespace MadsKristensen.EditorExtensions.SweetJs
     [ContentType(SweetJsContentTypeDefinition.SweetJsContentType)]
     public class SweetJsCompiler : JsCompilerBase
     {
+        protected override bool Previewing { get { return WESettings.Instance.SweetJs.ShowPreviewPane; } }
         public override string ServiceName { get { return SweetJsContentTypeDefinition.SweetJsContentType; } }
         public override bool MinifyInPlace { get { return WESettings.Instance.SweetJs.MinifyInPlace; } }
         public override bool GenerateSourceMap { get { return WESettings.Instance.SweetJs.GenerateSourceMaps && !MinifyInPlace; } }