pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix issues with member value completion, event completion etc.

pull/32/merge
Siegfried Pammer 13 years ago
parent
dfb8847e34
commit
c0680b4e33
7 changed files with 192 additions and 1255 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs
  2. 1004
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
  3. 15
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlAstResolver.cs
  4. 1
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
  5. 154
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs
  6. 257
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
  7. 12
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs

4
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs
Unescape View File

@ -690,8 +690,8 @@ namespace ICSharpCode.XamlBinding
IMethod invoker = td.GetMethods(method => method.Name == "Invoke").FirstOrDefault(); IMethod invoker = td.GetMethods(method => method.Name == "Invoke").FirstOrDefault();
if (invoker != null && context.ActiveElement != null) { if (invoker != null && context.ActiveElement != null) {
var item = context.ActiveElement; var item = context.ActiveElement;
var resolver = new XamlResolver(compilation); var resolver = new XamlAstResolver(compilation, context.ParseInformation);
var mrr = resolver.ResolveExpression(context.Attribute.ToQualifiedName().FullXmlName, context) as MemberResolveResult; var mrr = resolver.ResolveAttribute(context.Attribute) as MemberResolveResult;
IEvent evt; IEvent evt;
if (mrr == null || (evt = mrr.Member as IEvent) == null) if (mrr == null || (evt = mrr.Member as IEvent) == null)
return EmptyList<ICompletionItem>.Instance; return EmptyList<ICompletionItem>.Instance;

1004
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
View File

File diff suppressed because it is too large Load Diff

15
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlAstResolver.cs
Unescape View File

@ -52,7 +52,7 @@ namespace ICSharpCode.XamlBinding
return ErrorResolveResult.UnknownError; return ErrorResolveResult.UnknownError;
} }
internal ResolveResult ResolveAttribute(AXmlAttribute attribute, int offset, CancellationToken cancellationToken = default(CancellationToken)) internal ResolveResult ResolveAttribute(AXmlAttribute attribute, int offset = -1, CancellationToken cancellationToken = default(CancellationToken))
{ {
IMember member = null, underlying = null; IMember member = null, underlying = null;
IType type = null; IType type = null;
@ -63,7 +63,7 @@ namespace ICSharpCode.XamlBinding
propertyName = propertyName.Substring(propertyName.IndexOf('.') + 1); propertyName = propertyName.Substring(propertyName.IndexOf('.') + 1);
ITypeReference reference = XamlUnresolvedFile.CreateTypeReference(namespaceName, name); ITypeReference reference = XamlUnresolvedFile.CreateTypeReference(namespaceName, name);
type = reference.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly)); type = reference.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly));
member = FindMember(type, propertyName); member = FindMember(type, propertyName);
if (member == null) if (member == null)
member = FindAttachedMember(type, propertyName, out underlying); member = FindAttachedMember(type, propertyName, out underlying);
} else { } else {
@ -73,7 +73,7 @@ namespace ICSharpCode.XamlBinding
} }
if (member == null) if (member == null)
return new UnknownMemberResolveResult(type, propertyName, EmptyList<IType>.Instance); return new UnknownMemberResolveResult(type, propertyName, EmptyList<IType>.Instance);
if (attribute.ValueSegment.Contains(offset, 1)) if (offset > -1 && attribute.ValueSegment.Contains(offset, 1))
return ResolveAttributeValue(member, attribute, cancellationToken); return ResolveAttributeValue(member, attribute, cancellationToken);
if (underlying != null) if (underlying != null)
return new AttachedMemberResolveResult(new TypeResolveResult(underlying.DeclaringType), underlying, member); return new AttachedMemberResolveResult(new TypeResolveResult(underlying.DeclaringType), underlying, member);
@ -118,10 +118,7 @@ namespace ICSharpCode.XamlBinding
IMember member = type.GetProperties(p => p.Name == propertyName).FirstOrDefault(); IMember member = type.GetProperties(p => p.Name == propertyName).FirstOrDefault();
if (member != null) if (member != null)
return member; return member;
member = type.GetEvents(e => e.Name == propertyName).FirstOrDefault(); return type.GetEvents(e => e.Name == propertyName).FirstOrDefault();
if (member != null)
return member;
return null;
} }
IMember FindAttachedMember(IType type, string propertyName, out IMember underlyingMember) IMember FindAttachedMember(IType type, string propertyName, out IMember underlyingMember)
@ -133,7 +130,7 @@ namespace ICSharpCode.XamlBinding
ITypeResolveContext localContext = new SimpleTypeResolveContext(type.GetDefinition()); ITypeResolveContext localContext = new SimpleTypeResolveContext(type.GetDefinition());
if (underlyingMember != null) if (underlyingMember != null)
return new DefaultUnresolvedProperty { Name = propertyName } return new DefaultUnresolvedProperty { Name = propertyName }
.CreateResolved(localContext); .CreateResolved(localContext);
underlyingMember = type underlyingMember = type
.GetMethods(m => m.IsPublic && m.IsStatic && m.Parameters.Count == 2 .GetMethods(m => m.IsPublic && m.IsStatic && m.Parameters.Count == 2
@ -141,7 +138,7 @@ namespace ICSharpCode.XamlBinding
.FirstOrDefault(); .FirstOrDefault();
if (underlyingMember != null) if (underlyingMember != null)
return new DefaultUnresolvedEvent { Name = propertyName } return new DefaultUnresolvedEvent { Name = propertyName }
.CreateResolved(localContext); .CreateResolved(localContext);
return null; return null;
} }

