Improve getting window from textviewhost

Author: sboulema

CodeNav/CodeNav.cs

@@ -12,6 +12,7 @@
 using CodeNav.Models;
 using CodeNav.Properties;
 using EnvDTE;
+using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using HorizontalAlignment = System.Windows.HorizontalAlignment;
 using Window = EnvDTE.Window;
@@ -32,12 +33,10 @@ public class CodeNav : DockPanel, IWpfTextViewMargin
         private List<string> _highlightedItems;
         private readonly BackgroundWorker _backgroundWorker;
         private readonly Dictionary<string, List<CodeItem>> _cache;
+        private readonly Window _window;
 
         public CodeNav(IWpfTextViewHost textViewHost, DTE dte)
         {
-            // If there are no code elements in the document, don't do anything
-            if (dte.ActiveDocument?.ProjectItem?.FileCodeModel?.CodeElements == null) return;
-
             _highlightedItems = new List<string>();
             _codeDocumentVm = new CodeDocumentViewModel();
             _cache = new Dictionary<string, List<CodeItem>>();
@@ -47,13 +46,36 @@ public CodeNav(IWpfTextViewHost textViewHost, DTE dte)
             _textView = textViewHost.TextView;
             _documentEvents = dte.Events.DocumentEvents;
 
+            // Get window belonging to textViewHost
+            ITextDocument document;
+            textViewHost.TextView.TextDataModel.DocumentBuffer.Properties.TryGetProperty(typeof(ITextDocument), out document);
+
+            for (var i = 1; i < _dte.Windows.Count + 1; i++)
+            {
+                var window = _dte.Windows.Item(i);
+                try
+                {
+                    if (window.Document == null) continue;
+                    if (!window.Document.FullName.Equals(document.FilePath, StringComparison.InvariantCultureIgnoreCase)) continue;
+                    _window = window;
+                    break;
+                }
+                catch (Exception e)
+                {
+                    LogHelper.Log($"Exception getting parent window: {e.Message}");
+                }
+            }
+
             // Setup the backgroundworker that will map the document to the codeitems
             _backgroundWorker = new BackgroundWorker {WorkerSupportsCancellation = true};
             _backgroundWorker.DoWork += _backgroundWorker_DoWork;
             _backgroundWorker.RunWorkerCompleted += _backgroundWorker_RunWorkerCompleted;
 
             // Add the view/content to the margin area
             Children.Add(CreateGrid(textViewHost, dte));
+
+            RegisterEvents();
+            LogHelper.Log($"CodeNav initialized for {_window.Caption}");
         }
 
         private void _backgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
@@ -70,7 +92,7 @@ private void _backgroundWorker_RunWorkerCompleted(object sender, RunWorkerComple
             }
 
             _codeDocumentVm.CodeDocument = (List<CodeItem>)e.Result;
-            _cache[_dte.ActiveDocument.Path] = (List<CodeItem>)e.Result;
+            _cache[_window.Document.Path] = (List<CodeItem>)e.Result;
             ((Grid)Children[0]).ColumnDefinitions[0].Width = !_codeDocumentVm.CodeDocument.Any() ? new GridLength(0) : new GridLength(Settings.Default.Width);
 
             stopwatch.Stop();
@@ -99,8 +121,8 @@ public void RegisterEvents()
             }
 
             // Subscribe to Code window activated event
-            if (_dte?.ActiveDocument?.ActiveWindow == null) return;
-            _windowEvents = _dte.Events.WindowEvents[_dte.ActiveDocument.ActiveWindow];
+            if (_window == null) return;
+            _windowEvents = _dte.Events.WindowEvents[_window];
             _windowEvents.WindowActivated -= WindowEvents_WindowActivated;
             _windowEvents.WindowActivated += WindowEvents_WindowActivated;                           
         }
@@ -112,7 +134,7 @@ public void UnRegisterEvents()
             _windowEvents.WindowActivated -= WindowEvents_WindowActivated;
         }
 
-        private void DocumentEvents_DocumentSaved(Document document) => UpdateDocument(_dte.ActiveDocument.ActiveWindow);
+        private void DocumentEvents_DocumentSaved(Document document) => UpdateDocument(_window);
         private void WindowEvents_WindowActivated(Window gotFocus, Window lostFocus) => UpdateDocument(gotFocus);
         private void Caret_PositionChanged(object sender, CaretPositionChangedEventArgs e) => UpdateCurrentItem();
 
@@ -211,13 +233,13 @@ public void UpdateDocument(Window gotFocus = null)
             if (gotFocus?.Document == null) return;
 
             // Do we have code items in the text document
-            var elements = _dte.ActiveDocument?.ProjectItem?.FileCodeModel?.CodeElements;
+            var elements = _window.ProjectItem.FileCodeModel?.CodeElements;
             if (elements == null) return;
 
             // Do we have a cached version of this document
-            if (_cache.ContainsKey(_dte.ActiveDocument.Path))
+            if (_cache.ContainsKey(_window.Document.Path))
             {
-                _codeDocumentVm.CodeDocument = _cache[_dte.ActiveDocument.Path];
+                _codeDocumentVm.CodeDocument = _cache[_window.Document.Path];
             }
 
             // If not show a loading item

CodeNav/CodeNavFactory.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel.Composition;
+using CodeNav.Helpers;
 using EnvDTE;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text.Editor;
@@ -36,7 +37,6 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
             var dte = (DTE)_serviceProvider.GetService(typeof(DTE));
             Logger.Initialize(_serviceProvider, "CodeNav");
             var codeNav = new CodeNav(wpfTextViewHost, dte);
-            codeNav.RegisterEvents();
             return codeNav;
         }
 

CodeNav/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="CodeNav.Samir Boulema.19687465-dc94-413d-ad72-6141e90c94d4" Version="0.3" Language="en-US" Publisher="Samir Boulema" />
+    <Identity Id="CodeNav.Samir Boulema.19687465-dc94-413d-ad72-6141e90c94d4" Version="1.2" Language="en-US" Publisher="Samir Boulema" />
     <DisplayName>CodeNav</DisplayName>
     <Description xml:space="preserve">Show the code structure of your current document</Description>
     <MoreInfo>https://github.com/sboulema/CodeNav</MoreInfo>

appveyor.yml

@@ -1,4 +1,4 @@
-version: 1.1.{build}
+version: 1.2.{build}
 configuration: Release
 install:
 - ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/madskristensen/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex