Merge pull request #135 from SlavaRa/develop

SlavaRa · SlavaRa · commit 15753b394d1e · 2016-04-10T22:28:38.000+03:00
Closes #124
diff --git a/QuickNavigate.Tests/Properties/AssemblyInfo.cs b/QuickNavigate.Tests/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SlavaRa")]
 [assembly: AssemblyProduct("QuickNavigate.Tests")]
-[assembly: AssemblyCopyright("FlashDevelop.org 2014-2015")]
+[assembly: AssemblyCopyright("FlashDevelop.org 2014-2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/QuickNavigate/Forms/OpenRecentFilesForm.cs b/QuickNavigate/Forms/OpenRecentFilesForm.cs
@@ -12,14 +12,11 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class OpenRecentFilesForm : Form
     {
-        [NotNull]
-        readonly Settings settings;
+        [NotNull] readonly Settings settings;
 
-        [NotNull]
-        readonly List<string> recentFiles;
+        [NotNull] readonly List<string> recentFiles;
 
-        [NotNull]
-        readonly List<string> openedFiles;
+        [NotNull] readonly List<string> openedFiles;
 
         public OpenRecentFilesForm([NotNull] Settings settings)
         {
diff --git a/QuickNavigate/Forms/OpenRecentProjectsForm.Designer.cs b/QuickNavigate/Forms/OpenRecentProjectsForm.Designer.cs
diff --git a/QuickNavigate/Forms/OpenRecentProjectsForm.cs b/QuickNavigate/Forms/OpenRecentProjectsForm.cs
@@ -15,21 +15,27 @@ public sealed partial class OpenRecentProjectsForm : Form
     {
         [NotNull] readonly Settings settings;
         [NotNull] [ItemNotNull] readonly List<string> recentProjects = ProjectManager.PluginMain.Settings.RecentProjects.Where(File.Exists).ToList();
-        
+
         public OpenRecentProjectsForm([NotNull] Settings settings)
         {
             this.settings = settings;
             Font = PluginBase.Settings.DefaultFont;
             InitializeComponent();
             if (settings.RecentProjectsSize.Width > MinimumSize.Width) Size = settings.RecentProjectsSize;
             InitializeTree();
+            InitializeContextMenu();
             InitializeTheme();
+            openInNewWindow.Visible = PluginBase.MainForm.MultiInstanceMode;
             RefrestTree();
         }
 
-        [CanBeNull]
-        public string SelectedItem => tree?.SelectedNode.Text;
+        [CanBeNull] ContextMenuStrip contextMenu;
 
+        public bool InNewWindow { get; private set; }
+
+        [CanBeNull]
+        public string SelectedItem => tree.SelectedNode?.Text;
+        
         void InitializeTree()
         {
             tree.ImageList = new ImageList
@@ -41,6 +47,15 @@ void InitializeTree()
             tree.ItemHeight = tree.ImageList.ImageSize.Height;
         }
 
+        void InitializeContextMenu()
+        {
+            if (!PluginBase.MainForm.MultiInstanceMode) return;
+            input.ContextMenu = new ContextMenu();
+            contextMenu = new ContextMenuStrip {Renderer = new DockPanelStripRenderer(false)};
+            contextMenu.Items.Add("Open in new Window").Click += (s, args) => NavigateInNewWindow();
+            contextMenu.Items[0].Select();
+        }
+
         void InitializeTheme()
         {
             input.BackColor = PluginBase.MainForm.GetThemeColor("TextBox.BackColor", SystemColors.Window);
@@ -49,6 +64,8 @@ void InitializeTheme()
             tree.ForeColor = PluginBase.MainForm.GetThemeColor("TreeView.ForeColor", SystemColors.WindowText);
             open.BackColor = PluginBase.MainForm.GetThemeColor("TreeView.BackColor", SystemColors.Window);
             open.ForeColor = PluginBase.MainForm.GetThemeColor("TreeView.ForeColor", SystemColors.WindowText);
+            openInNewWindow.BackColor = PluginBase.MainForm.GetThemeColor("TreeView.BackColor", SystemColors.Window);
+            openInNewWindow.ForeColor = PluginBase.MainForm.GetThemeColor("TreeView.ForeColor", SystemColors.WindowText);
             cancel.BackColor = PluginBase.MainForm.GetThemeColor("TreeView.BackColor", SystemColors.Window);
             cancel.ForeColor = PluginBase.MainForm.GetThemeColor("TreeView.ForeColor", SystemColors.WindowText);
             BackColor = PluginBase.MainForm.GetThemeColor("TreeView.BackColor", SystemColors.Window);
@@ -62,10 +79,16 @@ void RefrestTree()
             tree.Nodes.Clear();
             FillTree();
             if (tree.Nodes.Count > 0) tree.SelectedNode = tree.Nodes[0];
-            else open.Enabled = false;
+            else RefreshButtons();
             tree.EndUpdate();
         }
 
+        void RefreshButtons()
+        {
+            open.Enabled = false;
+            openInNewWindow.Enabled = false;
+        }
+
         void FillTree()
         {
             var search = input.Text;
@@ -83,6 +106,21 @@ void Navigate()
             DialogResult = DialogResult.OK;
         }
 
+        void NavigateInNewWindow()
+        {
+            InNewWindow = SelectedItem != null;
+            Navigate();
+        }
+
+        void ShowContextMenu()
+        {
+            var selectedNode = tree.SelectedNode;
+            if (selectedNode == null) return;
+            ShowContextMenu(new Point(selectedNode.Bounds.X, selectedNode.Bounds.Bottom));
+        }
+
+        void ShowContextMenu([NotNull] Point position) => contextMenu?.Show(tree, position);
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch (e.KeyCode)
@@ -98,6 +136,10 @@ protected override void OnKeyDown(KeyEventArgs e)
                         input.SelectAll();
                     }
                     break;
+                case Keys.Apps:
+                    e.Handled = true;
+                    ShowContextMenu();
+                    break;
             }
         }
 
@@ -165,5 +207,7 @@ void OnTreeDrawNode(object sender, DrawTreeNodeEventArgs e)
             x += graphics.MeasureString(text, font).Width;
             graphics.DrawString($"({path})", font, moduleBrush, x, bounds.Top, StringFormat.GenericDefault);
         }
+
+        void OnOpenInNewWindowClick(object sender, EventArgs e) => NavigateInNewWindow();
     }
 }
