Merge branch 'development' into feature/ExtractLocalVariable_improvements

SlavaRa · SlavaRa · commit 414cf6101dbb · 2016-03-23T20:59:23.000+03:00
diff --git a/External/Plugins/CodeRefactor/PluginMain.cs b/External/Plugins/CodeRefactor/PluginMain.cs
@@ -379,33 +379,38 @@ private void UpdateMenuItems()
                 refactorContextMenu.MoveMenuItem.Enabled = false;
                 this.surroundContextMenu.Enabled = false;
                 this.refactorMainMenu.SurroundMenu.Enabled = false;
-                this.refactorContextMenu.ExtractMethodMenuItem.Enabled = false;
-                this.refactorContextMenu.ExtractLocalVariableMenuItem.Enabled = false;
                 this.refactorMainMenu.ExtractMethodMenuItem.Enabled = false;
+                this.refactorContextMenu.ExtractMethodMenuItem.Enabled = false;
                 this.refactorMainMenu.ExtractLocalVariableMenuItem.Enabled = false;
+                this.refactorContextMenu.ExtractLocalVariableMenuItem.Enabled = false;
                 ITabbedDocument document = PluginBase.MainForm.CurrentDocument;
                 if (document != null && document.IsEditable && langIsValid)
                 {
                     bool isValidFile = IsValidFile(document.FileName);
                     refactorMainMenu.MoveMenuItem.Enabled = isValidFile;
                     refactorContextMenu.MoveMenuItem.Enabled = isValidFile;
-                    if (document.SciControl.SelTextSize > 1)
+                    var sci = document.SciControl;
+                    if (sci.SelTextSize > 0)
                     {
-                        Int32 selEnd = document.SciControl.SelectionEnd;
-                        Int32 selStart = document.SciControl.SelectionStart;
-                        if (!document.SciControl.PositionIsOnComment(selEnd) || !document.SciControl.PositionIsOnComment(selStart))
+                        if (!sci.PositionIsOnComment(sci.SelectionStart) || !sci.PositionIsOnComment(sci.SelectionEnd))
                         {
                             this.surroundContextMenu.Enabled = true;
                             this.refactorMainMenu.SurroundMenu.Enabled = true;
-                            this.refactorContextMenu.ExtractMethodMenuItem.Enabled = true;
                             this.refactorMainMenu.ExtractMethodMenuItem.Enabled = true;
-                            this.refactorContextMenu.ExtractLocalVariableMenuItem.Enabled = true;
+                            this.refactorContextMenu.ExtractMethodMenuItem.Enabled = true;
+                        }
+                        var declAtSelStart = context.GetDeclarationAtLine(sci.LineFromPosition(sci.SelectionStart));
+                        var declAtSelEnd = context.GetDeclarationAtLine(sci.LineFromPosition(sci.SelectionEnd));
+                        if (declAtSelStart != null && declAtSelStart.Member != null && (declAtSelStart.Member.Flags & FlagType.Function) > 0
+                            && declAtSelEnd != null && declAtSelStart.Member.Equals(declAtSelEnd.Member))
+                        {
                             this.refactorMainMenu.ExtractLocalVariableMenuItem.Enabled = true;
+                            this.refactorContextMenu.ExtractLocalVariableMenuItem.Enabled = true;
                         }
                     }
                 }
-                this.refactorContextMenu.CodeGeneratorMenuItem.Enabled = isValid;
                 this.refactorMainMenu.CodeGeneratorMenuItem.Enabled = isValid;
+                this.refactorContextMenu.CodeGeneratorMenuItem.Enabled = isValid;
             }
             catch {}
         }
diff --git a/External/Plugins/DataEncoder/PluginMain.cs b/External/Plugins/DataEncoder/PluginMain.cs
@@ -192,7 +192,7 @@ public String LoadBinaryFile(String file)
                 Object settings = new Object();
                 MemoryStream stream = new MemoryStream();
                 settings = ObjectSerializer.Deserialize(file, settings, false);
-                XmlSerializer xs = new XmlSerializer(settings.GetType());
+                XmlSerializer xs = XmlSerializer.FromTypes(new[]{settings.GetType()})[0];
                 xs.Serialize(stream, settings); // Obj -> XML
                 XmlTextWriter xw = new XmlTextWriter(stream, Encoding.UTF8);
                 xw.Formatting = Formatting.Indented; stream.Close();
@@ -217,7 +217,7 @@ public void SaveBinaryFile(String file, String text)
                 Byte[] buffer = Encoding.UTF8.GetBytes(text);
                 MemoryStream stream = new MemoryStream(buffer);
                 TypeData typeData = this.GetFileObjectType(file);
-                XmlSerializer xs = new XmlSerializer(typeData.Type);
+                XmlSerializer xs = XmlSerializer.FromTypes(new[]{typeData.Type})[0];
                 settings = xs.Deserialize(stream); // XML -> Obj
                 ObjectSerializer.Serialize(file, settings);
                 stream.Close();
