Merge pull request #2408 from github/fixes/remove-experimental-PR-fil…

…e-margin Remove the experimental PR file margin
github · Mar 17, 2020 · ab1e2b1 · ab1e2b1
2 parents 4479000 + 0db9174
commit ab1e2b1
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 385 deletions.
diff --git a/src/GitHub.Exports/Settings/generated/IPackageSettings.cs b/src/GitHub.Exports/Settings/generated/IPackageSettings.cs
@@ -7,11 +7,6 @@
       "type": "bool",
       "default": 'true'
     },
-    {
-      "name": "EditorComments",
-      "type": "bool",
-      "default": "false"
-    },
     {
       "name": "UIState",
       "type": "object",
@@ -40,7 +35,6 @@ public interface IPackageSettings : INotifyPropertyChanged
     {
         void Save();
         bool CollectMetrics { get; set; }
-        bool EditorComments { get; set; }
         UIState UIState { get; set; }
         bool HideTeamExplorerWelcomeMessage { get; set; }
         bool EnableTraceLogging { get; set; }

diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -61,8 +61,6 @@
     <Compile Include="Commands\NextInlineCommentCommand.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Margins\InlineCommentTextViewOptions.cs" />
-    <Compile Include="Margins\PullRequestFileMargin.cs" />
-    <Compile Include="Margins\PullRequestFileMarginProvider.cs" />
     <Compile Include="Glyph\GlyphData.cs" />
     <Compile Include="Glyph\GlyphMargin.cs" />
     <Compile Include="Glyph\GlyphMarginVisualManager.cs" />
@@ -97,12 +95,8 @@
     <Compile Include="Tags\ShowInlineCommentAnnotationGlyph.xaml.cs">
       <DependentUpon>ShowInlineCommentAnnotationGlyph.xaml</DependentUpon>
     </Compile>
-    <Compile Include="ViewModels\PullRequestFileMarginViewModel.cs" />
     <Compile Include="ViewModels\InlineCommentPeekViewModel.cs" />
     <Compile Include="ViewModels\PullRequestStatusViewModel.cs" />
-    <Compile Include="Views\PullRequestFileMarginView.xaml.cs">
-      <DependentUpon>PullRequestFileMarginView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\GlyphMarginGrid.xaml.cs">
       <DependentUpon>GlyphMarginGrid.xaml</DependentUpon>
     </Compile>
@@ -251,10 +245,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\PullRequestFileMarginView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Views\GlyphMarginGrid.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs
diff --git a/src/GitHub.InlineReviews/ViewModels/PullRequestFileMarginViewModel.cs b/src/GitHub.InlineReviews/ViewModels/PullRequestFileMarginViewModel.cs
diff --git a/src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml b/src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml
diff --git a/src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml.cs b/src/GitHub.InlineReviews/Views/PullRequestFileMarginView.xaml.cs
diff --git a/src/GitHub.VisualStudio/Settings/OptionsPage.cs b/src/GitHub.VisualStudio/Settings/OptionsPage.cs
@@ -51,14 +51,12 @@ protected override void OnActivate(CancelEventArgs e)
         void LoadSettings()
         {
             child.CollectMetrics = packageSettings.CollectMetrics;
-            child.EditorComments = packageSettings.EditorComments;
             child.EnableTraceLogging = packageSettings.EnableTraceLogging;
         }
 
         void SaveSettings()
         {
             packageSettings.CollectMetrics = child.CollectMetrics;
-            packageSettings.EditorComments = child.EditorComments;
             packageSettings.EnableTraceLogging = child.EnableTraceLogging;
             packageSettings.Save();
         }