diff --git a/QuickNavigate/Forms/QuickOutlineForm.Designer.cs b/QuickNavigate/Forms/QuickOutlineForm.Designer.cs
diff --git a/QuickNavigate/Forms/QuickOutlineForm.cs b/QuickNavigate/Forms/QuickOutlineForm.cs
@@ -14,15 +14,14 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class QuickOutlineForm : Form
     {
-        [NotNull]
-        readonly Settings settings;
-        readonly ContextMenuStrip contextMenu = new ContextMenuStrip();
+        [NotNull] readonly Settings settings;
+        readonly ContextMenuStrip contextMenu = new ContextMenuStrip { Renderer = new DockPanelStripRenderer(false) };
         readonly ContextMenu inputEmptyContextMenu = new ContextMenu();
         readonly List<Button> filters = new List<Button>();
         readonly Dictionary<Keys, Button> keysToFilter = new Dictionary<Keys, Button>();
         readonly Dictionary<Button, string> filterToEnabledTip = new Dictionary<Button, string>();
         readonly Dictionary<Button, string> filterToDisabledTip = new Dictionary<Button, string>();
-        readonly Dictionary<FlagType, Button> flagToFilter = new Dictionary<FlagType, Button>(); 
+        readonly Dictionary<FlagType, Button> flagToFilter = new Dictionary<FlagType, Button>();
 
         /// <summary>
         /// Initializes a new instance of the QuickNavigate.Controls.QuickOutlineForm
@@ -44,11 +43,9 @@ public QuickOutlineForm([NotNull] FileModel inFile, [CanBeNull] ClassModel inCla
             RefreshTree();
         }
 
-        [CanBeNull]
-        public event ShowInHandler ShowInClassHierarchy;
+        [CanBeNull] public event ShowInHandler ShowInClassHierarchy;
 
-        [CanBeNull]
-        ToolTip filterToolTip;
+        [CanBeNull] ToolTip filterToolTip;
 
         [NotNull]
         public FileModel InFile { get; }
@@ -242,7 +239,7 @@ void RefreshFilterTip(Button filter)
         protected override void OnKeyDown(KeyEventArgs e)
         {
             var keyCode = e.KeyCode;
-            if (keysToFilter.ContainsKey(keyCode) && e.Alt)
+            if (e.Alt && keysToFilter.ContainsKey(keyCode))
             {
                 CurrentFilter = keysToFilter[keyCode];
                 return;
diff --git a/QuickNavigate/PluginMain.cs b/QuickNavigate/PluginMain.cs
@@ -7,6 +7,7 @@
 using ASCompletion.Completion;
 using ASCompletion.Context;
 using ASCompletion.Model;
+using JetBrains.Annotations;
 using PluginCore;
 using PluginCore.Helpers;
 using PluginCore.Managers;
@@ -30,6 +31,7 @@ public class ShortcutId
 
     public class PluginMain : IPlugin
 	{
+        const string ProjectManagerGUID = "30018864-fadd-1122-b2a5-779832cbbf23";
         string settingFilename;
 	    ControlClickManager controlClickManager;
 	    ToolStripMenuItem typeExplorerItem;
@@ -208,10 +210,10 @@ void UpdateMenuItems()
 
         void ShowRecentFiles()
         {
-            var form = new OpenRecentFilesForm((Settings)Settings);
+            var form = new OpenRecentFilesForm((Settings) Settings);
             form.KeyUp += FormOnKeyUp;
             if (form.ShowDialog() != DialogResult.OK) return;
-            var plugin = (ProjectManager.PluginMain)PluginBase.MainForm.FindPlugin("30018864-fadd-1122-b2a5-779832cbbf23");
+            var plugin = (ProjectManager.PluginMain)PluginBase.MainForm.FindPlugin(ProjectManagerGUID);
             form.SelectedItems.ForEach(plugin.OpenFile);
         }
 
@@ -222,8 +224,9 @@ void ShowRecentProjets()
             var form = new OpenRecentProjectsForm((Settings) Settings);
             form.KeyUp += FormOnKeyUp;
             if (form.ShowDialog() != DialogResult.OK) return;
-            var plugin = (ProjectManager.PluginMain) PluginBase.MainForm.FindPlugin("30018864-fadd-1122-b2a5-779832cbbf23");
-            plugin.OpenFile(form.SelectedItem);
+            var plugin = (ProjectManager.PluginMain) PluginBase.MainForm.FindPlugin(ProjectManagerGUID);
+            if (form.InNewWindow) ProcessHelper.StartAsync(Application.ExecutablePath, form.SelectedItem);
+            else plugin.OpenFile(form.SelectedItem);
         }
 
         void ShowTypeExplorer(object sender, EventArgs e) => ShowTypeExplorer();
@@ -276,13 +279,13 @@ void ShowTypeExplorer()
 
         void ShowQuickOutline() => ShowQuickOutline(ASContext.Context.CurrentModel, ASContext.Context.CurrentClass);
 
-        void ShowQuickOutline(Form sender, ClassModel inClass)
+        void ShowQuickOutline([NotNull] Form sender, [NotNull] ClassModel inClass)
         {
             sender.Close();
             ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() => ShowQuickOutline(inClass.InFile, inClass)));
         }
 
-        void ShowQuickOutline(FileModel inFile, ClassModel inClass)
+        void ShowQuickOutline([NotNull] FileModel inFile, [NotNull] ClassModel inClass)
         {
             var form = new QuickOutlineForm(inFile, inClass, (Settings) Settings);
             form.ShowInClassHierarchy += ShowClassHierarchy;
@@ -313,13 +316,13 @@ void ShowClassHierarchy()
             ShowClassHierarchy(!curClass.IsVoid() ? curClass : context.CurrentModel.GetPublicClass());
         }
 
-        void ShowClassHierarchy(Form sender, ClassModel model)
+        void ShowClassHierarchy([NotNull] Form sender, [NotNull] ClassModel model)
         {
             sender.Close();
             ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() => ShowClassHierarchy(model)));
         }
 
