Load user types based also on the XML file modification time.

Author: awulkiew

Visual_Studio_2015/GraphicalDebugging/ExpressionLoader.cs

@@ -2688,11 +2688,27 @@ public override MemoryReader.Converter<double> GetMemoryConverter(MemoryReader m
             int sizeOf;
         }
 
-        private static void ReloadUserTypes(string userTypesPath, Loaders loaders)
+        private static bool ReloadUserTypes(Loaders loaders,
+                                            string userTypesPath,
+                                            bool isChanged,
+                                            DateTime lastWriteTime,
+                                            out DateTime newWriteTime)
         {
-            loaders.RemoveUserDefined();
+            newWriteTime = new DateTime(0);
 
-            if (System.IO.File.Exists(userTypesPath))
+            bool fileExists = System.IO.File.Exists(userTypesPath);
+            bool newerFile = false;
+            if (fileExists)
+            {
+                newWriteTime = (new System.IO.FileInfo(userTypesPath)).LastWriteTime;
+                newerFile = newWriteTime > lastWriteTime;
+            }
+            bool update = isChanged || newerFile;
+
+            if (update)
+                loaders.RemoveUserDefined();
+
+            if (update && fileExists)
             {
                 System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
                 doc.Load(userTypesPath);
@@ -2717,23 +2733,35 @@ private static void ReloadUserTypes(string userTypesPath, Loaders loaders)
                     }
                 }
             }
+
+            return update;
         }
 
         public static void ReloadUserTypes(GeneralOptionPage options)
         {
             if (options == null)
                 return;
 
-            if (options.isUserTypesPathCppChanged)
+            DateTime wtCpp;
+            if (ReloadUserTypes(Instance.loadersCpp,
+                                options.UserTypesPathCpp,
+                                options.isUserTypesPathCppChanged,
+                                options.userTypesCppWriteTime,
+                                out wtCpp))
             {
-                ReloadUserTypes(options.UserTypesPathCpp, Instance.loadersCpp);
                 options.isUserTypesPathCppChanged = false;
+                options.userTypesCppWriteTime = wtCpp;
             }
 
-            if (options.isUserTypesPathCSChanged)
+            DateTime wtCS;
+            if (ReloadUserTypes(Instance.loadersCS,
+                                options.UserTypesPathCS,
+                                options.isUserTypesPathCSChanged,
+                                options.userTypesCSWriteTime,
+                                out wtCS))
             {
-                ReloadUserTypes(options.UserTypesPathCS, Instance.loadersCS);
                 options.isUserTypesPathCSChanged = false;
+                options.userTypesCSWriteTime = wtCS;
             }
         }
 

Visual_Studio_2015/GraphicalDebugging/GeneralOptionPage.cs

@@ -17,6 +17,8 @@ public class GeneralOptionPage : DialogPage
 
         public bool isUserTypesPathCppChanged = false;
         public bool isUserTypesPathCSChanged = false;
+        public System.DateTime userTypesCppWriteTime = new System.DateTime(0);
+        public System.DateTime userTypesCSWriteTime = new System.DateTime(0);
 
         [Category("Data Access")]
         [DisplayName("Enable Direct Memory Access")]