Skip to content

Commit 0ad46b3

Browse files
jbevainjbevain
committed
Spaces to tabs
1 parent 93824a1 commit 0ad46b3

14 files changed

+696
-696
lines changed

‎Adornment/EmojiAdornment.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515

1616
namespace Emoji.Adornment
1717
{
18-
internal sealed class EmojiAdornment : Image
19-
{
20-
internal EmojiAdornment(EmojiTag tag, double fontSize)
21-
{
22-
const double factor = 1.5;
18+
internal sealed class EmojiAdornment : Image
19+
{
20+
internal EmojiAdornment(EmojiTag tag, double fontSize)
21+
{
22+
const double factor = 1.5;
2323

24-
ToolTip = tag.Emoji.Name;
24+
ToolTip = tag.Emoji.Name;
2525

26-
Width = fontSize * factor;
27-
Height = fontSize * factor;
26+
Width = fontSize * factor;
27+
Height = fontSize * factor;
2828

2929
RenderOptions.SetBitmapScalingMode(this, BitmapScalingMode.HighQuality);
3030
RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
3131

3232
Update(tag);
3333
}
3434

35-
public void Update(EmojiTag tag)
36-
{
37-
Source = tag.Emoji.Bitmap();
35+
public void Update(EmojiTag tag)
36+
{
37+
Source = tag.Emoji.Bitmap();
3838
}
39-
}
39+
}
4040
}

‎Adornment/EmojiAdornmentTagger.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,31 @@
2222

2323
namespace Emoji.Adornment
2424
{
25-
internal sealed class EmojiAdornmentTagger
25+
internal sealed class EmojiAdornmentTagger
2626

2727
#if HIDING_TEXT
28-
: IntraTextAdornmentTagTransformer<EmojiTag, EmojiAdornment>
28+
: IntraTextAdornmentTagTransformer<EmojiTag, EmojiAdornment>
2929
#else
3030
: IntraTextAdornmentTagger<EmojiTag, EmojiAdornment>
3131
#endif
3232

33-
{
34-
internal static ITagger<IntraTextAdornmentTag> GetTagger(IWpfTextView view, Lazy<ITagAggregator<EmojiTag>> emojiTagger)
35-
{
36-
return view.Properties.GetOrCreateSingletonProperty<EmojiAdornmentTagger>(
37-
() => new EmojiAdornmentTagger(view, emojiTagger.Value));
38-
}
33+
{
34+
internal static ITagger<IntraTextAdornmentTag> GetTagger(IWpfTextView view, Lazy<ITagAggregator<EmojiTag>> emojiTagger)
35+
{
36+
return view.Properties.GetOrCreateSingletonProperty<EmojiAdornmentTagger>(
37+
() => new EmojiAdornmentTagger(view, emojiTagger.Value));
38+
}
3939

4040
#if HIDING_TEXT
41-
private EmojiAdornmentTagger(IWpfTextView view, ITagAggregator<EmojiTag> emojiTagger)
42-
: base(view, emojiTagger)
43-
{
44-
}
45-
46-
public override void Dispose()
47-
{
48-
base.view.Properties.RemoveProperty(typeof(EmojiAdornmentTagger));
49-
}
41+
private EmojiAdornmentTagger(IWpfTextView view, ITagAggregator<EmojiTag> emojiTagger)
42+
: base(view, emojiTagger)
43+
{
44+
}
45+
46+
public override void Dispose()
47+
{
48+
base.view.Properties.RemoveProperty(typeof(EmojiAdornmentTagger));
49+
}
5050
#else
5151
private ITagAggregator<EmojiTag> _emojiTagger;
5252

@@ -91,15 +91,15 @@ public void Dispose()
9191
}
9292
#endif
9393

94-
protected override EmojiAdornment CreateAdornment(EmojiTag dataTag, SnapshotSpan span)
95-
{
96-
return new EmojiAdornment(dataTag, ((System.Windows.Controls.Control)view).FontSize);
97-
}
98-
99-
protected override bool UpdateAdornment(EmojiAdornment adornment, EmojiTag dataTag)
100-
{
101-
adornment.Update(dataTag);
102-
return true;
103-
}
104-
}
94+
protected override EmojiAdornment CreateAdornment(EmojiTag dataTag, SnapshotSpan span)
95+
{
96+
return new EmojiAdornment(dataTag, ((System.Windows.Controls.Control)view).FontSize);
97+
}
98+
99+
protected override bool UpdateAdornment(EmojiAdornment adornment, EmojiTag dataTag)
100+
{
101+
adornment.Update(dataTag);
102+
return true;
103+
}
104+
}
105105
}

‎Adornment/EmojiAdornmentTaggerProvider.cs

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@
1919

2020
namespace Emoji.Adornment
2121
{
22-
[Export(typeof(IViewTaggerProvider))]
23-
[ContentType("text")]
24-
[ContentType("projection")]
25-
[TagType(typeof(IntraTextAdornmentTag))]
26-
internal sealed class EmojiAdornmentTaggerProvider : IViewTaggerProvider
27-
{
28-
public IBufferTagAggregatorFactoryService BufferTagAggregatorFactoryService { get; }
22+
[Export(typeof(IViewTaggerProvider))]
23+
[ContentType("text")]
24+
[ContentType("projection")]
25+
[TagType(typeof(IntraTextAdornmentTag))]
26+
internal sealed class EmojiAdornmentTaggerProvider : IViewTaggerProvider
27+
{
28+
public IBufferTagAggregatorFactoryService BufferTagAggregatorFactoryService { get; }
2929

3030
[ImportingConstructor]
31-
public EmojiAdornmentTaggerProvider(IBufferTagAggregatorFactoryService bufferTagAggregatorFactoryService)
32-
{
33-
BufferTagAggregatorFactoryService = bufferTagAggregatorFactoryService;
34-
}
31+
public EmojiAdornmentTaggerProvider(IBufferTagAggregatorFactoryService bufferTagAggregatorFactoryService)
32+
{
33+
BufferTagAggregatorFactoryService = bufferTagAggregatorFactoryService;
34+
}
3535

36-
public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag
37-
{
38-
if (textView == null)
39-
throw new ArgumentNullException(nameof(textView));
36+
public ITagger<T> CreateTagger<T>(ITextView textView, ITextBuffer buffer) where T : ITag
37+
{
38+
if (textView == null)
39+
throw new ArgumentNullException(nameof(textView));
4040

41-
if (buffer == null)
42-
throw new ArgumentNullException(nameof(buffer));
41+
if (buffer == null)
42+
throw new ArgumentNullException(nameof(buffer));
4343

44-
if (buffer != textView.TextBuffer)
45-
return null;
44+
if (buffer != textView.TextBuffer)
45+
return null;
4646

47-
return EmojiAdornmentTagger.GetTagger(
48-
(IWpfTextView)textView,
49-
new Lazy<ITagAggregator<EmojiTag>>(
50-
() => BufferTagAggregatorFactoryService.CreateTagAggregator<EmojiTag>(textView.TextBuffer)))
51-
as ITagger<T>;
52-
}
53-
}
47+
return EmojiAdornmentTagger.GetTagger(
48+
(IWpfTextView)textView,
49+
new Lazy<ITagAggregator<EmojiTag>>(
50+
() => BufferTagAggregatorFactoryService.CreateTagAggregator<EmojiTag>(textView.TextBuffer)))
51+
as ITagger<T>;
52+
}
53+
}
5454
}

‎Adornment/IntraTextAdornmentTagTransformer.cs

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -18,65 +18,65 @@
1818

1919
namespace Emoji.Adornment
2020
{
21-
/// <summary>
22-
/// Helper class for producing intra-text adornments from data tags.
23-
/// </summary>
24-
/// <remarks>
25-
/// For cases where intra-text adornments do not correspond exactly to tags,
26-
/// use the <see cref="IntraTextAdornmentTagger"/> base class.
27-
/// </remarks>
28-
internal abstract class IntraTextAdornmentTagTransformer<TDataTag, TAdornment>
29-
: IntraTextAdornmentTagger<TDataTag, TAdornment>, IDisposable
30-
where TDataTag : ITag
31-
where TAdornment : UIElement
32-
{
33-
protected readonly ITagAggregator<TDataTag> dataTagger;
34-
protected readonly PositionAffinity? adornmentAffinity;
21+
/// <summary>
22+
/// Helper class for producing intra-text adornments from data tags.
23+
/// </summary>
24+
/// <remarks>
25+
/// For cases where intra-text adornments do not correspond exactly to tags,
26+
/// use the <see cref="IntraTextAdornmentTagger"/> base class.
27+
/// </remarks>
28+
internal abstract class IntraTextAdornmentTagTransformer<TDataTag, TAdornment>
29+
: IntraTextAdornmentTagger<TDataTag, TAdornment>, IDisposable
30+
where TDataTag : ITag
31+
where TAdornment : UIElement
32+
{
33+
protected readonly ITagAggregator<TDataTag> dataTagger;
34+
protected readonly PositionAffinity? adornmentAffinity;
3535

36-
/// <param name="adornmentAffinity">Determines whether adornments based on data tags with zero-length spans
37-
/// will stick with preceding or succeeding text characters.</param>
38-
protected IntraTextAdornmentTagTransformer(IWpfTextView view, ITagAggregator<TDataTag> dataTagger, PositionAffinity adornmentAffinity = PositionAffinity.Successor)
39-
: base(view)
40-
{
41-
this.adornmentAffinity = adornmentAffinity;
42-
this.dataTagger = dataTagger;
36+
/// <param name="adornmentAffinity">Determines whether adornments based on data tags with zero-length spans
37+
/// will stick with preceding or succeeding text characters.</param>
38+
protected IntraTextAdornmentTagTransformer(IWpfTextView view, ITagAggregator<TDataTag> dataTagger, PositionAffinity adornmentAffinity = PositionAffinity.Successor)
39+
: base(view)
40+
{
41+
this.adornmentAffinity = adornmentAffinity;
42+
this.dataTagger = dataTagger;
4343

44-
this.dataTagger.TagsChanged += HandleDataTagsChanged;
45-
}
44+
this.dataTagger.TagsChanged += HandleDataTagsChanged;
45+
}
4646

47-
protected override IEnumerable<Tuple<SnapshotSpan, PositionAffinity?, TDataTag>> GetAdornmentData(NormalizedSnapshotSpanCollection spans)
48-
{
49-
if (spans.Count == 0)
50-
yield break;
47+
protected override IEnumerable<Tuple<SnapshotSpan, PositionAffinity?, TDataTag>> GetAdornmentData(NormalizedSnapshotSpanCollection spans)
48+
{
49+
if (spans.Count == 0)
50+
yield break;
5151

52-
ITextSnapshot snapshot = spans[0].Snapshot;
52+
ITextSnapshot snapshot = spans[0].Snapshot;
5353

54-
foreach (IMappingTagSpan<TDataTag> dataTagSpan in dataTagger.GetTags(spans))
55-
{
56-
NormalizedSnapshotSpanCollection dataTagSpans = dataTagSpan.Span.GetSpans(snapshot);
54+
foreach (IMappingTagSpan<TDataTag> dataTagSpan in dataTagger.GetTags(spans))
55+
{
56+
NormalizedSnapshotSpanCollection dataTagSpans = dataTagSpan.Span.GetSpans(snapshot);
5757

58-
// Ignore data tags that are split by projection.
59-
// This is theoretically possible but unlikely in current scenarios.
60-
if (dataTagSpans.Count != 1)
61-
continue;
58+
// Ignore data tags that are split by projection.
59+
// This is theoretically possible but unlikely in current scenarios.
60+
if (dataTagSpans.Count != 1)
61+
continue;
6262

63-
SnapshotSpan span = dataTagSpans[0];
63+
SnapshotSpan span = dataTagSpans[0];
6464

65-
PositionAffinity? affinity = span.Length > 0 ? null : adornmentAffinity;
65+
PositionAffinity? affinity = span.Length > 0 ? null : adornmentAffinity;
6666

67-
yield return Tuple.Create(span, affinity, dataTagSpan.Tag);
68-
}
69-
}
67+
yield return Tuple.Create(span, affinity, dataTagSpan.Tag);
68+
}
69+
}
7070

71-
private void HandleDataTagsChanged(object sender, TagsChangedEventArgs args)
72-
{
73-
var changedSpans = args.Span.GetSpans(view.TextBuffer.CurrentSnapshot);
74-
InvalidateSpans(changedSpans);
75-
}
71+
private void HandleDataTagsChanged(object sender, TagsChangedEventArgs args)
72+
{
73+
var changedSpans = args.Span.GetSpans(view.TextBuffer.CurrentSnapshot);
74+
InvalidateSpans(changedSpans);
75+
}
7676

77-
public virtual void Dispose()
78-
{
79-
dataTagger.Dispose();
80-
}
81-
}
77+
public virtual void Dispose()
78+
{
79+
dataTagger.Dispose();
80+
}
81+
}
8282
}

0 commit comments

Comments
 (0)