1
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.csproj
Unescape View File

@ -66,7 +66,6 @@
<ItemGroup> <ItemGroup>
<Compile Include="AttachedMemberResolveResult.cs" /> <Compile Include="AttachedMemberResolveResult.cs" />
<Compile Include="CompletionDataGenerator.cs" /> <Compile Include="CompletionDataGenerator.cs" />
<Compile Include="CompletionDataHelper.cs" />
<Compile Include="XamlAstResolver.cs" /> <Compile Include="XamlAstResolver.cs" />
<Compile Include="XamlCodeCompletionBinding.cs" /> <Compile Include="XamlCodeCompletionBinding.cs" />
<Compile Include="XamlCompletionItem.cs" /> <Compile Include="XamlCompletionItem.cs" />

154
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs
Unescape View File

@ -54,7 +54,7 @@ namespace ICSharpCode.XamlBinding
if (endMarkerCount % 2 != 0) { if (endMarkerCount % 2 != 0) {
editor.Document.Insert(editor.Caret.Offset, ch.ToString()); editor.Document.Insert(editor.Caret.Offset, ch.ToString());
editor.Caret.Offset--; editor.Caret.Offset--;
this.CtrlSpace(editor); CtrlSpace(editor);
return CodeCompletionKeyPressResult.Completed; return CodeCompletionKeyPressResult.Completed;
} }
} }
@ -85,8 +85,8 @@ namespace ICSharpCode.XamlBinding
} }
break; break;
case XamlContextDescription.InMarkupExtension: case XamlContextDescription.InMarkupExtension:
// if (DoMarkupExtensionCompletion(context)) if (DoMarkupExtensionCompletion(context))
// return CodeCompletionKeyPressResult.Completed; return CodeCompletionKeyPressResult.Completed;
break; break;
case XamlContextDescription.InAttributeValue: case XamlContextDescription.InAttributeValue:
if (editor.SelectionLength != 0) if (editor.SelectionLength != 0)
@ -110,7 +110,7 @@ namespace ICSharpCode.XamlBinding
editor.Document.Insert(editor.Caret.Offset, "[]"); editor.Document.Insert(editor.Caret.Offset, "[]");
editor.Caret.Offset--; editor.Caret.Offset--;
this.CtrlSpace(editor); CtrlSpace(editor);
return CodeCompletionKeyPressResult.EatKey; return CodeCompletionKeyPressResult.EatKey;
} }
break; break;
@ -147,7 +147,7 @@ namespace ICSharpCode.XamlBinding
editor.Caret.Offset++; editor.Caret.Offset++;
} }
this.CtrlSpace(editor); CtrlSpace(editor);
return CodeCompletionKeyPressResult.EatKey; return CodeCompletionKeyPressResult.EatKey;
} else { } else {
DoMarkupExtensionCompletion(context); DoMarkupExtensionCompletion(context);
@ -161,7 +161,7 @@ namespace ICSharpCode.XamlBinding
string attributeName = (context.Attribute != null) ? context.Attribute.Name : string.Empty; string attributeName = (context.Attribute != null) ? context.Attribute.Name : string.Empty;
if (!attributeName.StartsWith("xmlns", StringComparison.OrdinalIgnoreCase)) { if (!attributeName.StartsWith("xmlns", StringComparison.OrdinalIgnoreCase)) {
return this.CtrlSpace(editor, context) return CtrlSpace(editor, context)
? CodeCompletionKeyPressResult.CompletedIncludeKeyInCompletion ? CodeCompletionKeyPressResult.CompletedIncludeKeyInCompletion
: CodeCompletionKeyPressResult.None; : CodeCompletionKeyPressResult.None;
} }
@ -186,72 +186,38 @@ namespace ICSharpCode.XamlBinding
bool CtrlSpace(ITextEditor editor, XamlCompletionContext context) bool CtrlSpace(ITextEditor editor, XamlCompletionContext context)
{ {
if (context.Description == XamlContextDescription.InComment if (context.Description == XamlContextDescription.InComment
|| context.Description == XamlContextDescription.InCData) || context.Description == XamlContextDescription.InCData
|| context.ActiveElement == null) {
return false; return false;
if (context.ActiveElement != null) { }
if (!XmlParser.IsInsideAttributeValue(editor.Document.Text, editor.Caret.Offset) && context.Description != XamlContextDescription.InAttributeValue) { if (context.Description != XamlContextDescription.InAttributeValue) {
XamlCompletionItemList list = generator.CreateListForContext(context); XamlCompletionItemList list = generator.CreateListForContext(context);
string starter = editor.GetWordBeforeCaretExtended().TrimStart('/'); string starter = editor.GetWordBeforeCaretExtended().TrimStart('/');
if (context.Description != XamlContextDescription.None && !string.IsNullOrEmpty(starter)) { if (context.Description != XamlContextDescription.None && !string.IsNullOrEmpty(starter)) {
if (starter.Contains(".")) if (starter.Contains(".")) {
list.PreselectionLength = starter.Length - starter.IndexOf('.') - 1; list.PreselectionLength = starter.Length - starter.IndexOf('.') - 1;
else } else {
list.PreselectionLength = starter.Length; list.PreselectionLength = starter.Length;
} }
editor.ShowCompletionWindow(list); }
return true; editor.ShowCompletionWindow(list);
} else { return true;
// DO NOT USE CompletionDataHelper.CreateListForContext here!!! results in endless recursion!!!! }
if (context.Attribute != null) { // DO NOT USE generator.CreateListForContext here!!! results in endless recursion!!!!
if (!DoMarkupExtensionCompletion(context)) { if (context.Attribute != null) {
var completionList = new XamlCompletionItemList(context); if (!DoMarkupExtensionCompletion(context)) {
completionList.PreselectionLength = editor.GetWordBeforeCaretExtended().Length; var completionList = new XamlCompletionItemList(context);
if ((context.ActiveElement.Name == "Setter" || context.ActiveElement.Name == "EventSetter") && (context.Attribute.Name == "Property" || context.Attribute.Name == "Value")) completionList.PreselectionLength = editor.GetWordBeforeCaretExtended().Length;
DoSetterAndEventSetterCompletion(context, completionList); if ((context.ActiveElement.Name == "Setter" || context.ActiveElement.Name == "EventSetter") && (context.Attribute.Name == "Property" || context.Attribute.Name == "Value")) {
else DoSetterAndEventSetterCompletion(context, completionList);
if ((context.ActiveElement.Name.EndsWith("Trigger", StringComparison.Ordinal) || context.ActiveElement.Name == "Condition") && context.Attribute.Name == "Value") } else if ((context.ActiveElement.Name.EndsWith("Trigger", StringComparison.Ordinal) || context.ActiveElement.Name == "Condition") && context.Attribute.Name == "Value") {
DoTriggerCompletion(context, completionList); DoTriggerCompletion(context, completionList);
else { } else if (!DoAttributeCompletion(context, completionList)) {
if (context.Attribute.Name == "xml:space") { DoXmlAttributeCompletion(context, completionList);
completionList.Items.AddRange(new[] {
new XamlCompletionItem("preserve"),
new XamlCompletionItem("default")
});
}
XamlAstResolver resolver = new XamlAstResolver(compilation, context.ParseInformation);
var mrr = resolver.ResolveAttribute(context.Attribute, editor.Document.GetOffset(editor.Caret.Location)) as MemberResolveResult;
if (mrr != null && mrr.Type.Kind != TypeKind.Unknown) {
completionList.Items.AddRange(generator.MemberCompletion(context, mrr.Type, string.Empty));
editor.ShowInsightWindow(generator.MemberInsight(mrr));
switch (mrr.Type.FullName) {
case "System.Windows.PropertyPath":
string start = editor.GetWordBeforeCaretExtended();
int index = start.LastIndexOfAny(PropertyPathTokenizer.ControlChars);
if (index + 1 < start.Length)
start = start.Substring(index + 1);
else
start = "";
completionList.PreselectionLength = start.Length;
break;
case "System.Windows.Media.FontFamily":
string text = context.ValueStartOffset > -1 ? context.RawAttributeValue.Substring(0, Math.Min(context.ValueStartOffset, context.RawAttributeValue.Length)) : "";
int lastComma = text.LastIndexOf(',');
completionList.PreselectionLength = lastComma == -1 ? context.ValueStartOffset : context.ValueStartOffset - lastComma - 1;
break;
}
}
}
completionList.SortItems();
if (context.Attribute.Prefix.Equals("xmlns", StringComparison.OrdinalIgnoreCase) || context.Attribute.Name.Equals("xmlns", StringComparison.OrdinalIgnoreCase))
completionList.Items.AddRange(generator.CreateListForXmlnsCompletion(compilation));
ICompletionListWindow window = editor.ShowCompletionWindow(completionList);
if ((context.Attribute.Prefix.Equals("xmlns", StringComparison.OrdinalIgnoreCase) || context.Attribute.Name.Equals("xmlns", StringComparison.OrdinalIgnoreCase)) && window != null)
window.Width = 400;
return completionList.Items.Any();
}
return true;
} }
return completionList.Items.Any();
} }
return true;
} }
return false; return false;
} }
@ -357,6 +323,58 @@ namespace ICSharpCode.XamlBinding
} }
} }
bool DoAttributeCompletion(XamlCompletionContext context, XamlCompletionItemList completionList)
{
XamlAstResolver resolver = new XamlAstResolver(compilation, context.ParseInformation);
ITextEditor editor = context.Editor;
var mrr = resolver.ResolveAttribute(context.Attribute) as MemberResolveResult;
if (mrr != null && mrr.Type.Kind != TypeKind.Unknown) {
completionList.Items.AddRange(generator.MemberCompletion(context, mrr.Type, string.Empty));
editor.ShowInsightWindow(generator.MemberInsight(mrr));
editor.ShowCompletionWindow(completionList);
switch (mrr.Type.FullName) {
case "System.Windows.PropertyPath":
string start = editor.GetWordBeforeCaretExtended();
int index = start.LastIndexOfAny(PropertyPathTokenizer.ControlChars);
if (index + 1 < start.Length) {
start = start.Substring(index + 1);
}
else {
start = "";
}
completionList.PreselectionLength = start.Length;
break;
case "System.Windows.Media.FontFamily":
string text = context.ValueStartOffset > -1 ? context.RawAttributeValue.Substring(0, Math.Min(context.ValueStartOffset, context.RawAttributeValue.Length)) : "";
int lastComma = text.LastIndexOf(',');
completionList.PreselectionLength = lastComma == -1 ? context.ValueStartOffset : context.ValueStartOffset - lastComma - 1;
break;
}
}
return completionList.Items.Any();
}
void DoXmlAttributeCompletion(XamlCompletionContext context, XamlCompletionItemList completionList)
{
if (context.Attribute.Name == "xml:space") {
completionList.Items.AddRange(new[] {
new XamlCompletionItem("preserve"),
new XamlCompletionItem("default")
});
}
if (context.Attribute.Prefix.Equals("xmlns", StringComparison.OrdinalIgnoreCase) ||
context.Attribute.Name.Equals("xmlns", StringComparison.OrdinalIgnoreCase)) {
completionList.Items.AddRange(generator.CreateListForXmlnsCompletion(compilation));
ICompletionListWindow window = context.Editor.ShowCompletionWindow(completionList);
if (window != null) {
window.Width = 400;
}
}
}
bool DoMarkupExtensionCompletion(XamlCompletionContext context) bool DoMarkupExtensionCompletion(XamlCompletionContext context)
{ {
if (context.Description == XamlContextDescription.InMarkupExtension && context.AttributeValue != null && !context.AttributeValue.IsString) { if (context.Description == XamlContextDescription.InMarkupExtension && context.AttributeValue != null && !context.AttributeValue.IsString) {

257
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCompletionItemList.cs
Unescape View File

@ -10,6 +10,7 @@ using ICSharpCode.NRefactory.TypeSystem;
using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.Editor;
using ICSharpCode.SharpDevelop.Editor.CodeCompletion; using ICSharpCode.SharpDevelop.Editor.CodeCompletion;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.XmlEditor; using ICSharpCode.XmlEditor;
namespace ICSharpCode.XamlBinding namespace ICSharpCode.XamlBinding
@ -50,170 +51,96 @@ namespace ICSharpCode.XamlBinding
return text.Length - i - 1; return text.Length - i - 1;
} }
// public override void Complete(CompletionContext context, ICompletionItem item) public override void Complete(CompletionContext context, ICompletionItem item)
// { {
// using (context.Editor.Document.OpenUndoGroup()) { using (context.Editor.Document.OpenUndoGroup()) {
// base.Complete(context, item); base.Complete(context, item);
//
// XamlCompletionContext xamlContext = CompletionDataHelper.ResolveCompletionContext(context.Editor, context.CompletionChar); XamlCompletionContext xamlContext = XamlContextResolver.ResolveCompletionContext(context.Editor, context.CompletionChar);
//
// if (xamlContext.Description == XamlContextDescription.None && (context.StartOffset <= 0 || context.Editor.Document.GetCharAt(context.StartOffset - 1) != '<')) { if (xamlContext.Description == XamlContextDescription.None && (context.StartOffset <= 0 || context.Editor.Document.GetCharAt(context.StartOffset - 1) != '<')) {
// context.Editor.Document.Insert(context.StartOffset, "<"); context.Editor.Document.Insert(context.StartOffset, "<");
// context.EndOffset++; context.EndOffset++;
// } }
//
// if (item is XamlCodeCompletionItem) { if (item is XamlCompletionItem) {
// XamlCodeCompletionItem cItem = item as XamlCodeCompletionItem; XamlCompletionItem cItem = item as XamlCompletionItem;
//
// if (cItem.Entity is IProperty || cItem.Entity is IEvent) { if (cItem.Entity is IProperty || cItem.Entity is IEvent) {
// if (xamlContext.Description == XamlContextDescription.InTag) { if (xamlContext.Description == XamlContextDescription.InTag) {
// context.Editor.Document.Insert(context.EndOffset, "=\"\""); context.Editor.Document.Insert(context.EndOffset, "=\"\"");
// context.CompletionCharHandled = context.CompletionChar == '='; context.CompletionCharHandled = context.CompletionChar == '=';
// context.Editor.Caret.Offset--; context.Editor.Caret.Offset--;
// new XamlCodeCompletionBinding().CtrlSpace(context.Editor); new XamlCodeCompletionBinding().CtrlSpace(context.Editor);
// } else if (xamlContext.Description == XamlContextDescription.InMarkupExtension && !string.IsNullOrEmpty(xamlContext.RawAttributeValue)) { } else if (xamlContext.Description == XamlContextDescription.InMarkupExtension && !string.IsNullOrEmpty(xamlContext.RawAttributeValue)) {
// string valuePart = xamlContext.RawAttributeValue.Substring(0, xamlContext.ValueStartOffset); string valuePart = xamlContext.RawAttributeValue.Substring(0, xamlContext.ValueStartOffset);
// AttributeValue value = MarkupExtensionParser.ParseValue(valuePart); AttributeValue value = MarkupExtensionParser.ParseValue(valuePart);
//
// if (value != null && !value.IsString) { if (value != null && !value.IsString) {
// var markup = Utils.GetMarkupExtensionAtPosition(value.ExtensionValue, context.Editor.Caret.Offset); var markup = Utils.GetMarkupExtensionAtPosition(value.ExtensionValue, context.Editor.Caret.Offset);
// if (markup.NamedArguments.Count > 0 || markup.PositionalArguments.Count > 0) { if (markup.NamedArguments.Count > 0 || markup.PositionalArguments.Count > 0) {
// int oldOffset = context.Editor.Caret.Offset; int oldOffset = context.Editor.Caret.Offset;
// context.Editor.Caret.Offset = context.StartOffset; context.Editor.Caret.Offset = context.StartOffset;
// string word = context.Editor.GetWordBeforeCaret().TrimEnd(); string word = context.Editor.GetWordBeforeCaret().TrimEnd();
// int spaces = CountWhiteSpacesAtEnd(context.Editor.GetWordBeforeCaret()); int spaces = CountWhiteSpacesAtEnd(context.Editor.GetWordBeforeCaret());
// int typeNameStart = markup.ExtensionType.IndexOf(':') + 1; int typeNameStart = markup.ExtensionType.IndexOf(':') + 1;
//
// if (!(word == "." || word == "," || word == ":") && markup.ExtensionType.Substring(typeNameStart, markup.ExtensionType.Length - typeNameStart) != word) { if (!(word == "." || word == "," || word == ":") && markup.ExtensionType.Substring(typeNameStart, markup.ExtensionType.Length - typeNameStart) != word) {
// context.Editor.Document.Replace(context.Editor.Caret.Offset - spaces, spaces, ", "); context.Editor.Document.Replace(context.Editor.Caret.Offset - spaces, spaces, ", ");
// oldOffset += (2 - spaces); oldOffset += (2 - spaces);
// } }
//
// context.Editor.Caret.Offset = oldOffset; context.Editor.Caret.Offset = oldOffset;
// } }
// } }
//
// if (cItem.Text.EndsWith("=", StringComparison.OrdinalIgnoreCase)) if (cItem.Text.EndsWith("=", StringComparison.OrdinalIgnoreCase))
// new XamlCodeCompletionBinding().CtrlSpace(context.Editor); new XamlCodeCompletionBinding().CtrlSpace(context.Editor);
// } }
// } }
// } }
//
// if (item is NewEventCompletionItem) { if (item is NewEventCompletionItem) {
// NewEventCompletionItem eventItem = item as NewEventCompletionItem; CreateEventHandlerCode(xamlContext, item as NewEventCompletionItem);
// int discriminator; }
// if (CreateEventHandlerCode(context, eventItem, out discriminator)) {
// if (discriminator > 0) if (item is XmlnsCompletionItem) {
// context.Editor.Document.Insert(context.EndOffset, discriminator.ToString()); context.Editor.Caret.Offset++;
// } }
// }
// switch (item.Text) {
// if (item is XmlnsCompletionItem) { case "![CDATA[":
// context.Editor.Caret.Offset++; context.Editor.Document.Insert(context.Editor.Caret.Offset, "]]>");
// } context.Editor.Caret.Offset -= 3;
// break;
// if (item is XamlCompletionItem && xamlContext.Description == XamlContextDescription.InTag) { case "?":
// context.Editor.Document.Insert(context.EndOffset, "=\"\""); context.Editor.Document.Insert(context.Editor.Caret.Offset, "?>");
// context.Editor.Caret.Offset--; context.Editor.Caret.Offset -= 2;
// new XamlCodeCompletionBinding().CtrlSpace(context.Editor); break;
// } case "!--":
// context.Editor.Document.Insert(context.Editor.Caret.Offset, " -->");
// switch (item.Text) { context.Editor.Caret.Offset -= 4;
// case "![CDATA[": break;
// context.Editor.Document.Insert(context.Editor.Caret.Offset, "]]>"); }
// context.Editor.Caret.Offset -= 3;
// break; if (item.Text.StartsWith("/", StringComparison.OrdinalIgnoreCase)) {
// case "?": context.Editor.Document.Insert(context.EndOffset, ">");
// context.Editor.Document.Insert(context.Editor.Caret.Offset, "?>"); context.CompletionCharHandled = context.CompletionChar == '>';
// context.Editor.Caret.Offset -= 2; context.Editor.Caret.Offset++;
// break; }
// case "!--": }
// context.Editor.Document.Insert(context.Editor.Caret.Offset, " -->"); }
// context.Editor.Caret.Offset -= 4;
// break; static bool CreateEventHandlerCode(XamlCompletionContext context, NewEventCompletionItem completionItem)
// } {
// IProject project = SD.ProjectService.FindProjectContainingFile(context.Editor.FileName);
// if (item.Text.StartsWith("/", StringComparison.OrdinalIgnoreCase)) { if (project == null) return false;
// context.Editor.Document.Insert(context.EndOffset, ">"); var unresolved = context.ParseInformation.UnresolvedFile.TypeDefinition;
// context.CompletionCharHandled = context.CompletionChar == '>'; if (unresolved == null) return false;
// context.Editor.Caret.Offset++; var compilation = SD.ParserService.GetCompilationForFile(context.Editor.FileName);
// } var definition = unresolved.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly)).GetDefinition();
// } project.CodeGenerator.InsertEventHandler(definition, completionItem.HandlerName, completionItem.EventType, true);
// } return true;
// }
// static bool CreateEventHandlerCode(CompletionContext context, NewEventCompletionItem completionItem, out int discriminator)
// {
// ParseInformation p = ParserService.GetParseInformation(context.Editor.FileName);
// var unit = p.SyntaxTree;
// var loc = context.Editor.Document.OffsetToPosition(context.StartOffset);
// IClass c = unit.GetInnermostClass(loc.Line, loc.Column);
//
// discriminator = 1;
//
// if (c == null)
// return false;
// IMethod initializeComponent = c.Methods[0];
// CompoundClass compound = c.GetCompoundClass() as CompoundClass;
//
// IMethod invokeMethod = completionItem.EventType.ReturnType.GetMethods().FirstOrDefault(m => m.Name == "Invoke");
//
// string handlerName = completionItem.HandlerName;
//
// if (invokeMethod == null)
// throw new ArgumentException("delegateType is not a valid delegate!");
//
// if (compound != null) {
// foreach (IClass part in compound.Parts) {
// IMember lastMember = part.Methods.LastOrDefault();
//
// if (lastMember != null && lastMember.ToString() == initializeComponent.ToString())
// continue;
//
// if (completionItem.EventType.ReturnType == null)
// return false;
//
// while (part.Methods.Any(m => m.Name == handlerName &&
// m.Parameters.Count == invokeMethod.Parameters.Count &&
// m.Parameters.SequenceEqual(invokeMethod.Parameters, new ParameterComparer())
// )) {
// handlerName = completionItem.HandlerName + discriminator;
// discriminator++;
// }
//
// discriminator--;
//
// ParametrizedNode node = (ParametrizedNode)CodeGenerator.ConvertMember(invokeMethod, new ClassFinder(part, context.Editor.Caret.Line, context.Editor.Caret.Column));
//
// node.Name = handlerName;
//
// node.Modifier = Modifiers.None;
//
// IViewContent viewContent = FileService.OpenFile(part.SyntaxTree.FileName, XamlBindingOptions.SwitchToCodeViewAfterInsertion);
// IFileDocumentProvider document = viewContent as IFileDocumentProvider;
//
// if (viewContent != null && document != null) {
// DomRegion domRegion;
//
// if (lastMember != null) {
// unit.ProjectContent.Language.CodeGenerator.InsertCodeAfter(lastMember, new RefactoringDocumentAdapter(document.GetDocumentForFile(viewContent.PrimaryFile)), node);
// domRegion = lastMember.BodyRegion;
// }
// else {
// unit.ProjectContent.Language.CodeGenerator.InsertCodeAtEnd(part.Region, new RefactoringDocumentAdapter(document.GetDocumentForFile(viewContent.PrimaryFile)), node);
// domRegion = part.Region;
// }
//
// // move caret to generated code
// ITextEditorProvider provider = viewContent as ITextEditorProvider;
// if (provider != null) {
// provider.TextEditor.JumpTo(domRegion.EndLine + 2, domRegion.EndColumn - 1);
// }
// }
// return true;
// }
// }
//
// return false;
// }
} }
} }