-        void ShowClassHierarchy(ClassModel model)
+        void ShowClassHierarchy([NotNull] ClassModel model)
         {
             var form = new ClassHierarchyForm(model, (Settings) Settings);
             form.GotoPositionOrLine += OnGotoPositionOrLine;
@@ -344,27 +347,27 @@ static bool GetCanShowClassHierarchy()
                 && (!context.CurrentClass.IsVoid() || !context.CurrentModel.GetPublicClass().IsVoid());
         }
 
-        static void OnGotoPositionOrLine(Form sender, ClassModel model)
+        static void OnGotoPositionOrLine([NotNull] Form sender, [NotNull] ClassModel model)
         {
             sender.Close();
-            ((Control)PluginBase.MainForm).BeginInvoke((MethodInvoker)delegate
+            ((Control)PluginBase.MainForm).BeginInvoke((MethodInvoker)(() =>
             {
                 ModelsExplorer.Instance.OpenFile(model.InFile.FileName);
                 PluginBase.MainForm.CallCommand("GoTo", null);
-            });
+            }));
         }
 
-        static void ShowInProjectManager(Form sender, ClassModel model)
+        static void ShowInProjectManager([NotNull] Form sender, [NotNull] ClassModel model)
         {
             sender.Close();
-            ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) delegate
+            ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>
             {
                 foreach (var pane in PluginBase.MainForm.DockPanel.Panes)
                 {
                     foreach (var dockContent in pane.Contents)
                     {
                         var content = (DockContent) dockContent;
-                        if (content.GetPersistString() != "30018864-fadd-1122-b2a5-779832cbbf23") continue;
+                        if (content.GetPersistString() != ProjectManagerGUID) continue;
                         foreach (var ui in content.Controls.OfType<ProjectManager.PluginUI>())
                         {
                             content.Show();
@@ -373,13 +376,13 @@ static void ShowInProjectManager(Form sender, ClassModel model)
                         }
                     }
                 }
-            });
+            }));
         }
 
