Skip to content

Allow passing IncludeBracket to XmlSchemaCompletionBuilder #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KirillOsenkov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Allow passing IncludeBracket to XmlSchemaCompletionBuilder #100

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff8f3f
Allow passing IncludeBracket to XmlSchemaCompletionBuilder
KirillOsenkov Dec 1, 2024
3801090
Fix wrong edit
KirillOsenkov Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions Editor/Completion/XmlSchemaCompletionBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion.Data;
using Microsoft.VisualStudio.Language.Intellisense.AsyncCompletion;
using Microsoft.VisualStudio.Text.Adornments;

namespace MonoDevelop.Xml.Editor.Completion
{
Expand All @@ -43,6 +44,8 @@ class XmlSchemaCompletionBuilder
readonly XmlNamespacePrefixMap nsMap;
readonly IAsyncCompletionSource source;

public bool IncludeBracket { get; set; }

public XmlSchemaCompletionBuilder (IAsyncCompletionSource source, XmlNamespacePrefixMap nsMap)
{
this.nsMap = nsMap;
Expand Down Expand Up @@ -120,7 +123,7 @@ public XmlSchemaCompletionBuilder AddElement (string name, string prefix, string
if (!names.Add (name))
return this;

var item = new CompletionItem (name, source, XmlImages.Element);
var item = CreateItem (name, XmlImages.Element);
item.AddDocumentation (documentation);
items.Add (item);
return this;
Expand All @@ -139,7 +142,7 @@ public XmlSchemaCompletionBuilder AddElement (string name, string prefix, XmlSch
if (!names.Add (name))
return this;

var item = new CompletionItem (name, source, XmlImages.Element);
var item = CreateItem (name, XmlImages.Element);
if (annotation is not null) {
item.AddDocumentation (annotation);
}
Expand All @@ -148,6 +151,22 @@ public XmlSchemaCompletionBuilder AddElement (string name, string prefix, XmlSch
}

public ImmutableArray<CompletionItem> GetItems () => ImmutableArray<CompletionItem>.Empty.AddRange (items);

CompletionItem CreateItem(string name, ImageElement image)
{
var item = new CompletionItem(
displayText: name,
source: source,
icon: image,
filters: [],
suffix: string.Empty,
insertText: IncludeBracket ? "<" + name : name,
sortText: name,
filterText: name,
attributeIcons: [])
.AddKind(XmlCompletionItemKind.Element);
return item;
}
}
}