Merge branch 'master' into roslyn

Conflicts:
	main/external/fsharpbinding
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Parser/TypeSystemProvider.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskStrip.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/DebugValueWindow.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Commands/CommandManager.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/WorkbenchWindow.cs
	version-checks

1 files changed, 42 insertions, 23 deletions

diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
index e0410e2c30..7897809fdd 100644
--- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
+++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs
@@ -49,27 +49,35 @@ namespace MonoDevelop.HexEditor
 
 		public override bool CanVisualize (ObjectValue val)
 		{
-			if (val.TypeName != null && val.TypeName.EndsWith ("Foundation.NSData"))
-				return true;
 			switch (val.TypeName) {
-			case "sbyte[]": return true;
-			case "byte[]": return true;
-			case "char[]": return true;
-			case "string": return true;
-			default: return false;
+			case "MonoTouch.Foundation.NSData":
+			case "MonoMac.Foundation.NSData":
+			case "System.IO.MemoryStream":
+			case "Foundation.NSData":
+			case "sbyte[]":
+			case "byte[]":
+			case "char[]":
+			case "string":
+				return true;
+			default:
+				return false;
 			}
 		}
 
 		public override bool IsDefaultVisualizer (ObjectValue val)
 		{
-			if (val.TypeName != null && val.TypeName.EndsWith ("Foundation.NSData"))
-				return true;
 			switch (val.TypeName) {
+			case "MonoTouch.Foundation.NSData":
+			case "MonoMac.Foundation.NSData":
+			case "System.IO.MemoryStream":
+			case "Foundation.NSData":
 			case "sbyte[]":
-			case "byte[]": return true;
+			case "byte[]":
+				return true;
 			case "char[]": 
-			case "string": return false;
-			default: return false;
+			case "string":
+			default:
+				return false;
 			}
 		}
 
@@ -86,28 +94,39 @@ namespace MonoDevelop.HexEditor
 			options.AllowTargetInvoke = true;
 			options.ChunkRawStrings = true;
 
-			IBuffer buffer = null;
 			hexEditor = new Mono.MHex.HexEditorDebugger ();
+			RawValueString rawString;
+			RawValueArray rawArray;
+			IBuffer buffer = null;
 
-			if (val.TypeName != null && val.TypeName.EndsWith ("Foundation.NSData")) {
-				var raw = (RawValueArray)((RawValue)val.GetRawValue ()).CallMethod ("ToArray");
-				buffer = new RawByteArrayBuffer (raw);
-			} else if (val.TypeName != "string") {
-				var raw = (RawValueArray)val.GetRawValue (options);
+			switch (val.TypeName) {
+			case "MonoTouch.Foundation.NSData":
+			case "MonoMac.Foundation.NSData":
+			case "System.IO.MemoryStream":
+			case "Foundation.NSData":
+				var stream = (RawValue) val.GetRawValue (options);
+				rawArray = (RawValueArray) stream.CallMethod ("ToArray");
+				buffer = new RawByteArrayBuffer (rawArray);
+				break;
+			case "string":
+				rawString = (RawValueString) val.GetRawValue (options);
+				buffer = new RawStringBuffer (rawString);
+				break;
+			default:
+				rawArray = (RawValueArray) val.GetRawValue (options);
 
 				switch (val.TypeName) {
 				case "sbyte[]":
-					buffer = new RawSByteArrayBuffer (raw);
+					buffer = new RawSByteArrayBuffer (rawArray);
 					break;
 				case "char[]":
-					buffer = new RawCharArrayBuffer (raw);
+					buffer = new RawCharArrayBuffer (rawArray);
 					break;
 				case "byte[]":
-					buffer = new RawByteArrayBuffer (raw);
+					buffer = new RawByteArrayBuffer (rawArray);
 					break;
 				}
-			} else {
-				buffer = new RawStringBuffer ((RawValueString)val.GetRawValue (options));
+				break;
 			}
 
 			hexEditor.HexEditorData.Buffer = buffer;