Merge pull request #832 from am11/markdown-bugfixes

madskristensen · madskristensen · commit 060072e8324d · 2014-04-02T07:40:26.000-07:00
Markdown: Preserve scrolling on compile (#830)
diff --git a/EditorExtensions/Markdown/Margin/MarkdownMargin.cs b/EditorExtensions/Markdown/Margin/MarkdownMargin.cs
@@ -6,19 +6,23 @@
 using System.Windows.Controls;
 using MadsKristensen.EditorExtensions.Settings;
 using Microsoft.VisualStudio.Text;
+using mshtml;
 
 namespace MadsKristensen.EditorExtensions.Markdown
 {
     internal class MarkdownMargin : CompilingMarginBase
     {
+        private HTMLDocument _document;
         private WebBrowser _browser;
         private const string _stylesheet = "WE-Markdown.css";
+        private double _cachedPosition = 0,
+                       _cachedHeight = 0,
+                       _positionPercentage = 0;
 
         public MarkdownMargin(ITextDocument document)
             : base(WESettings.Instance.Markdown, document)
         { }
 
-
         public static string GetStylesheet()
         {
             string file = GetCustomStylesheetFilePath();
@@ -62,13 +66,31 @@ protected override void UpdateMargin(CompilerResult result)
                                     </head>
                                     <body>{1}</body></html>", GetStylesheet(), result.Result);
 
+            if (_document == null)
+            {
+                _browser.NavigateToString(html);
+
+                return;
+            }
+
+            _cachedPosition = _document.documentElement.getAttribute("scrollTop");
+            _cachedHeight = Math.Max(1.0, _document.body.offsetHeight);
+            _positionPercentage = _cachedPosition * 100 / _cachedHeight;
+
             _browser.NavigateToString(html);
         }
 
         protected override FrameworkElement CreatePreviewControl()
         {
             _browser = new WebBrowser();
             _browser.HorizontalAlignment = HorizontalAlignment.Stretch;
+            _browser.Navigated += (s, e) =>
+            {
+                _document = _browser.Document as HTMLDocument;
+                _cachedHeight = _document.body.offsetHeight;
+                _document.documentElement.setAttribute("scrollTop", _positionPercentage * _cachedHeight / 100);
+            };
+
             return _browser;
         }
     }
diff --git a/EditorExtensions/TypeScript/Compilers/TypeScriptCompilationNotifier.cs b/EditorExtensions/TypeScript/Compilers/TypeScriptCompilationNotifier.cs
@@ -33,8 +33,8 @@ private string GetOutputFileName()
             Project project = ProjectHelpers.GetProject(SourceFilePath);
             IVsHierarchy hierarchy = null;
 
-            if (project != null)
-                solution.GetProjectOfUniqueName(project.UniqueName, out hierarchy);
+            if (project != null && solution.GetProjectOfUniqueName(project.UniqueName, out hierarchy) != VSConstants.S_OK)
+                return string.Empty;
 
             IVsBuildPropertyStorage buildPropertyStorage = hierarchy as IVsBuildPropertyStorage;
 
diff --git a/EditorExtensions/WebEssentials2013.csproj b/EditorExtensions/WebEssentials2013.csproj
@@ -209,6 +209,15 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <COMReference Include="MSHTML">
+      <Guid>{3050F1C5-98B5-11CF-BB82-00AA00BDCE0B}</Guid>
+      <VersionMajor>4</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>primary</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
       <VersionMajor>2</VersionMajor>
