fixes a bug with linqpad script generation and adds support private types

codingadventures · codingadventures · commit 31e05665b2ca · 2018-11-25T20:00:05.000Z
diff --git a/Src/BridgeVs.DynamicVisualizers/DynamicDebuggerVisualizer.cs b/Src/BridgeVs.DynamicVisualizers/DynamicDebuggerVisualizer.cs
@@ -55,7 +55,7 @@ public class DynamicDebuggerVisualizer : DialogDebuggerVisualizer
         /// </summary>
         /// <param name="message">The message.</param>
         /// <param name="vsVersion">The visual studio version</param>
-        internal void DeployLinqScript(Message message, string vsVersion)
+        internal string DeployLinqScript(Message message, string vsVersion)
         {
             try
             {
@@ -79,6 +79,8 @@ internal void DeployLinqScript(Message message, string vsVersion)
                 FS.FileSystem.File.WriteAllText(fileName, linqQueryText);
                 
                 Log.Write("LinqQuery Successfully deployed");
+
+                return fileName;
             }
             catch (Exception e)
             {
@@ -143,9 +145,8 @@ protected override void Show(IDialogVisualizerService windowService, IVisualizer
             {
                 Message message = GetMessage(objectProvider);
 
-                DeployLinqScript(message, vsVersion);
+                string linqQueryFileName = DeployLinqScript(message, vsVersion);
 
-                string linqQueryFileName = Path.Combine(CommonFolderPaths.DefaultLinqPadQueryFolder, message.AssemblyName, message.FileName);
                 string linqPadInstallationPath = CommonRegistryConfigurations.GetLINQPadInstallationPath(vsVersion);
 
                 OpenLinqPad(linqQueryFileName, linqPadInstallationPath);
diff --git a/Src/BridgeVs.DynamicVisualizers/Template/Inspection.Template.cs b/Src/BridgeVs.DynamicVisualizers/Template/Inspection.Template.cs
@@ -46,7 +46,8 @@ internal Inspection(Message message)
             _typeName = message.TypeName;
             _assemblies = message.ReferencedAssemblies;
             _typeToRetrieveFullName = TypeNameHelper.RemoveSystemNamespaces(message.TypeFullName);
-            _typeName = _typeToRetrieveFullName.Contains("AnonymousType") ? "object" : _typeToRetrieveFullName;
+            //if the type is anonymous or it's a nested class then use the generic object
+            _typeName = _typeToRetrieveFullName.Contains("AnonymousType") || _typeToRetrieveFullName.Contains("+") ? "object" : _typeToRetrieveFullName;
             _serializationType = message.SerializationOption;
         }
     }
diff --git a/Src/BridgeVs.sln b/Src/BridgeVs.sln
@@ -142,7 +142,7 @@ Global
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Debug-net45|Any CPU.Build.0 = Debug|Any CPU
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Debug-netstandard2.0|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Debug-netstandard2.0|Any CPU.Build.0 = Debug|Any CPU
-		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Deploy|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Deploy|Any CPU.ActiveCfg = Test|Any CPU
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{BF2D610C-BD8F-4C1C-A23D-6B213E6699F3}.Release-net35|Any CPU.ActiveCfg = Debug|Any CPU

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public class DynamicDebuggerVisualizer : DialogDebuggerVisualizer`
`55`	`55`	`/// </summary>`
`56`	`56`	`/// <param name="message">The message.</param>`
`57`	`57`	`/// <param name="vsVersion">The visual studio version</param>`
`58`		`- internal void DeployLinqScript(Message message, string vsVersion)`
	`58`	`+ internal string DeployLinqScript(Message message, string vsVersion)`
`59`	`59`	`{`
`60`	`60`	`try`
`61`	`61`	`{`
`@@ -79,6 +79,8 @@ internal void DeployLinqScript(Message message, string vsVersion)`
`79`	`79`	`FS.FileSystem.File.WriteAllText(fileName, linqQueryText);`
`80`	`80`
`81`	`81`	`Log.Write("LinqQuery Successfully deployed");`
	`82`	`+`
	`83`	`+ return fileName;`
`82`	`84`	`}`
`83`	`85`	`catch (Exception e)`
`84`	`86`	`{`
`@@ -143,9 +145,8 @@ protected override void Show(IDialogVisualizerService windowService, IVisualizer`
`143`	`145`	`{`
`144`	`146`	`Message message = GetMessage(objectProvider);`
`145`	`147`
`146`		`- DeployLinqScript(message, vsVersion);`
	`148`	`+ string linqQueryFileName = DeployLinqScript(message, vsVersion);`
`147`	`149`
`148`		`- string linqQueryFileName = Path.Combine(CommonFolderPaths.DefaultLinqPadQueryFolder, message.AssemblyName, message.FileName);`
`149`	`150`	`string linqPadInstallationPath = CommonRegistryConfigurations.GetLINQPadInstallationPath(vsVersion);`
`150`	`151`
`151`	`152`	`OpenLinqPad(linqQueryFileName, linqPadInstallationPath);`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ internal Inspection(Message message)`
`46`	`46`	`_typeName = message.TypeName;`
`47`	`47`	`_assemblies = message.ReferencedAssemblies;`
`48`	`48`	`_typeToRetrieveFullName = TypeNameHelper.RemoveSystemNamespaces(message.TypeFullName);`
`49`		`- _typeName = _typeToRetrieveFullName.Contains("AnonymousType") ? "object" : _typeToRetrieveFullName;`
	`49`	`+ //if the type is anonymous or it's a nested class then use the generic object`
	`50`	`+ _typeName = _typeToRetrieveFullName.Contains("AnonymousType") \|\| _typeToRetrieveFullName.Contains("+") ? "object" : _typeToRetrieveFullName;`
`50`	`51`	`_serializationType = message.SerializationOption;`
`51`	`52`	`}`
`52`	`53`	`}`