Merge branch 'release/2.9.42'

SlavaRa · Mar 15, 2017 · 358c2ab · 358c2ab
2 parents afa5fa8 + b253a74
commit 358c2ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/QuickNavigate/Forms/Nodes.cs b/QuickNavigate/Forms/Nodes.cs
@@ -6,6 +6,7 @@
 using ASCompletion;
 using ASCompletion.Model;
 using JetBrains.Annotations;
+using PluginCore.Managers;
 
 namespace QuickNavigate.Forms
 {
@@ -69,10 +70,10 @@ public ClassNode([NotNull] ClassModel model, int imageIndex, int selectedImageIn
  In = Path.GetFileNameWithoutExtension(InFile.FileName);
  if (!string.IsNullOrEmpty(Package)) In = $"{Package}.{In}";
  }
- if (InFile.Context.Features.hasModules)
+ else if (InFile.Context.Features.hasModules)
  {
  var module = InFile.Module;
- if (!string.IsNullOrEmpty(module) && module != Name) In = !string.IsNullOrEmpty(In)? $"{In}.{module}" : module;
+ if (!string.IsNullOrEmpty(module) && module != Name) In = !string.IsNullOrEmpty(In) ? $"{In}.{module}" : module;
  }
  ImageIndex = imageIndex;
  SelectedImageIndex = selectedImageIndex;

diff --git a/QuickNavigate/PluginMain.cs b/QuickNavigate/PluginMain.cs
@@ -344,7 +344,7 @@ static void ShowInProjectManager([NotNull] Form sender, [NotNull] MemberModel mo
  ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>
  {
  var ui = FormHelper.GetProjectManagerPluginUI();
- Debug.Assert(ui != null, "ProjectManager.PluginMain.pluginUI != null");
+ Debug.Assert(ui != null, "ProjectManager.PluginMain.pluginUI is null");
  ui.Parent.Show();
  ui.Tree.Select(model.InFile.FileName);
  }));
@@ -356,7 +356,7 @@ static void ShowInFileExplorer([NotNull] Form sender, [NotNull] MemberModel mode
  ((Control) PluginBase.MainForm).BeginInvoke((MethodInvoker) (() =>
  {
  var ui = FormHelper.GetFileExplorerPluginUI();
- Debug.Assert(ui != null, "FileExplorer.PluginMain.pluginUI != null");
+ Debug.Assert(ui != null, "FileExplorer.PluginMain.pluginUI is null");
  ui.BrowseTo(Path.GetDirectoryName(model.InFile.FileName));
  ui.Parent.Show();
  }));
@@ -420,7 +420,7 @@ static void SetDocumentClass([NotNull] MemberModel model)
  project.SetDocumentClass(model.InFile.FileName, true);
  project.Save();
  var ui = FormHelper.GetProjectManagerPluginUI();
- Debug.Assert(ui != null, "ProjectManager.PluginMain.pluginUI != null");
+ Debug.Assert(ui != null, "ProjectManager.PluginMain.pluginUI is null");
  ui.Tree.RefreshTree();
  }
 
@@ -429,42 +429,42 @@ static void SetDocumentClass([NotNull] MemberModel model)
  void OnSetDocumentClassMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  SetDocumentClass(node.Model);
  }
 
  void OnGotoPositionOrLineMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  GotoPositionOrLine(openedForm, node.Model);
  }
 
  void OnShowInQuickOutlineMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  ShowQuickOutline(openedForm, node.Model);
  }
 
  void OnShowInClassHierarchyMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  ShowClassHierarchy(openedForm, node.Model);
  }
 
  void OnShowInProjectManagerMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  ShowInProjectManager(openedForm, node.Model);
  }
 
  void OnShowInFileExplorerMenuClick(object sender, EventArgs e)
  {
  var node = (ClassNode) openedForm.SelectedNode;
- Debug.Assert(node != null, "node != null");
+ Debug.Assert(node != null, "node is null");
  ShowInFileExplorer(openedForm, node.Model);
  }