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

Commit c1c229f

Browse files
StanleyGoldmanStanleyGoldman
committed
Undoing a lot of renaming
1 parent b24f8a2 commit c1c229f

File tree

44 files changed

+192
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+192
-192
lines changed

‎src/GitHub.Exports/Commands/IToggleInlineCommentMarginCommand.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace GitHub.Commands
2+
{
3+
public interface IToggleInlineCommentMarginCommand : IVsCommand
4+
{
5+
}
6+
}

‎src/GitHub.Exports/Commands/IToggleInlineReviewMarginCommand.cs‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ abstract class InlineCommentNavigationCommand : VsCommand<InlineCommentNavigatio
2929
static readonly ILogger log = LogManager.ForContext<InlineCommentNavigationCommand>();
3030
readonly IGitHubServiceProvider serviceProvider;
3131
readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
32-
readonly IInlineReviewPeekService peekService;
32+
readonly IInlineCommentPeekService peekService;
3333

3434
/// <summary>
3535
/// Initializes a new instance of the <see cref="InlineCommentNavigationCommand"/> class.
@@ -42,7 +42,7 @@ abstract class InlineCommentNavigationCommand : VsCommand<InlineCommentNavigatio
4242
protected InlineCommentNavigationCommand(
4343
IGitHubServiceProvider serviceProvider,
4444
IViewTagAggregatorFactoryService tagAggregatorFactory,
45-
IInlineReviewPeekService peekService,
45+
IInlineCommentPeekService peekService,
4646
Guid commandSet,
4747
int commandId)
4848
: base(commandSet, commandId)
@@ -181,13 +181,13 @@ protected IEnumerable<ITextView> GetCurrentTextViews()
181181
/// </summary>
182182
/// <param name="textView">The text view.</param>
183183
/// <returns>The tag aggregator</returns>
184-
protected ITagAggregator<InlineReviewTag> CreateTagAggregator(ITextView textView)
184+
protected ITagAggregator<InlineCommentTag> CreateTagAggregator(ITextView textView)
185185
{
186-
return tagAggregatorFactory.CreateTagAggregator<InlineReviewTag>(textView);
186+
return tagAggregatorFactory.CreateTagAggregator<InlineCommentTag>(textView);
187187
}
188188

