Keep CA happy - take 2

jcansdale · jcansdale · commit 9ef8675946ac · 2018-05-01T19:40:30.000+01:00
diff --git a/src/GitHub.InlineReviews/Margins/CommentsMargin.cs b/src/GitHub.InlineReviews/Margins/CommentsMargin.cs
@@ -24,7 +24,6 @@ internal class CommentsMargin : IWpfTextViewMargin
         readonly CommentsMarginViewModel viewModel;
         readonly CommentsMarginView visualElement;
         readonly IPullRequestSessionManager sessionManager;
-        readonly IPullRequestEditorService pullRequestEditorService;
 
         bool isDisposed;
 
@@ -36,12 +35,10 @@ public CommentsMargin(
             IWpfTextView textView,
             IEnableInlineCommentsCommand enableInlineCommentsCommand,
             IOpenFileInSolutionCommand openFileInSolutionCommand,
-            IPullRequestSessionManager sessionManager,
-            IPullRequestEditorService pullRequestEditorService)
+            IPullRequestSessionManager sessionManager)
         {
             this.textView = textView;
             this.sessionManager = sessionManager;
-            this.pullRequestEditorService = pullRequestEditorService;
 
             viewModel = new CommentsMarginViewModel(enableInlineCommentsCommand, openFileInSolutionCommand);
             visualElement = new CommentsMarginView { DataContext = viewModel, ClipToBounds = true };
diff --git a/src/GitHub.InlineReviews/Margins/CommentsMarginProvider.cs b/src/GitHub.InlineReviews/Margins/CommentsMarginProvider.cs
@@ -21,7 +21,6 @@ namespace GitHub.InlineReviews.Margins
     internal sealed class CommentsMarginFactory : IWpfTextViewMarginProvider
     {
         readonly IPullRequestSessionManager sessionManager;
-        readonly IPullRequestEditorService pullRequestEditorService;
         readonly IEnableInlineCommentsCommand enableInlineCommentsCommand;
         readonly IOpenFileInSolutionCommand openFileInSolutionCommand;
         readonly IPackageSettings packageSettings;
@@ -31,13 +30,11 @@ public CommentsMarginFactory(
             IEnableInlineCommentsCommand enableInlineCommentsCommand,
             IOpenFileInSolutionCommand openFileInSolutionCommand,
             IPullRequestSessionManager sessionManager,
-            IPullRequestEditorService pullRequestEditorService,
             IPackageSettings packageSettings)
         {
             this.enableInlineCommentsCommand = enableInlineCommentsCommand;
             this.openFileInSolutionCommand = openFileInSolutionCommand;
             this.sessionManager = sessionManager;
-            this.pullRequestEditorService = pullRequestEditorService;
             this.packageSettings = packageSettings;
         }
 
@@ -64,7 +61,7 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
             }
 
             return new CommentsMargin(wpfTextViewHost.TextView, enableInlineCommentsCommand, openFileInSolutionCommand,
-                sessionManager, pullRequestEditorService);
+                sessionManager);
         }
 
         bool IsDiffView(ITextView textView) => textView.Roles.Contains("DIFF");
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs
@@ -17,15 +17,12 @@
 
 namespace GitHub.InlineReviews.Margins
 {
-    public class InlineCommentMargin : IWpfTextViewMargin
+    public sealed class InlineCommentMargin : IWpfTextViewMargin
     {
         public const string MarginName = "InlineComment";
         const string MarginPropertiesName = "Indicator Margin"; // Same background color as Glyph margin 
 
         readonly IWpfTextView textView;
-        readonly IInlineCommentPeekService peekService;
-        readonly IEditorFormatMapService editorFormatMapService;
-        readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
         readonly IPullRequestSessionManager sessionManager;
         readonly Grid marginGrid;
 
@@ -40,13 +37,9 @@ public InlineCommentMargin(
             IInlineCommentPeekService peekService,
             IEditorFormatMapService editorFormatMapService,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IPackageSettings packageSettings,
             Lazy<IPullRequestSessionManager> sessionManager)
         {
             textView = wpfTextViewHost.TextView;
-            this.peekService = peekService;
-            this.editorFormatMapService = editorFormatMapService;
-            this.tagAggregatorFactory = tagAggregatorFactory;
             this.sessionManager = sessionManager.Value;
 
             // Default to not show comment margin
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs
@@ -18,33 +18,28 @@ namespace GitHub.InlineReviews.Margins
     [TextViewRole(PredefinedTextViewRoles.Interactive)]
     internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
     {
-        readonly IGitHubServiceProvider serviceProvider;
         readonly IEditorFormatMapService editorFormatMapService;
         readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
         readonly IInlineCommentPeekService peekService;
-        readonly IPackageSettings packageSettings;
         readonly Lazy<IPullRequestSessionManager> sessionManager;
 
         [ImportingConstructor]
         public InlineCommentMarginProvider(
             IGitHubServiceProvider serviceProvider,
             IEditorFormatMapService editorFormatMapService,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService,
-            IPackageSettings packageSettings)
+            IInlineCommentPeekService peekService)
         {
-            this.serviceProvider = serviceProvider;
             this.editorFormatMapService = editorFormatMapService;
             this.tagAggregatorFactory = tagAggregatorFactory;
             this.peekService = peekService;
-            this.packageSettings = packageSettings;
             sessionManager = new Lazy<IPullRequestSessionManager>(() => serviceProvider.GetService<IPullRequestSessionManager>());
         }
 
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)
         {
             return new InlineCommentMargin(
-                wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, packageSettings, sessionManager);
+                wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ namespace GitHub.InlineReviews.Margins`
`21`	`21`	`internal sealed class CommentsMarginFactory : IWpfTextViewMarginProvider`
`22`	`22`	`{`
`23`	`23`	`readonly IPullRequestSessionManager sessionManager;`
`24`		`- readonly IPullRequestEditorService pullRequestEditorService;`
`25`	`24`	`readonly IEnableInlineCommentsCommand enableInlineCommentsCommand;`
`26`	`25`	`readonly IOpenFileInSolutionCommand openFileInSolutionCommand;`
`27`	`26`	`readonly IPackageSettings packageSettings;`
`@@ -31,13 +30,11 @@ public CommentsMarginFactory(`
`31`	`30`	`IEnableInlineCommentsCommand enableInlineCommentsCommand,`
`32`	`31`	`IOpenFileInSolutionCommand openFileInSolutionCommand,`
`33`	`32`	`IPullRequestSessionManager sessionManager,`
`34`		`- IPullRequestEditorService pullRequestEditorService,`
`35`	`33`	`IPackageSettings packageSettings)`
`36`	`34`	`{`
`37`	`35`	`this.enableInlineCommentsCommand = enableInlineCommentsCommand;`
`38`	`36`	`this.openFileInSolutionCommand = openFileInSolutionCommand;`
`39`	`37`	`this.sessionManager = sessionManager;`
`40`		`- this.pullRequestEditorService = pullRequestEditorService;`
`41`	`38`	`this.packageSettings = packageSettings;`
`42`	`39`	`}`
`43`	`40`
`@@ -64,7 +61,7 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`return new CommentsMargin(wpfTextViewHost.TextView, enableInlineCommentsCommand, openFileInSolutionCommand,`
`67`		`- sessionManager, pullRequestEditorService);`
	`64`	`+ sessionManager);`
`68`	`65`	`}`
`69`	`66`
`70`	`67`	`bool IsDiffView(ITextView textView) => textView.Roles.Contains("DIFF");`
Original file line number	Diff line number	Diff line change
`@@ -18,33 +18,28 @@ namespace GitHub.InlineReviews.Margins`
`18`	`18`	`[TextViewRole(PredefinedTextViewRoles.Interactive)]`
`19`	`19`	`internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider`
`20`	`20`	`{`
`21`		`- readonly IGitHubServiceProvider serviceProvider;`
`22`	`21`	`readonly IEditorFormatMapService editorFormatMapService;`
`23`	`22`	`readonly IViewTagAggregatorFactoryService tagAggregatorFactory;`
`24`	`23`	`readonly IInlineCommentPeekService peekService;`
`25`		`- readonly IPackageSettings packageSettings;`
`26`	`24`	`readonly Lazy<IPullRequestSessionManager> sessionManager;`
`27`	`25`
`28`	`26`	`[ImportingConstructor]`
`29`	`27`	`public InlineCommentMarginProvider(`
`30`	`28`	`IGitHubServiceProvider serviceProvider,`
`31`	`29`	`IEditorFormatMapService editorFormatMapService,`
`32`	`30`	`IViewTagAggregatorFactoryService tagAggregatorFactory,`
`33`		`- IInlineCommentPeekService peekService,`
`34`		`- IPackageSettings packageSettings)`
	`31`	`+ IInlineCommentPeekService peekService)`
`35`	`32`	`{`
`36`		`- this.serviceProvider = serviceProvider;`
`37`	`33`	`this.editorFormatMapService = editorFormatMapService;`
`38`	`34`	`this.tagAggregatorFactory = tagAggregatorFactory;`
`39`	`35`	`this.peekService = peekService;`
`40`		`- this.packageSettings = packageSettings;`
`41`	`36`	`sessionManager = new Lazy<IPullRequestSessionManager>(() => serviceProvider.GetService<IPullRequestSessionManager>());`
`42`	`37`	`}`
`43`	`38`
`44`	`39`	`public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)`
`45`	`40`	`{`
`46`	`41`	`return new InlineCommentMargin(`
`47`		`- wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, packageSettings, sessionManager);`
	`42`	`+ wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager);`
`48`	`43`	`}`
`49`	`44`	`}`
`50`	`45`	`}`