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

Commit ab1e2b1

Browse files
authored
Merge pull request #2408 from github/fixes/remove-experimental-PR-file-margin
Remove the experimental PR file margin
2 parents 4479000 + 0db9174 commit ab1e2b1

12 files changed

+0
-385
lines changed

src/GitHub.Exports/Settings/generated/IPackageSettings.cs

-6
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
"type": "bool",
88
"default": 'true'
99
},
10-
{
11-
"name": "EditorComments",
12-
"type": "bool",
13-
"default": "false"
14-
},
1510
{
1611
"name": "UIState",
1712
"type": "object",
@@ -40,7 +35,6 @@ public interface IPackageSettings : INotifyPropertyChanged
4035
{
4136
void Save();
4237
bool CollectMetrics { get; set; }
43-
bool EditorComments { get; set; }
4438
UIState UIState { get; set; }
4539
bool HideTeamExplorerWelcomeMessage { get; set; }
4640
bool EnableTraceLogging { get; set; }

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

-10
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@
6161
<Compile Include="Commands\NextInlineCommentCommand.cs" />
6262
<Compile Include="GlobalSuppressions.cs" />
6363
<Compile Include="Margins\InlineCommentTextViewOptions.cs" />
64-
<Compile Include="Margins\PullRequestFileMargin.cs" />
65-
<Compile Include="Margins\PullRequestFileMarginProvider.cs" />
6664
<Compile Include="Glyph\GlyphData.cs" />
6765
<Compile Include="Glyph\GlyphMargin.cs" />
6866
<Compile Include="Glyph\GlyphMarginVisualManager.cs" />
@@ -97,12 +95,8 @@
9795
<Compile Include="Tags\ShowInlineCommentAnnotationGlyph.xaml.cs">
9896
<DependentUpon>ShowInlineCommentAnnotationGlyph.xaml</DependentUpon>
9997
</Compile>
100-
<Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
10198
<Compile Include="ViewModels\InlineCommentPeekViewModel.cs" />
10299
<Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
103-
<Compile Include="Views\PullRequestFileMarginView.xaml.cs">
104-
<DependentUpon>PullRequestFileMarginView.xaml</DependentUpon>
105-
</Compile>
106100
<Compile Include="Views\GlyphMarginGrid.xaml.cs">
107101
<DependentUpon>GlyphMarginGrid.xaml</DependentUpon>
108102
</Compile>
@@ -251,10 +245,6 @@
251245
<Generator>MSBuild:Compile</Generator>
252246
<SubType>Designer</SubType>
253247
</Page>
254-
<Page Include="Views\PullRequestFileMarginView.xaml">
255-
<SubType>Designer</SubType>
256-
<Generator>MSBuild:Compile</Generator>
257-
</Page>
258248
<Page Include="Views\GlyphMarginGrid.xaml">
259249
<SubType>Designer</SubType>
260250
<Generator>MSBuild:Compile</Generator>

src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs

-122
This file was deleted.

src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs

-86
This file was deleted.

src/GitHub.InlineReviews/ViewModels/PullRequestFileMarginViewModel.cs

-53
This file was deleted.

src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml

-46
This file was deleted.

src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml.cs

-13
This file was deleted.

src/GitHub.VisualStudio/Settings/OptionsPage.cs

-2
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,12 @@ protected override void OnActivate(CancelEventArgs e)
5151
void LoadSettings()
5252
{
5353
child.CollectMetrics = packageSettings.CollectMetrics;
54-
child.EditorComments = packageSettings.EditorComments;
5554
child.EnableTraceLogging = packageSettings.EnableTraceLogging;
5655
}
5756

5857
void SaveSettings()
5958
{
6059
packageSettings.CollectMetrics = child.CollectMetrics;
61-
packageSettings.EditorComments = child.EditorComments;
6260
packageSettings.EnableTraceLogging = child.EnableTraceLogging;
6361
packageSettings.Save();
6462
}

0 commit comments

Comments
 (0)