-        static void ShowInFileExplorer(Form sender, ClassModel model)
+        static void ShowInFileExplorer([NotNull] Form sender, [NotNull] ClassModel model)
         {
             sender.Close();
-            ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) delegate
+            ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>
             {
                 foreach (var pane in PluginBase.MainForm.DockPanel.Panes)
                 {
@@ -395,7 +398,7 @@ static void ShowInFileExplorer(Form sender, ClassModel model)
                         }
                     }
                 }
-            });
+            }));
         }
 
         #endregion
diff --git a/QuickNavigate/QuickNavigate.csproj b/QuickNavigate/QuickNavigate.csproj
@@ -42,7 +42,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <OutputPath>..\..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/appveyor.yml b/appveyor.yml

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,11 @@ namespace QuickNavigate.Forms`
`12`	`12`	`{`
`13`	`13`	`public sealed partial class OpenRecentFilesForm : Form`
`14`	`14`	`{`
`15`		`- [NotNull]`
`16`		`- readonly Settings settings;`
	`15`	`+ [NotNull] readonly Settings settings;`
`17`	`16`
`18`		`- [NotNull]`
`19`		`- readonly List<string> recentFiles;`
	`17`	`+ [NotNull] readonly List<string> recentFiles;`
`20`	`18`
`21`		`- [NotNull]`
`22`		`- readonly List<string> openedFiles;`
	`19`	`+ [NotNull] readonly List<string> openedFiles;`
`23`	`20`
`24`	`21`	`public OpenRecentFilesForm([NotNull] Settings settings)`
`25`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using ASCompletion.Completion;`
`8`	`8`	`using ASCompletion.Context;`
`9`	`9`	`using ASCompletion.Model;`
	`10`	`+using JetBrains.Annotations;`
`10`	`11`	`using PluginCore;`
`11`	`12`	`using PluginCore.Helpers;`
`12`	`13`	`using PluginCore.Managers;`
`@@ -30,6 +31,7 @@ public class ShortcutId`
`30`	`31`
`31`	`32`	`public class PluginMain : IPlugin`
`32`	`33`	`{`
	`34`	`+ const string ProjectManagerGUID = "30018864-fadd-1122-b2a5-779832cbbf23";`
`33`	`35`	`string settingFilename;`
`34`	`36`	`ControlClickManager controlClickManager;`
`35`	`37`	`ToolStripMenuItem typeExplorerItem;`
`@@ -208,10 +210,10 @@ void UpdateMenuItems()`
`208`	`210`
`209`	`211`	`void ShowRecentFiles()`
`210`	`212`	`{`
`211`		`- var form = new OpenRecentFilesForm((Settings)Settings);`
	`213`	`+ var form = new OpenRecentFilesForm((Settings) Settings);`
`212`	`214`	`form.KeyUp += FormOnKeyUp;`
`213`	`215`	`if (form.ShowDialog() != DialogResult.OK) return;`
`214`		`- var plugin = (ProjectManager.PluginMain)PluginBase.MainForm.FindPlugin("30018864-fadd-1122-b2a5-779832cbbf23");`
	`216`	`+ var plugin = (ProjectManager.PluginMain)PluginBase.MainForm.FindPlugin(ProjectManagerGUID);`
`215`	`217`	`form.SelectedItems.ForEach(plugin.OpenFile);`
`216`	`218`	`}`
`217`	`219`
`@@ -222,8 +224,9 @@ void ShowRecentProjets()`
`222`	`224`	`var form = new OpenRecentProjectsForm((Settings) Settings);`
`223`	`225`	`form.KeyUp += FormOnKeyUp;`
`224`	`226`	`if (form.ShowDialog() != DialogResult.OK) return;`
`225`		`- var plugin = (ProjectManager.PluginMain) PluginBase.MainForm.FindPlugin("30018864-fadd-1122-b2a5-779832cbbf23");`
`226`		`- plugin.OpenFile(form.SelectedItem);`
	`227`	`+ var plugin = (ProjectManager.PluginMain) PluginBase.MainForm.FindPlugin(ProjectManagerGUID);`
	`228`	`+ if (form.InNewWindow) ProcessHelper.StartAsync(Application.ExecutablePath, form.SelectedItem);`
	`229`	`+ else plugin.OpenFile(form.SelectedItem);`
`227`	`230`	`}`
`228`	`231`
`229`	`232`	`void ShowTypeExplorer(object sender, EventArgs e) => ShowTypeExplorer();`
`@@ -276,13 +279,13 @@ void ShowTypeExplorer()`
`276`	`279`
`277`	`280`	`void ShowQuickOutline() => ShowQuickOutline(ASContext.Context.CurrentModel, ASContext.Context.CurrentClass);`
`278`	`281`
`279`		`- void ShowQuickOutline(Form sender, ClassModel inClass)`
	`282`	`+ void ShowQuickOutline([NotNull] Form sender, [NotNull] ClassModel inClass)`
`280`	`283`	`{`
`281`	`284`	`sender.Close();`
`282`	`285`	`((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() => ShowQuickOutline(inClass.InFile, inClass)));`
`283`	`286`	`}`
`284`	`287`
`285`		`- void ShowQuickOutline(FileModel inFile, ClassModel inClass)`
	`288`	`+ void ShowQuickOutline([NotNull] FileModel inFile, [NotNull] ClassModel inClass)`
`286`	`289`	`{`
`287`	`290`	`var form = new QuickOutlineForm(inFile, inClass, (Settings) Settings);`
`288`	`291`	`form.ShowInClassHierarchy += ShowClassHierarchy;`
`@@ -313,13 +316,13 @@ void ShowClassHierarchy()`
`313`	`316`	`ShowClassHierarchy(!curClass.IsVoid() ? curClass : context.CurrentModel.GetPublicClass());`
`314`	`317`	`}`
`315`	`318`
`316`		`- void ShowClassHierarchy(Form sender, ClassModel model)`
	`319`	`+ void ShowClassHierarchy([NotNull] Form sender, [NotNull] ClassModel model)`
`317`	`320`	`{`
`318`	`321`	`sender.Close();`
`319`	`322`	`((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() => ShowClassHierarchy(model)));`
`320`	`323`	`}`
`321`	`324`
`322`		`- void ShowClassHierarchy(ClassModel model)`
	`325`	`+ void ShowClassHierarchy([NotNull] ClassModel model)`
`323`	`326`	`{`
`324`	`327`	`var form = new ClassHierarchyForm(model, (Settings) Settings);`
`325`	`328`	`form.GotoPositionOrLine += OnGotoPositionOrLine;`
`@@ -344,27 +347,27 @@ static bool GetCanShowClassHierarchy()`
`344`	`347`	`&& (!context.CurrentClass.IsVoid() \|\| !context.CurrentModel.GetPublicClass().IsVoid());`
`345`	`348`	`}`
`346`	`349`
`347`		`- static void OnGotoPositionOrLine(Form sender, ClassModel model)`
	`350`	`+ static void OnGotoPositionOrLine([NotNull] Form sender, [NotNull] ClassModel model)`
`348`	`351`	`{`
`349`	`352`	`sender.Close();`
`350`		`- ((Control)PluginBase.MainForm).BeginInvoke((MethodInvoker)delegate`
	`353`	`+ ((Control)PluginBase.MainForm).BeginInvoke((MethodInvoker)(() =>`
`351`	`354`	`{`
`352`	`355`	`ModelsExplorer.Instance.OpenFile(model.InFile.FileName);`
`353`	`356`	`PluginBase.MainForm.CallCommand("GoTo", null);`
`354`		`- });`
	`357`	`+ }));`
`355`	`358`	`}`
`356`	`359`
`357`		`- static void ShowInProjectManager(Form sender, ClassModel model)`
	`360`	`+ static void ShowInProjectManager([NotNull] Form sender, [NotNull] ClassModel model)`
`358`	`361`	`{`
`359`	`362`	`sender.Close();`
`360`		`- ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) delegate`
	`363`	`+ ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>`
`361`	`364`	`{`
`362`	`365`	`foreach (var pane in PluginBase.MainForm.DockPanel.Panes)`
`363`	`366`	`{`
`364`	`367`	`foreach (var dockContent in pane.Contents)`
`365`	`368`	`{`
`366`	`369`	`var content = (DockContent) dockContent;`
`367`		`- if (content.GetPersistString() != "30018864-fadd-1122-b2a5-779832cbbf23") continue;`
	`370`	`+ if (content.GetPersistString() != ProjectManagerGUID) continue;`
`368`	`371`	`foreach (var ui in content.Controls.OfType<ProjectManager.PluginUI>())`
`369`	`372`	`{`
`370`	`373`	`content.Show();`
`@@ -373,13 +376,13 @@ static void ShowInProjectManager(Form sender, ClassModel model)`
`373`	`376`	`}`
`374`	`377`	`}`
`375`	`378`	`}`
`376`		`- });`
	`379`	`+ }));`
`377`	`380`	`}`
`378`	`381`
`379`		`- static void ShowInFileExplorer(Form sender, ClassModel model)`
	`382`	`+ static void ShowInFileExplorer([NotNull] Form sender, [NotNull] ClassModel model)`
`380`	`383`	`{`
`381`	`384`	`sender.Close();`
`382`		`- ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) delegate`
	`385`	`+ ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>`
`383`	`386`	`{`
`384`	`387`	`foreach (var pane in PluginBase.MainForm.DockPanel.Panes)`
`385`	`388`	`{`
`@@ -395,7 +398,7 @@ static void ShowInFileExplorer(Form sender, ClassModel model)`
`395`	`398`	`}`
`396`	`399`	`}`
`397`	`400`	`}`
`398`		`- });`
	`401`	`+ }));`
`399`	`402`	`}`
`400`	`403`
`401`	`404`	`#endregion`