12
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlParser.cs
Unescape View File

@ -80,18 +80,18 @@ namespace ICSharpCode.XamlBinding
IDocument document = null; IDocument document = null;
foreach (var tag in TreeTraversal.PreOrder<AXmlObject>(xmlDocument, node => node.Children).OfType<AXmlTag>().Where(t => t.IsComment)) { foreach (var tag in TreeTraversal.PreOrder<AXmlObject>(xmlDocument, node => node.Children).OfType<AXmlTag>().Where(t => t.IsComment)) {
int matchLength; int matchLength;
AXmlText comment = tag.Children.OfType<AXmlText>().First(); string commentText = fileContent.GetText(tag.StartOffset, tag.Length);
int index = comment.Value.IndexOfAny(TaskListTokens, 0, out matchLength); int index = commentText.IndexOfAny(TaskListTokens, 0, out matchLength);
if (index > -1) { if (index > -1) {
if (document == null) if (document == null)
document = fileContent as IDocument ?? new ReadOnlyDocument(fileContent, parseInfo.FileName); document = fileContent as IDocument ?? new ReadOnlyDocument(fileContent, parseInfo.FileName);
do { do {
TextLocation startLocation = document.GetLocation(comment.StartOffset + index); TextLocation startLocation = document.GetLocation(tag.StartOffset + index);
int startOffset = index + comment.StartOffset; int startOffset = index + tag.StartOffset;
int endOffset = Math.Min(document.GetLineByOffset(startOffset).EndOffset, comment.EndOffset); int endOffset = Math.Min(document.GetLineByOffset(startOffset).EndOffset, tag.EndOffset);
string content = document.GetText(startOffset, endOffset - startOffset); string content = document.GetText(startOffset, endOffset - startOffset);
parseInfo.TagComments.Add(new TagComment(content.Substring(0, matchLength), new DomRegion(parseInfo.FileName, startLocation.Line, startLocation.Column), content.Substring(matchLength))); parseInfo.TagComments.Add(new TagComment(content.Substring(0, matchLength), new DomRegion(parseInfo.FileName, startLocation.Line, startLocation.Column), content.Substring(matchLength)));
index = comment.Value.IndexOfAny(TaskListTokens, endOffset - comment.StartOffset, out matchLength); index = commentText.IndexOfAny(TaskListTokens, endOffset - tag.StartOffset, out matchLength);
} while (index > -1); } while (index > -1);
} }
} }

Write Preview
Loading…
Cancel
Save