Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 18973dc

Browse files
paladiquepaladique
authored
Merge branch 'master' into fixes/726-markdig
2 parents a3cbd9a + 21c38f1 commit 18973dc

File tree

14 files changed

+232
-21
lines changed

14 files changed

+232
-21
lines changed

‎src/GitHub.App/Factories/HostCacheFactory.cs‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
using System;
22
using System.ComponentModel.Composition;
33
using System.IO;
4+
using System.Reactive.Linq;
45
using Akavache;
56
using GitHub.Primitives;
67
using Rothko;
78
using GitHub.Extensions;
9+
using System.Threading.Tasks;
810

911
namespace GitHub.Factories
1012
{
1113
[Export(typeof(IHostCacheFactory))]
1214
[PartCreationPolicy(CreationPolicy.Shared)]
1315
public class HostCacheFactory : IHostCacheFactory
1416
{
17+
const int CacheVersion = 1;
18+
const string CacheVersionKey = "cacheVersion";
19+
1520
readonly Lazy<IBlobCacheFactory> blobCacheFactory;
1621
readonly Lazy<IOperatingSystem> operatingSystem;
1722

@@ -22,7 +27,7 @@ public HostCacheFactory(Lazy<IBlobCacheFactory> blobCacheFactory, Lazy<IOperatin
2227
this.operatingSystem = operatingSystem;
2328
}
2429

25-
public IBlobCache Create(HostAddress hostAddress)
30+
public async Task<IBlobCache> Create(HostAddress hostAddress)
2631
{
2732
var environment = OperatingSystem.Environment;
2833
// For GitHub.com, the cache file name should be "api.github.com.cache.db"
@@ -34,7 +39,17 @@ public IBlobCache Create(HostAddress hostAddress)
3439

3540
// CreateDirectory is a noop if the directory already exists.
3641
OperatingSystem.Directory.CreateDirectory(Path.GetDirectoryName(userAccountPath));
37-
return BlobCacheFactory.CreateBlobCache(userAccountPath);
42+
43+
var cache = BlobCacheFactory.CreateBlobCache(userAccountPath);
44+
var version = await cache.GetOrCreateObject<int>(CacheVersionKey, () => 0);
45+
46+
if (version != CacheVersion)
47+
{
48+
await cache.InvalidateAll();
49+
await cache.InsertObject(CacheVersionKey, CacheVersion);
50+
}
51+
52+
return cache;
3853
}
3954

4055
IOperatingSystem OperatingSystem { get { return operatingSystem.Value; } }

‎src/GitHub.App/Factories/IHostCacheFactory.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using Akavache;
22
using GitHub.Primitives;
33
using System;
4+
using System.Threading.Tasks;
45

56
namespace GitHub.Factories
67
{
78
public interface IHostCacheFactory : IDisposable
89
{
9-
IBlobCache Create(HostAddress hostAddress);
10+
Task<IBlobCache> Create(HostAddress hostAddress);
1011
}
1112
}

‎src/GitHub.App/Factories/RepositoryHostFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public RepositoryHostFactory(
4444
public async Task<IRepositoryHost> Create(HostAddress hostAddress)
4545
{
4646
var apiClient = await apiClientFactory.Create(hostAddress);
47-
var hostCache = hostCacheFactory.Create(hostAddress);
47+
var hostCache = await hostCacheFactory.Create(hostAddress);
4848
var modelService = new ModelService(apiClient, hostCache, avatarProvider);
4949
var host = new RepositoryHost(apiClient, modelService, loginManager, loginCache, usage);
5050
hosts.Add(host);

‎src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,17 @@ public override void Initialize(ViewWithData data)
128128

129129
IsBusy = true;
130130
repositoryHost.ModelService.GetRepositories(repositories);
131-
repositories.OriginalCompleted.Subscribe(
132-
_ => { }
133-
, ex =>
134-
{
135-
LoadingFailed = true;
136-
IsBusy = false;
137-
log.Error("Error while loading repositories", ex);
138-
},
139-
() => IsBusy = false
131+
repositories.OriginalCompleted
132+
.ObserveOn(RxApp.MainThreadScheduler)
133+
.Subscribe(
134+
_ => { }
135+
, ex =>
136+
{
137+
LoadingFailed = true;
138+
IsBusy = false;
139+
log.Error("Error while loading repositories", ex);
140+
},
141+
() => IsBusy = false
140142
);
141143
repositories.Subscribe();
142144
}

‎src/GitHub.Exports/Models/DiffUtilities.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ public static DiffLine Match(IEnumerable<DiffChunk> diff, IList<DiffLine> target
9696
{
9797
if (source.Lines[i].Content == target[j].Content)
9898
{
99-
if (++j == target.Count) return source.Lines[i + j - 1];
99+
if (++j == target.Count || i == 0)
100+
{
101+
return source.Lines[i + j - 1];
102+
}
100103
}
101104
else
102105
{

‎src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public override bool IsEnabled
4949
get
5050
{
5151
var tags = GetTags(GetCurrentTextViews());
52-
return tags.Count > 1;
52+
return tags.Count > 0;
5353
}
5454
}
5555

‎src/GitHub.InlineReviews/GitHub.InlineReviews.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<Compile Include="InlineReviewsPackage.cs" />
8383
<Compile Include="Models\InlineCommentThreadModel.cs" />
8484
<Compile Include="Models\PullRequestSessionFile.cs" />
85+
<Compile Include="Tags\MouseEnterAndLeaveEventRouter.cs" />
8586
<Compile Include="Peek\InlineCommentPeekableItem.cs" />
8687
<Compile Include="Peek\InlineCommentPeekableItemSource.cs" />
8788
<Compile Include="Peek\InlineCommentPeekableItemSourceProvider.cs" />

‎src/GitHub.InlineReviews/InlineCommentMarginProvider.cs‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.Windows;
23
using System.Windows.Controls;
34
using System.ComponentModel.Composition;
45
using Microsoft.VisualStudio.Utilities;
@@ -10,7 +11,6 @@
1011
using GitHub.InlineReviews.Glyph;
1112
using GitHub.InlineReviews.Services;
1213
using GitHub.InlineReviews.Views;
13-
using GitHub.Models;
1414
using GitHub.Services;
1515

1616
namespace GitHub.InlineReviews
@@ -58,8 +58,21 @@ IWpfTextViewMargin CreateMargin<TGlyphTag>(IGlyphFactory<TGlyphTag> glyphFactory
5858
IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent, IEditorFormatMap editorFormatMap) where TGlyphTag : ITag
5959
{
6060
var tagAggregator = tagAggregatorFactory.CreateTagAggregator<TGlyphTag>(wpfTextViewHost.TextView);
61-
return new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator, editorFormatMap,
61+
var margin = new GlyphMargin<TGlyphTag>(wpfTextViewHost, glyphFactory, gridFactory, tagAggregator, editorFormatMap,
6262
IsMarginVisible, MarginPropertiesName, MarginName, true, 17.0);
63+
64+
TrackCommentGlyphOnDiffView(wpfTextViewHost, margin.VisualElement);
65+
return margin;
66+
}
67+
68+
void TrackCommentGlyphOnDiffView(IWpfTextViewHost host, UIElement marginElement)
69+
{
70+
var textView = host.TextView;
71+
if (textView.Roles.Contains("DIFF"))
72+
{
73+
var router = new MouseEnterAndLeaveEventRouter<AddInlineCommentGlyph>();
74+
router.Add(host.HostControl, marginElement);
75+
}
6376
}
6477

6578
bool IsMarginVisible(ITextBuffer buffer)

‎src/GitHub.InlineReviews/Tags/MouseEnterAndLeaveEventRouter.cs‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
using System;
2+
using System.Windows;
3+
using System.Windows.Controls;
4+
using System.Windows.Input;
5+
6+
namespace GitHub.InlineReviews.Tags
7+
{
8+
class MouseEnterAndLeaveEventRouter<T> where T : FrameworkElement
9+
{
10+
T previousMouseOverElement;
11+
12+
public void Add(UIElement sourceElement, UIElement targetElement)
13+
{
14+
sourceElement.MouseMove += (t, e) => MouseMove(targetElement, e);
15+
sourceElement.MouseLeave += (t, e) => MouseLeave(targetElement, e);
16+
}
17+
18+
void MouseMove(object target, MouseEventArgs e)
19+
{
20+
T mouseOverElement = null;
21+
Action<T> visitAction = element =>
22+
{
23+
mouseOverElement = element;
24+
};
25+
26+
var visitor = new Visitor(e, visitAction);
27+
visitor.Visit(target);
28+
29+
if (mouseOverElement != previousMouseOverElement)
30+
{
31+
MouseLeave(previousMouseOverElement, e);
32+
MouseEnter(mouseOverElement, e);
33+
}
34+
}
35+
36+
void MouseLeave(object target, MouseEventArgs e)
37+
{
38+
MouseLeave(previousMouseOverElement, e);
39+
}
40+
41+
void MouseEnter(T element, MouseEventArgs e)
42+
{
43+
element?.RaiseEvent(new MouseEventArgs(e.MouseDevice, e.Timestamp)
44+
{
45+
RoutedEvent = Mouse.MouseEnterEvent,
46+
});
47+
48+
previousMouseOverElement = element;
49+
}
50+
51+
void MouseLeave(T element, MouseEventArgs e)
52+
{
53+
element?.RaiseEvent(new MouseEventArgs(e.MouseDevice, e.Timestamp)
54+
{
55+
RoutedEvent = Mouse.MouseLeaveEvent,
56+
});
57+
58+
previousMouseOverElement = null;
59+
}
60+
61+
class Visitor
62+
{
63+
MouseEventArgs mouseEventArgs;
64+
Action<T> action;
65+
66+
internal Visitor(MouseEventArgs mouseEventArgs, Action<T> action)
67+
{
68+
this.mouseEventArgs = mouseEventArgs;
69+
this.action = action;
70+
}
71+
72+
internal void Visit(object obj)
73+
{
74+
if (obj is Panel)
75+
{
76+
Visit((Panel)obj);
77+
return;
78+
}
79+
80+
if (obj is T)
81+
{
82+
Visit((T)obj);
83+
return;
84+
}
85+
}
86+
87+
internal void Visit(Panel panel)
88+
{
89+
foreach (var child in panel.Children)
90+
{
91+
Visit(child);
92+
}
93+
}
94+
95+
internal void Visit(T element)
96+
{
97+
var point = mouseEventArgs.GetPosition(element);
98+
if (point.Y >= 0 && point.Y < element.ActualHeight)
99+
{
100+
action(element);
101+
}
102+
}
103+
}
104+
}
105+
}

‎src/GitHub.UI/GitHub.UI.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
<Compile Include="Helpers\LoadingResourceDictionary.cs" />
9595
<Compile Include="Helpers\ScrollViewerUtilities.cs" />
9696
<Compile Include="Helpers\SharedDictionaryManager.cs" />
97+
<Compile Include="Helpers\TreeViewExtensions.cs" />
9798
<Compile Include="Resources.Designer.cs">
9899
<AutoGen>True</AutoGen>
99100
<DesignTime>True</DesignTime>

0 commit comments

Comments
 (0)