189189
/// <summary>
190-
/// Gets the <see cref="ShowInlineReviewTag"/>s for the specified text view.
190+
/// Gets the <see cref="ShowInlineCommentTag"/>s for the specified text view.
191191
/// </summary>
192192
/// <param name="textViews">The active text views.</param>
193193
/// <returns>A collection of <see cref="ITagInfo"/> objects, ordered by line.</returns>
@@ -205,7 +205,7 @@ protected IReadOnlyList<ITagInfo> GetTags(IEnumerable<ITextView> textViews)
205205
{
206206
TextView = textView,
207207
Point = Map(x.Span.Start, textView.TextSnapshot),
208-
Tag = x.Tag as ShowInlineReviewTag,
208+
Tag = x.Tag as ShowInlineCommentTag,
209209
})
210210
.Where(x => x.Tag != null && x.Point.HasValue);
211211
result.AddRange(tags);
@@ -225,7 +225,7 @@ protected IReadOnlyList<ITagInfo> GetTags(IEnumerable<ITextView> textViews)
225225
protected void ShowPeekComments(
226226
InlineCommentNavigationParams parameter,
227227
ITextView textView,
228-
ShowInlineReviewTag tag,
228+
ShowInlineCommentTag tag,
229229
IEnumerable<ITextView> allTextViews)
230230
{
231231
foreach (var other in allTextViews)
@@ -268,14 +268,14 @@ void QueryStatus(object sender, EventArgs e)
268268
protected interface ITagInfo
269269
{
270270
ITextView TextView { get; }
271-
ShowInlineReviewTag Tag { get; }
271+
ShowInlineCommentTag Tag { get; }
272272
SnapshotPoint Point { get; }
273273
}
274274

275275
class TagInfo : ITagInfo
276276
{
277277
public ITextView TextView { get; set; }
278-
public ShowInlineReviewTag Tag { get; set; }
278+
public ShowInlineCommentTag Tag { get; set; }
279279
public SnapshotPoint? Point { get; set; }
280280

281281
SnapshotPoint ITagInfo.Point => Point.Value;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class NextInlineCommentCommand : InlineCommentNavigationCommand, INextInlineComm
3636
protected NextInlineCommentCommand(
3737
IGitHubServiceProvider serviceProvider,
3838
IViewTagAggregatorFactoryService tagAggregatorFactory,
39-
IInlineReviewPeekService peekService)
39+
IInlineCommentPeekService peekService)
4040
: base(serviceProvider, tagAggregatorFactory, peekService, CommandSet, CommandId)
4141
{
4242
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class PreviousInlineCommentCommand : InlineCommentNavigationCommand, IPreviousIn
3636
protected PreviousInlineCommentCommand(
3737
IGitHubServiceProvider serviceProvider,
3838
IViewTagAggregatorFactoryService tagAggregatorFactory,
39-
IInlineReviewPeekService peekService)
39+
IInlineCommentPeekService peekService)
4040
: base(serviceProvider, tagAggregatorFactory, peekService, CommandSet, CommandId)
4141
{
4242
}

src/GitHub.InlineReviews/Commands/ToggleInlineReviewMarginCommand.cs renamed to src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
namespace GitHub.InlineReviews.Commands
1414
{
15-
[Export(typeof(IToggleInlineReviewMarginCommand))]
16-
public class ToggleInlineReviewMarginCommand : VsCommand, IToggleInlineReviewMarginCommand
15+
[Export(typeof(IToggleInlineCommentMarginCommand))]
16+
public class ToggleInlineCommentMarginCommand : VsCommand, IToggleInlineCommentMarginCommand
1717
{
1818
/// <summary>
1919
/// Gets the GUID of the group the command belongs to.
@@ -30,7 +30,7 @@ public class ToggleInlineReviewMarginCommand : VsCommand, IToggleInlineReviewMar
3030
readonly Lazy<IUsageTracker> usageTracker;
3131

3232
[ImportingConstructor]
33-
public ToggleInlineReviewMarginCommand(
33+
public ToggleInlineCommentMarginCommand(
3434
IGitHubServiceProvider serviceProvider,
3535
Lazy<IVsEditorAdaptersFactoryService> editorAdapter,
3636
Lazy<IUsageTracker> usageTracker) : base(CommandSet, CommandId)

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Compile Include="..\common\SolutionInfo.cs">
7171
<Link>Properties\SolutionInfo.cs</Link>
7272
</Compile>
73-
<Compile Include="Commands\ToggleInlineReviewMarginCommand.cs" />
73+
<Compile Include="Commands\ToggleInlineCommentMarginCommand.cs" />
7474
<Compile Include="Commands\InlineCommentNavigationCommand.cs" />
7575
<Compile Include="Commands\PreviousInlineCommentCommand.cs" />
7676
<Compile Include="Commands\NextInlineCommentCommand.cs" />
@@ -103,10 +103,10 @@
103103
<Compile Include="Peek\InlineCommentPeekResultPresentation.cs" />
104104
<Compile Include="Peek\InlineCommentPeekResultPresenter.cs" />
105105
<Compile Include="Properties\AssemblyInfo.cs" />
106-
<Compile Include="SampleData\InlineReviewViewModelDesigner.cs" />
107-
<Compile Include="Services\IInlineReviewPeekService.cs" />
106+
<Compile Include="SampleData\CommentThreadViewModelDesigner.cs" />
107+
<Compile Include="Services\IInlineCommentPeekService.cs" />
108108
<Compile Include="Services\IPullRequestSessionService.cs" />
109-
<Compile Include="Services\InlineReviewPeekService.cs" />
109+
<Compile Include="Services\InlineCommentPeekService.cs" />
110110
<Compile Include="Services\PullRequestSession.cs" />
111111
<Compile Include="Services\PullRequestSessionManager.cs" />
112112
<Compile Include="Margins\InlineCommentMarginProvider.cs" />
@@ -121,11 +121,11 @@
121121
<Compile Include="ViewModels\InlineAnnotationViewModel.cs" />
122122
<Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
123123
<Compile Include="ViewModels\CommentViewModel.cs" />
124-
<Compile Include="ViewModels\IInlineReviewViewModel.cs" />
125-
<Compile Include="ViewModels\InlineReviewViewModel.cs" />
126-
<Compile Include="ViewModels\InlineReviewPeekViewModel.cs" />
124+
<Compile Include="ViewModels\ICommentThreadViewModel.cs" />
125+
<Compile Include="ViewModels\CommentThreadViewModel.cs" />
126+
<Compile Include="ViewModels\InlineCommentPeekViewModel.cs" />
127127
<Compile Include="ViewModels\IPullRequestReviewCommentViewModel.cs" />
128-
<Compile Include="ViewModels\NewCommentThreadInlineReviewViewModel.cs" />
128+
<Compile Include="ViewModels\NewInlineCommentThreadViewModel.cs" />
129129
<Compile Include="ViewModels\PullRequestReviewCommentViewModel.cs" />
130130
<Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
131131
<Compile Include="Views\InlineAnnotationView.xaml.cs">
@@ -150,15 +150,15 @@
150150
<Compile Include="Tags\ShowInlineCommentGlyph.xaml.cs">
151151
<DependentUpon>ShowInlineCommentGlyph.xaml</DependentUpon>
152152
</Compile>
153-
<Compile Include="Tags\InlineGlyphFactory.cs" />
154-
<Compile Include="Tags\InlineReviewTag.cs" />
155-
<Compile Include="Tags\ShowInlineReviewTag.cs" />
156-
<Compile Include="Tags\InlineReviewTagger.cs" />
153+
<Compile Include="Tags\InlineCommentGlyphFactory.cs" />
154+
<Compile Include="Tags\InlineCommentTag.cs" />
155+
<Compile Include="Tags\ShowInlineCommentTag.cs" />
156+
<Compile Include="Tags\InlineCommentTagger.cs" />
157157
<Compile Include="Tags\InlineCommentTaggerProvider.cs" />
158-
<Compile Include="ViewModels\CommentThreadInlineReviewViewModel.cs" />
158+
<Compile Include="ViewModels\InlineCommentThreadViewModel.cs" />
159159
<Compile Include="ViewModels\ICommentViewModel.cs" />
160-
<Compile Include="Views\InlineReviewView.xaml.cs">
161-
<DependentUpon>InlineReviewView.xaml</DependentUpon>
160+
<Compile Include="Views\CommentThreadView.xaml.cs">
161+
<DependentUpon>CommentThreadView.xaml</DependentUpon>
162162
</Compile>
163163
<Compile Include="Views\CommentView.xaml.cs">
164164
<DependentUpon>CommentView.xaml</DependentUpon>
@@ -488,7 +488,7 @@
488488
<Generator>MSBuild:Compile</Generator>
489489
<SubType>Designer</SubType>
490490
</Page>
491-
<Page Include="Views\InlineReviewView.xaml">
491+
<Page Include="Views\CommentThreadView.xaml">
492492
<Generator>MSBuild:Compile</Generator>
493493
<SubType>Designer</SubType>
494494
</Page>

‎src/GitHub.InlineReviews/InlineReviewsPackage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async Task InitializeMenus()
5050
{
5151
exports.GetExportedValue<INextInlineCommentCommand>(),
5252
exports.GetExportedValue<IPreviousInlineCommentCommand>(),
53-
exports.GetExportedValue<IToggleInlineReviewMarginCommand>()
53+
exports.GetExportedValue<IToggleInlineCommentMarginCommand>()
5454
};
5555

5656
await JoinableTaskFactory.SwitchToMainThreadAsync();

‎src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ public sealed class InlineCommentMargin : IWpfTextViewMargin
2525
readonly IPullRequestSessionManager sessionManager;
2626
readonly Grid marginGrid;
2727

28-
GlyphMargin<InlineReviewTag> glyphMargin;
28+
GlyphMargin<InlineCommentTag> glyphMargin;
2929
IDisposable currentSessionSubscription;
3030
IDisposable visibleSubscription;
3131
bool hasChanges;
3232
bool hasInfo;
3333

3434
public InlineCommentMargin(
3535
IWpfTextViewHost wpfTextViewHost,
36-
IInlineReviewPeekService peekService,
36+
IInlineCommentPeekService peekService,
3737
IEditorFormatMapService editorFormatMapService,
3838
IViewTagAggregatorFactoryService tagAggregatorFactory,
3939
Lazy<IPullRequestSessionManager> sessionManager)
@@ -45,10 +45,10 @@ public InlineCommentMargin(
4545
textView.Options.SetOptionValue(InlineCommentTextViewOptions.MarginEnabledId, false);
4646

4747
marginGrid = new GlyphMarginGrid { Width = 17.0 };
48-
var glyphFactory = new InlineGlyphFactory(peekService, textView);
48+
var glyphFactory = new InlineCommentGlyphFactory(peekService, textView);
4949
var editorFormatMap = editorFormatMapService.GetEditorFormatMap(textView);
5050

51-
glyphMargin = new GlyphMargin<InlineReviewTag>(textView, glyphFactory, marginGrid, tagAggregatorFactory,
51+
glyphMargin = new GlyphMargin<InlineCommentTag>(textView, glyphFactory, marginGrid, tagAggregatorFactory,
5252
editorFormatMap, MarginPropertiesName);
5353

5454
if (IsDiffView())

‎src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
2121
{
2222
readonly Lazy<IEditorFormatMapService> editorFormatMapService;
2323
readonly Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory;
24-
readonly Lazy<IInlineReviewPeekService> peekService;
24+
readonly Lazy<IInlineCommentPeekService> peekService;
2525
readonly Lazy<IPullRequestSessionManager> sessionManager;
2626
readonly UIContext uiContext;
2727

@@ -30,7 +30,7 @@ public InlineCommentMarginProvider(
3030
Lazy<IPullRequestSessionManager> sessionManager,
3131
Lazy<IEditorFormatMapService> editorFormatMapService,
3232
Lazy<IViewTagAggregatorFactoryService> tagAggregatorFactory,
33-
Lazy<IInlineReviewPeekService> peekService)
33+
Lazy<IInlineCommentPeekService> peekService)
3434
{
3535
this.sessionManager = sessionManager;
3636
this.editorFormatMapService = editorFormatMapService;

0 commit comments

Comments
 (0)