Browse Source

fixed missing/wrong items displayed in {x:Type} completion

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4926 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
ffc33f2237
  1. 11
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs

11
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs

@ -620,7 +620,7 @@ namespace ICSharpCode.XamlBinding @@ -620,7 +620,7 @@ namespace ICSharpCode.XamlBinding
break;
case "System.Windows.Markup.TypeExtension":
if (context.AttributeValue.ExtensionValue.PositionalArguments.Count <= 1) {
list.Items.AddRange(CreateElementList(context, true, true));
list.Items.AddRange(GetClassesFromContext(context).FlattenToList());
AttributeValue selItem = Utils.GetInnermostMarkupExtensionInfo(context.AttributeValue.ExtensionValue)
.PositionalArguments.LastOrDefault();
string word = context.Editor.GetWordBeforeCaret().TrimEnd();
@ -641,6 +641,15 @@ namespace ICSharpCode.XamlBinding @@ -641,6 +641,15 @@ namespace ICSharpCode.XamlBinding
return true;
}
static IEnumerable<ICompletionItem> FlattenToList(this IDictionary<string, IEnumerable<IClass>> data)
{
foreach (var item in data) {
foreach (IClass c in item.Value) {
yield return new XamlCodeCompletionItem(c, item.Key);
}
}
}
public static IEnumerable<IInsightItem> MemberInsight(MemberResolveResult result)
{

Loading…
Cancel
Save