diff options
| author | Mike Krüger <mkrueger@novell.com> | 2009-09-18 19:52:42 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@novell.com> | 2009-09-18 19:52:42 +0400 |
| commit | 67c3049eb0e5f542d00149195519d156857d7992 (patch) | |
| tree | 53fcdaeb6d5d6ab444b6c8b3e04e91306d4c3262 /main | |
| parent | 7e689c5a7827b3c5a65bbdd531b9fc610c528f87 (diff) | |
* Gui/CSharpTextEditorCompletion.cs: Fixed wrong code completion
popup.
svn path=/trunk/monodevelop/; revision=142196
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/addins/CSharpBinding/ChangeLog | 5 | ||||
| -rw-r--r-- | main/src/addins/CSharpBinding/Gui/CSharpTextEditorCompletion.cs | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/main/src/addins/CSharpBinding/ChangeLog b/main/src/addins/CSharpBinding/ChangeLog index 2d45091464..47dc946081 100644 --- a/main/src/addins/CSharpBinding/ChangeLog +++ b/main/src/addins/CSharpBinding/ChangeLog @@ -1,5 +1,10 @@ 2009-09-18 Mike Krüger <mkrueger@novell.com> + * Gui/CSharpTextEditorCompletion.cs: Fixed wrong code + completion popup. + +2009-09-18 Mike Krüger <mkrueger@novell.com> + * Syntax/CSharpSyntaxMode.cs: handled null exception. 2009-09-18 Mike Krüger <mkrueger@novell.com> diff --git a/main/src/addins/CSharpBinding/Gui/CSharpTextEditorCompletion.cs b/main/src/addins/CSharpBinding/Gui/CSharpTextEditorCompletion.cs index 412924a124..b3896243e2 100644 --- a/main/src/addins/CSharpBinding/Gui/CSharpTextEditorCompletion.cs +++ b/main/src/addins/CSharpBinding/Gui/CSharpTextEditorCompletion.cs @@ -218,13 +218,14 @@ namespace MonoDevelop.CSharpBinding.Gui }
} return null; - case '[': +/* Disabled because it gives problems when declaring arrays - for example string [] should not pop up code completion. + case '[': if (stateTracker.Engine.IsInsideDocLineComment || stateTracker.Engine.IsInsideOrdinaryCommentOrString) return null; result = FindExpression (dom, completionContext); if (result.ExpressionContext == ExpressionContext.Attribute) return CreateCtrlSpaceCompletionData (completionContext, result); - return null; + return null;*/ case '<': if (stateTracker.Engine.IsInsideDocLineComment) return GetXmlDocumentationCompletionData (); @@ -595,7 +596,7 @@ namespace MonoDevelop.CSharpBinding.Gui return new NRefactoryTemplateParameterDataProvider (Editor, resolver, GetUsedNamespaces (), result.Expression.Trim ()); case '[': { ResolveResult resolveResult = resolver.Resolve (result, new DomLocation (completionContext.TriggerLine, completionContext.TriggerLineOffset)); - if (resolveResult != null) { + if (resolveResult != null && !resolveResult.StaticResolve) { IType type = dom.GetType (resolveResult.ResolvedType); if (type != null) return new NRefactoryIndexerParameterDataProvider (Editor, type, result.Expression); |