From 1bd2aefc9e2ea44629be9b6969d53817d6aeb543 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 13 Mar 2005 19:35:09 +0000 Subject: [PATCH] Fixed StackOverflowException when property ReflectionIndexer.Parameters is used. CC does not pop up on integer literals anymore. Fixed focus stealing when moving mouse over FoldMargin. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@87 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../ICSharpCode.TextEditor/Project/Src/Gui/FoldMargin.cs | 3 --- .../Src/Dom/NRefactoryResolver/NRefactoryResolver.cs | 6 +++++- .../Project/Src/Dom/ReflectionLayer/ReflectionIndexer.cs | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/FoldMargin.cs b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/FoldMargin.cs index d0b3fdfc96..0a9d8979e5 100644 --- a/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/FoldMargin.cs +++ b/src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/FoldMargin.cs @@ -196,9 +196,6 @@ namespace ICSharpCode.TextEditor int physicalLine = + (int)((mousepos.Y + textArea.VirtualTop.Y) / textArea.TextView.FontHeight); int realline = textArea.Document.GetFirstLogicalLine(physicalLine); - // focus the textarea if the user clicks on the line number view - textArea.Focus(); - if (!showFolding || realline < 0 || realline + 1 >= textArea.Document.TotalNumberOfLines) { return; } diff --git a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs index b244037ba2..cf7b5c5728 100644 --- a/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs @@ -134,7 +134,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver callingMember = GetCurrentMember(); TypeVisitor typeVisitor = new TypeVisitor(this); - if (expr is InvocationExpression) { + + if (expr is PrimitiveExpression) { + if (((PrimitiveExpression)expr).Value is int) + return null; + } else if (expr is InvocationExpression) { IMethod method = typeVisitor.GetMethod((InvocationExpression)expr, null); if (method != null) return CreateMemberResolveResult(method); diff --git a/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionIndexer.cs b/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionIndexer.cs index 375791bbcc..c0fbbb4b83 100644 --- a/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionIndexer.cs +++ b/src/Main/Base/Project/Src/Dom/ReflectionLayer/ReflectionIndexer.cs @@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.Dom get { List parameters = new List(); foreach (ParameterInfo parameterInfo in propertyInfo.GetIndexParameters()) { - Parameters.Add(new ReflectionParameter(parameterInfo)); + parameters.Add(new ReflectionParameter(parameterInfo)); } return parameters; }