[mono/monodevelop] [2 commits] 1b6dad40: [Debugger] Fixed ArgumentOutOfRangeException in debugger evaluator

[Jeffrey Stedfast (jeff@xamarin.com)]

Branch: refs/heads/master
Home: https://github.com/mono/monodevelop
Compare: https://github.com/mono/monodevelop/compare/37459abab9e2...328c3115fc75

Commit: 1b6dad403fe5ebce0d6d05221be394c52825ad68
Author: Jeffrey Stedfast <je...@xamarin.com> (jstedfast)
Date: 2013-04-23 21:38:33 GMT
URL: https://github.com/mono/monodevelop/commit/1b6dad403fe5ebce0d6d05221be394c52825ad68

[Debugger] Fixed ArgumentOutOfRangeException in debugger evaluator

Fixes an issue discovered by a user at Evolve

Changed paths:
M main/src/core/Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionEvaluator.cs

Modified: main/src/core/Mono.Debugging/Mono.Debugging.Evaluation/NRefactoryExpressionEvaluator.cs
===================================================================
@@ -46,7 +46,7 @@ public override ValueReference Evaluate (EvaluationContext ctx, string expressio
if (expression.Length > 0 && expression[0] == '?')
expression = expression.Substring (1).Trim ();

- if (expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3])) {
+ if (expression.Length > 3 && expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3])) {
expression = expression.Substring (4).Trim (' ', '\t');
string variable = null;

@@ -94,7 +94,7 @@ string Resolve (DebuggerSession session, SourceLocation location, string express
if (expression.Length > 0 && expression[0] == '?')
return "?" + Resolve (session, location, expression.Substring (1).Trim ());

- if (expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3]))
+ if (expression.Length > 3 && expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3]))
return "var " + Resolve (session, location, expression.Substring (4).Trim (' ', '\t'));

expression = ReplaceExceptionTag (expression, session.Options.EvaluationOptions.CurrentExceptionTag);
@@ -125,7 +125,7 @@ public override ValidationResult ValidateExpression (EvaluationContext ctx, stri
if (expression.Length > 0 && expression[0] == '?')
expression = expression.Substring (1).Trim ();

- if (expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3]))
+ if (expression.Length > 3 && expression.StartsWith ("var", StringComparison.Ordinal) && char.IsWhiteSpace (expression[3]))
expression = expression.Substring (4).Trim ();

expression = ReplaceExceptionTag (expression, ctx.Options.CurrentExceptionTag);

Commit: 328c3115fc75f1f162b6e3d3f31b6ff123355d6d
Author: Jeffrey Stedfast <je...@xamarin.com> (jstedfast)
Date: 2013-04-23 21:38:34 GMT
URL: https://github.com/mono/monodevelop/commit/328c3115fc75f1f162b6e3d3f31b6ff123355d6d

[Ide] Removed unused usings

Changed paths:
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SolutionPad.cs
M main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TreeViewPad.cs

Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/ProjectSolutionPad.cs
===================================================================
@@ -27,14 +27,11 @@
//

using System;
-using System.Resources;
using System.Collections.Generic;

using MonoDevelop.Projects;
-using MonoDevelop.Core;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Gui.Components;
-using System.Text;

namespace MonoDevelop.Ide.Gui.Pads.ProjectPad
{

Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/SolutionPad.cs
===================================================================
@@ -27,11 +27,8 @@
//

using System;
-using System.Resources;

using MonoDevelop.Projects;
-using MonoDevelop.Core;
-using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Gui.Components;

namespace MonoDevelop.Ide.Gui.Pads

Modified: main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/TreeViewPad.cs
===================================================================
@@ -27,23 +27,9 @@
//

using System;
-using System.IO;
-using System.ComponentModel;
-using System.Drawing;
-using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Resources;
-using System.Text;

-using Mono.Addins;
using MonoDevelop.Core;
-using MonoDevelop.Projects;
-using MonoDevelop.Ide.Gui.Dialogs;
using MonoDevelop.Components;
-using MonoDevelop.Ide.Commands;
using MonoDevelop.Components.Commands;
using MonoDevelop.Ide.Gui.Components;