From a5fa3e193bf5c61d98b49eded9217babe7751635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kon=C3=AD=C4=8Dek?= Date: Mon, 31 May 2010 18:16:01 +0000 Subject: [PATCH] CodeCompletion shows only imported types. Shows all available types on Ctrl+Space press. After using it for a few days, I found that always showing all types can be confusing, like always showing all extension methods. Now both types and extension methods need Ctrl+Space. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5882 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../NRefactoryResolver/NRefactoryResolver.cs | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs index 3bc4e0318f..5f5fdf19b9 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/NRefactoryResolver.cs @@ -1147,21 +1147,21 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } result.Add(new KeywordEntry("Global")); result.Add(new KeywordEntry("New")); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else { if (context == ExpressionContext.TypeDeclaration) { AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.TypeLevel); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.InterfaceDeclaration) { AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.InterfaceLevel); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.MethodBody) { result.Add(new KeywordEntry("var")); AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.StatementStart); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.Global) { AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.GlobalLevel); } else if (context == ExpressionContext.InterfacePropertyDeclaration) { @@ -1178,11 +1178,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver result.Add(new KeywordEntry("struct")); result.Add(new KeywordEntry("class")); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.InheritableType) { result.Add(new KeywordEntry("where")); // the inheritance list can be followed by constraints AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.PropertyDeclaration) { AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.InPropertyDeclaration); } else if (context == ExpressionContext.EventDeclaration) { @@ -1199,17 +1199,17 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } } AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else if (context == ExpressionContext.ObjectInitializer) { bool isCollectionInitializer; result.AddRange(ObjectInitializerCtrlSpace(fileContent, out isCollectionInitializer)); if (isCollectionInitializer) { AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.ExpressionStart); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } } else if (context == ExpressionContext.Attribute) { - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); result.Add(new KeywordEntry("assembly")); result.Add(new KeywordEntry("module")); result.Add(new KeywordEntry("field")); @@ -1223,11 +1223,11 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.ExpressionStart); AddCSharpKeywords(result, NR.Parser.CSharp.Tokens.ExpressionContent); AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } else { // e.g. some ExpressionContext.TypeDerivingFrom() AddCSharpPrimitiveTypes(result); - CtrlSpaceInternal(result, fileContent); + CtrlSpaceInternal(result, fileContent, showEntriesFromAllNamespaces); } } return result; @@ -1241,7 +1241,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver } } - void CtrlSpaceInternal(List result, string fileContent, bool showEntriesFromAllNamespaces = true) + void CtrlSpaceInternal(List result, string fileContent, bool showEntriesFromAllNamespaces) { lookupTableVisitor = new LookupTableVisitor(language);