Merge branch 'release/2.9.40'

SlavaRa · Mar 15, 2017 · afa5fa8 · afa5fa8
2 parents 331b893 + 31d3aa1
commit afa5fa8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/QuickNavigate/Forms/Nodes.cs b/QuickNavigate/Forms/Nodes.cs
@@ -58,20 +58,25 @@ public ClassNode([NotNull] ClassModel model, int imageIndex, int selectedImageIn
         {
             Model = model;
             Name = model.Name;
-            InFile = model.InFile;
-            Package = InFile != null ? InFile.Package : string.Empty;
+            InFile = model.InFile ?? FileModel.Ignore;
+            Package = InFile.Package;
             IsPrivate = (model.Access & Visibility.Private) > 0;
             Text = Name;
             Tag = "class";
             In = Package;
-            if (!string.IsNullOrEmpty(Package))
+            if (IsPrivate)
             {
-                if (IsPrivate) In = $"{Package}.{Path.GetFileNameWithoutExtension(InFile.FileName)}";
+                In = Path.GetFileNameWithoutExtension(InFile.FileName);
+                if (!string.IsNullOrEmpty(Package)) In = $"{Package}.{In}";
+            }
+            if (InFile.Context.Features.hasModules)
+            {
+                var module = InFile.Module;
+                if (!string.IsNullOrEmpty(module) && module != Name) In = !string.IsNullOrEmpty(In)? $"{In}.{module}" : module;
             }
-            else if (IsPrivate) In = Path.GetFileNameWithoutExtension(InFile.FileName);
             ImageIndex = imageIndex;
             SelectedImageIndex = selectedImageIndex;
-            if (InFile == null) return;
+            if (InFile == FileModel.Ignore) return;
             var match = Regex.Match(InFile.FileName, @"\S*.swc", RegexOptions.Compiled);
             if (match.Success) Module = Path.GetFileName(match.Value);
         }

diff --git a/QuickNavigate/Forms/TypeExplorerForm.cs b/QuickNavigate/Forms/TypeExplorerForm.cs
@@ -168,8 +168,8 @@ void RefreshTree()
 
         void FillNodes(TreeNodeCollection nodes)
         {
-            var openedTypes = FilterTypes(this.openedTypes.ToList());
-            if (openedTypes.Count > 0) nodes.AddRange(CreateNodes(openedTypes, string.Empty).ToArray());
+            var types = FilterTypes(openedTypes.ToList());
+            if (types.Count > 0) nodes.AddRange(CreateNodes(types, string.Empty).ToArray());
         }
 
         void FillNodes(TreeNodeCollection nodes, string search)

diff --git a/QuickNavigate/QuickNavigate.csproj b/QuickNavigate/QuickNavigate.csproj
@@ -69,8 +69,8 @@
   </Target>
   -->
   <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=10.0.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.0.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=10.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\packages\JetBrains.Annotations.10.2.1\lib\net\JetBrains.Annotations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -79,7 +79,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ControlClickManager.cs" />
-    <Compile Include="Forms\ClassHierarchyForm.cs" />
+    <Compile Include="Forms\ClassHierarchyForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\ClassHierarchyForm.Designer.cs">
       <DependentUpon>ClassHierarchyForm.cs</DependentUpon>
     </Compile>
@@ -103,7 +105,9 @@
     <Compile Include="Forms\TypeExplorerForm.Designer.cs">
       <DependentUpon>TypeExplorerForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Helpers\FormHelper.cs" />
+    <Compile Include="Helpers\FormHelper.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PluginMain.cs" />
     <Compile Include="Forms\QuickOutlineForm.cs">

diff --git a/QuickNavigate/packages.config b/QuickNavigate/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="JetBrains.Annotations" version="10.0.0" targetFramework="net35" />
+  <package id="JetBrains.Annotations" version="10.2.1" targetFramework="net35" />
 </packages>