diff --git a/External/Plugins/FlashDebugger/Utilities.cs b/External/Plugins/FlashDebugger/Utilities.cs
@@ -9,15 +9,15 @@ public class SerializeXML<T>
         {
             public static void SaveFile(string filename, T obj)
             {
-                XmlSerializer serializer1 = new XmlSerializer(typeof(T));
+                XmlSerializer serializer1 = XmlSerializer.FromTypes(new[]{typeof(T)})[0];
                 FileStream fs1 = new FileStream(filename, FileMode.Create);
                 serializer1.Serialize(fs1, obj);
                 fs1.Close();
             }
 
             public static T LoadFile(string filename)
             {
-                XmlSerializer serializer2 = new XmlSerializer(typeof(T));
+                XmlSerializer serializer2 = XmlSerializer.FromTypes(new[]{typeof(T)})[0];
                 FileStream fs2 = new FileStream(filename, FileMode.Open);
                 T loadClasses = (T)serializer2.Deserialize(fs2);
                 fs2.Close();
@@ -26,7 +26,7 @@ public static T LoadFile(string filename)
 
             public static T LoadString(string s)
             {
-                XmlSerializer serializer = new XmlSerializer(typeof(T));
+                XmlSerializer serializer = XmlSerializer.FromTypes(new[]{typeof(T)})[0];
                 StringReader str = new StringReader(s);
                 T loadClasses = (T)serializer.Deserialize(str);
                 str.Close();
diff --git a/External/Plugins/StartPage/ProjectInfo/RecentProjectList.cs b/External/Plugins/StartPage/ProjectInfo/RecentProjectList.cs
@@ -11,7 +11,7 @@ public class RecentProjectList : List<RecentProject>
 
         public RecentProjectList()
         {
-            this.xmlSerializer = new XmlSerializer(this.GetType());
+            this.xmlSerializer = XmlSerializer.FromTypes(new[]{this.GetType()})[0];
         }
         public RecentProjectList(List<String> recentProjects)
         {
diff --git a/PluginCore/ScintillaNet/Configuration/ConfigurationUtility.cs b/PluginCore/ScintillaNet/Configuration/ConfigurationUtility.cs
@@ -47,7 +47,7 @@ protected virtual Stream OpenFile(string filename, ConfigFile parent)
 
         protected object Deserialize(TextReader reader, Type aType)
         {
-            XmlSerializer xmlSerializer = new XmlSerializer(aType);
+            XmlSerializer xmlSerializer = XmlSerializer.FromTypes(new[]{aType})[0];
             object local = xmlSerializer.Deserialize(reader);
             reader.Close();
             return local;

Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,15 @@ public class SerializeXML<T>`
`9`	`9`	`{`
`10`	`10`	`public static void SaveFile(string filename, T obj)`
`11`	`11`	`{`
`12`		`- XmlSerializer serializer1 = new XmlSerializer(typeof(T));`
	`12`	`+ XmlSerializer serializer1 = XmlSerializer.FromTypes(new[]{typeof(T)})[0];`
`13`	`13`	`FileStream fs1 = new FileStream(filename, FileMode.Create);`
`14`	`14`	`serializer1.Serialize(fs1, obj);`
`15`	`15`	`fs1.Close();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public static T LoadFile(string filename)`
`19`	`19`	`{`
`20`		`- XmlSerializer serializer2 = new XmlSerializer(typeof(T));`
	`20`	`+ XmlSerializer serializer2 = XmlSerializer.FromTypes(new[]{typeof(T)})[0];`
`21`	`21`	`FileStream fs2 = new FileStream(filename, FileMode.Open);`
`22`	`22`	`T loadClasses = (T)serializer2.Deserialize(fs2);`
`23`	`23`	`fs2.Close();`
`@@ -26,7 +26,7 @@ public static T LoadFile(string filename)`
`26`	`26`
`27`	`27`	`public static T LoadString(string s)`
`28`	`28`	`{`
`29`		`- XmlSerializer serializer = new XmlSerializer(typeof(T));`
	`29`	`+ XmlSerializer serializer = XmlSerializer.FromTypes(new[]{typeof(T)})[0];`
`30`	`30`	`StringReader str = new StringReader(s);`
`31`	`31`	`T loadClasses = (T)serializer.Deserialize(str);`
`32`	`32`	`str.Close();`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class RecentProjectList : List<RecentProject>`
`11`	`11`
`12`	`12`	`public RecentProjectList()`
`13`	`13`	`{`
`14`		`- this.xmlSerializer = new XmlSerializer(this.GetType());`
	`14`	`+ this.xmlSerializer = XmlSerializer.FromTypes(new[]{this.GetType()})[0];`
`15`	`15`	`}`
`16`	`16`	`public RecentProjectList(List<String> recentProjects)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ protected virtual Stream OpenFile(string filename, ConfigFile parent)`
`47`	`47`
`48`	`48`	`protected object Deserialize(TextReader reader, Type aType)`
`49`	`49`	`{`
`50`		`- XmlSerializer xmlSerializer = new XmlSerializer(aType);`
	`50`	`+ XmlSerializer xmlSerializer = XmlSerializer.FromTypes(new[]{aType})[0];`
`51`	`51`	`object local = xmlSerializer.Deserialize(reader);`
`52`	`52`	`reader.Close();`
`53`	`53`	`return local;`