Minor...

Author: SlavaRa

QuickNavigate/Forms/ClassHierarchyForm.cs

@@ -71,8 +71,7 @@ public ClassHierarchyForm([NotNull] ClassModel model, [NotNull] Settings setting
             RefreshTree();
         }
 
-        [CanBeNull]
-        public TypeNode SelectedNode => tree.SelectedNode as TypeNode;
+        public override TypeNode SelectedNode => tree.SelectedNode as TypeNode;
 
         void InitializeTree()
         {

QuickNavigate/Forms/ClassModelExplorerForm.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
 using ASCompletion.Model;
 using JetBrains.Annotations;
@@ -27,6 +26,8 @@ public ClassModelExplorerForm([NotNull] Settings settings)
             InitializeContextMenu();
         }
 
+        [CanBeNull] public virtual TypeNode SelectedNode => null;
+
         protected override void Dispose(bool disposing)
         {
             if (disposing)
@@ -67,41 +68,33 @@ protected virtual void ShowContextMenu(Point position)
         protected void OnGotoLineOrPosition(object sender, EventArgs e)
         {
             Debug.Assert(GotoPositionOrLine != null, "GotoPositionOrLine != null");
-            GotoPositionOrLine(this, GetModelFromSelectedNode());
+            GotoPositionOrLine(this, SelectedNode?.Model);
         }
 
         protected void OnShowInQuickOutline(object sender, EventArgs e)
         {
             Debug.Assert(ShowInQuickOutline != null, "ShowInQuickOutline != null");
-            ShowInQuickOutline(this, GetModelFromSelectedNode());
+            ShowInQuickOutline(this, SelectedNode?.Model);
         }
 
         protected void OnShowInClassHierarchy(object sender, EventArgs e)
         {
             Debug.Assert(ShowInClassHierarchy != null, "ShowInClassHierarchy != null");
-            ShowInClassHierarchy(this, GetModelFromSelectedNode());
+            ShowInClassHierarchy(this, SelectedNode?.Model);
         }
 
         protected void OnShowInProjectManager(object sender, EventArgs e)
         {
             Debug.Assert(ShowInProjectManager != null, "ShowInProjectManager != null");
-            ShowInProjectManager(this, GetModelFromSelectedNode());
+            ShowInProjectManager(this, SelectedNode?.Model);
         }
 
         protected void OnShowInFileExplorer(object sender, EventArgs e)
         {
             Debug.Assert(ShowInFileExplorer != null, "ShowInFileExplorer != null");
-            ShowInFileExplorer(this, GetModelFromSelectedNode());
+            ShowInFileExplorer(this, SelectedNode?.Model);
         }
 
-        TreeView GetTreeView()
-        {
-            var tree = ContextMenuStrip.SourceControl as TreeView;
-            return tree ?? ContextMenuStrip.SourceControl.Controls.OfType<TreeView>().FirstOrDefault();
-        }
-
-        ClassModel GetModelFromSelectedNode() => ((TypeNode) GetTreeView().SelectedNode).Model;
-
         #region Event Handlers
 
         protected virtual void OnTreeNodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)

QuickNavigate/Forms/TypeExplorerForm.cs

@@ -78,7 +78,7 @@ Button CurrentFilter
             }
         }
 
-        [CanBeNull] public TypeNode SelectedNode => tree.SelectedNode as TypeNode;
+        public override TypeNode SelectedNode => tree.SelectedNode as TypeNode;
 
         protected override void Dispose(bool disposing)
         {

QuickNavigate/PluginMain.cs

@@ -133,7 +133,7 @@ void InitBasics()
         {
             var dataPath = Path.Combine(PathHelper.DataDir, Name);
             if (!Directory.Exists(dataPath)) Directory.CreateDirectory(dataPath);
-            settingFilename = Path.Combine(dataPath, "Settings.fdb");
+            settingFilename = Path.Combine(dataPath, $"{nameof(Settings)}.fdb");
         }
 
         /// <summary>
@@ -143,7 +143,7 @@ void LoadSettings()
         {
             Settings = new Settings();
             if (!File.Exists(settingFilename)) SaveSettings();
-            else Settings = (Settings)ObjectSerializer.Deserialize(settingFilename, Settings);
+            else Settings = (Settings) ObjectSerializer.Deserialize(settingFilename, Settings);
         }
 
         /// <summary>
@@ -203,7 +203,7 @@ void ShowRecentFiles()
             var form = new OpenRecentFilesForm((Settings) Settings);
             form.KeyUp += OnFormKeyUp;
             if (form.ShowDialog() != DialogResult.OK) return;
-            var plugin = (ProjectManager.PluginMain)PluginBase.MainForm.FindPlugin(FormHelper.ProjectManagerGUID);
+            var plugin = (ProjectManager.PluginMain) PluginBase.MainForm.FindPlugin(FormHelper.ProjectManagerGUID);
             form.SelectedItems.ForEach(plugin.OpenFile);
         }
 
@@ -252,7 +252,7 @@ void ShowTypeExplorer()
                 disabledTip = "Show all(Alt+E or left click)";
                 form.AddFilter(PluginUI.ICON_TYPE, FlagType.Enum, Keys.E, enabledTip, disabledTip);
             }
-            // Abstracts
+            // TODO: Abstracts
             form.GotoPositionOrLine += GotoPositionOrLine;
             form.ShowInQuickOutline += ShowQuickOutline;
             form.ShowInClassHierarchy += ShowClassHierarchy;