Cleanup

sboulema · Sep 11, 2021 · 5d72c34 · 5d72c34
1 parent 76ee60d
commit 5d72c34
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 21 deletions.
diff --git a/CodeNav.Shared/Helpers/DocumentHelper.cs b/CodeNav.Shared/Helpers/DocumentHelper.cs
@@ -7,7 +7,6 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.Text.Outlining;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
@@ -63,21 +62,6 @@ public static async Task<int> GetNumberOfLines()
             return 0;
         }
 
-        public static async Task<int?> GetCurrentLineNumber()
-        {
-            try
-            {
-                var documentView = await VS.Documents.GetActiveDocumentViewAsync();
-                return documentView?.TextView?.Selection.ActivePoint.Position.GetContainingLine().LineNumber;
-            }
-            catch (Exception)
-            {
-                // Ignore
-            }
-
-            return null;
-        }
-
         public static async Task ScrollToLine(LinePosition linePosition)
         {
             try
@@ -221,7 +205,6 @@ public static async Task UpdateDocument(ICodeViewUserControl control,
             try
             {
                 // Sync all regions
-                var documentView = await VS.Documents.GetActiveDocumentViewAsync();
                 OutliningHelper.SyncAllRegions(codeDocumentViewModel.CodeDocument).FireAndForget();
 
                 // Should the margin be shown and are there any items to show, if not hide the margin

diff --git a/CodeNav.Shared/Helpers/HistoryHelper.cs b/CodeNav.Shared/Helpers/HistoryHelper.cs
@@ -21,7 +21,7 @@ public static void AddItemToHistory(CodeDocumentViewModel model, Span span)
 
         public static void AddItemToHistory(CodeItem item)
         {
-            if (item == null)
+            if (item?.Control?.CodeDocumentViewModel == null)
             {
                 return;
             }

diff --git a/CodeNav.Shared/Helpers/PlaceholderHelper.cs b/CodeNav.Shared/Helpers/PlaceholderHelper.cs
@@ -24,6 +24,7 @@ private static List<CodeItem> CreateItem(string name, ImageMoniker moniker)
                 new CodeNamespaceItem
                 {
                     Id = name,
+                    IsExpanded = true,
                     Members = new List<CodeItem>
                     {
                         new CodeClassItem
@@ -33,7 +34,8 @@ private static List<CodeItem> CreateItem(string name, ImageMoniker moniker)
                             Id = name,
                             ForegroundColor = Colors.Black,
                             BorderColor = Colors.DarkGray,
-                            Moniker = moniker
+                            Moniker = moniker,
+                            IsExpanded = true
                         }
                     }
                 }

diff --git a/CodeNav.Shared/ToolWindow/CodeNavToolWindow.cs b/CodeNav.Shared/ToolWindow/CodeNavToolWindow.cs
@@ -24,8 +24,7 @@ public override async Task<FrameworkElement> CreateAsync(int toolWindowId, Cance
 
             _control = new CodeViewUserControl();
 
-            _control.tag = "toolwindow";
-            //_control.CodeDocumentViewModel.CodeDocument = PlaceholderHelper.CreateSelectDocumentItem();
+            _control.CodeDocumentViewModel.CodeDocument = PlaceholderHelper.CreateSelectDocumentItem();
 
             return _control;
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             public static void AddItemToHistory(CodeItem item)
             {
-                if (item == null)
+                if (item?.Control?.CodeDocumentViewModel == null)
                 {
                     return;
                 }
@@ Expand Down @@