Use InlineCommentMarginEnabled.Key not OptionName

jcansdale · jcansdale · commit d8256bdb3341 · 2018-05-15T12:03:05.000+01:00
By using Key we can take advantage of the option's type information.
diff --git a/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs b/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs
@@ -27,16 +27,19 @@ public class ToggleInlineCommentMarginCommand : VsCommand, IToggleInlineCommentM
 
         readonly Lazy<IVsTextManager> textManager;
         readonly Lazy<IVsEditorAdaptersFactoryService> editorAdapter;
+        readonly Lazy<InlineCommentMarginEnabled> inlineCommentMarginEnabled;
         readonly Lazy<IUsageTracker> usageTracker;
 
         [ImportingConstructor]
         public ToggleInlineCommentMarginCommand(
             IGitHubServiceProvider serviceProvider,
             Lazy<IVsEditorAdaptersFactoryService> editorAdapter,
+            Lazy<InlineCommentMarginEnabled> inlineCommentMarginEnabled,
             Lazy<IUsageTracker> usageTracker) : base(CommandSet, CommandId)
         {
             textManager = new Lazy<IVsTextManager>(() => serviceProvider.GetService<SVsTextManager, IVsTextManager>());
             this.editorAdapter = editorAdapter;
+            this.inlineCommentMarginEnabled = inlineCommentMarginEnabled;
             this.usageTracker = usageTracker;
         }
 
@@ -49,8 +52,8 @@ public override Task Execute()
             {
                 var wpfTextView = editorAdapter.Value.GetWpfTextView(activeView);
                 var options = wpfTextView.Options;
-                var enabled = options.GetOptionValue<bool>(InlineCommentMarginEnabled.OptionName);
-                options.SetOptionValue(InlineCommentMarginEnabled.OptionName, !enabled);
+                var enabled = options.GetOptionValue(inlineCommentMarginEnabled.Value.Key);
+                options.SetOptionValue(inlineCommentMarginEnabled.Value.Key, !enabled);
             }
 
             return Task.CompletedTask;
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMargin.cs
@@ -24,6 +24,7 @@ public sealed class InlineCommentMargin : IWpfTextViewMargin
 
         readonly IWpfTextView textView;
         readonly IPullRequestSessionManager sessionManager;
+        readonly InlineCommentMarginEnabled inlineCommentMarginEnabled;
         readonly Grid marginGrid;
 
         GlyphMargin<InlineCommentTag> glyphMargin;
@@ -37,13 +38,15 @@ public InlineCommentMargin(
             IInlineCommentPeekService peekService,
             IEditorFormatMapService editorFormatMapService,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            Lazy<IPullRequestSessionManager> sessionManager)
+            Lazy<IPullRequestSessionManager> sessionManager,
+            InlineCommentMarginEnabled inlineCommentMarginEnabled)
         {
             textView = wpfTextViewHost.TextView;
             this.sessionManager = sessionManager.Value;
+            this.inlineCommentMarginEnabled = inlineCommentMarginEnabled;
 
             // Default to not show comment margin
-            textView.Options.SetOptionValue(InlineCommentMarginEnabled.OptionName, false);
+            textView.Options.SetOptionValue(inlineCommentMarginEnabled.Key, false);
 
             marginGrid = new GlyphMarginGrid { Width = 17.0 };
             var glyphFactory = new InlineCommentGlyphFactory(peekService, textView);
@@ -135,7 +138,7 @@ void RefreshMarginVisibility()
 
         bool IsMarginVisible()
         {
-            var enabled = textView.Options.GetOptionValue<bool>(InlineCommentMarginEnabled.OptionName);
+            var enabled = textView.Options.GetOptionValue(inlineCommentMarginEnabled.Key);
             return hasInfo || (enabled && hasChanges);
         }
     }
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMarginEnabled.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMarginEnabled.cs
@@ -9,7 +9,7 @@ namespace GitHub.InlineReviews.Margins
     [Name(OptionName)]
     public class InlineCommentMarginEnabled : ViewOptionDefinition<bool>
     {
-        public const string OptionName = "TextViewHost/InlineCommentMarginEnabled";
+        const string OptionName = "TextViewHost/InlineCommentMarginEnabled";
 
         public override bool Default => false;
 
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs
@@ -22,24 +22,28 @@ internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider
         readonly IViewTagAggregatorFactoryService tagAggregatorFactory;
         readonly IInlineCommentPeekService peekService;
         readonly Lazy<IPullRequestSessionManager> sessionManager;
+        readonly InlineCommentMarginEnabled inlineCommentMarginEnabled;
 
         [ImportingConstructor]
         public InlineCommentMarginProvider(
             IGitHubServiceProvider serviceProvider,
             IEditorFormatMapService editorFormatMapService,
             IViewTagAggregatorFactoryService tagAggregatorFactory,
-            IInlineCommentPeekService peekService)
+            IInlineCommentPeekService peekService,
+            InlineCommentMarginEnabled inlineCommentMarginEnabled)
         {
             this.editorFormatMapService = editorFormatMapService;
             this.tagAggregatorFactory = tagAggregatorFactory;
             this.peekService = peekService;
             sessionManager = new Lazy<IPullRequestSessionManager>(() => serviceProvider.GetService<IPullRequestSessionManager>());
+            this.inlineCommentMarginEnabled = inlineCommentMarginEnabled;
         }
 
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)
         {
             return new InlineCommentMargin(
-                wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager);
+                wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager,
+                inlineCommentMarginEnabled);
         }
     }
 }
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMargin.cs
@@ -38,6 +38,7 @@ public PullRequestFileMargin(
             IToggleInlineCommentMarginCommand toggleInlineCommentMarginCommand,
             IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager,
+            InlineCommentMarginEnabled inlineCommentMarginEnabled,
             Lazy<IUsageTracker> usageTracker)
         {
             this.textView = textView;
@@ -53,7 +54,7 @@ public PullRequestFileMargin(
 
             optionChangedSubscription = Observable.FromEventPattern(textView.Options, nameof(textView.Options.OptionChanged)).Subscribe(_ =>
             {
-                viewModel.MarginEnabled = textView.Options.GetOptionValue<bool>(InlineCommentMarginEnabled.OptionName);
+                viewModel.MarginEnabled = textView.Options.GetOptionValue(inlineCommentMarginEnabled.Key);
             });
 
             currentSessionSubscription = sessionManager.WhenAnyValue(x => x.CurrentSession)
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs
@@ -23,6 +23,7 @@ internal sealed class PullRequestFileMarginProvider : IWpfTextViewMarginProvider
         readonly IToggleInlineCommentMarginCommand enableInlineCommentsCommand;
         readonly IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand;
         readonly IPackageSettings packageSettings;
+        readonly InlineCommentMarginEnabled inlineCommentMarginEnabled;
         readonly Lazy<IUsageTracker> usageTracker;
 
         [ImportingConstructor]
@@ -31,12 +32,14 @@ public PullRequestFileMarginProvider(
             IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,
             IPullRequestSessionManager sessionManager,
             IPackageSettings packageSettings,
+            InlineCommentMarginEnabled inlineCommentMarginEnabled,
             Lazy<IUsageTracker> usageTracker)
         {
             this.enableInlineCommentsCommand = enableInlineCommentsCommand;
             this.goToSolutionOrPullRequestFileCommand = goToSolutionOrPullRequestFileCommand;
             this.sessionManager = sessionManager;
             this.packageSettings = packageSettings;
+            this.inlineCommentMarginEnabled = inlineCommentMarginEnabled;
             this.usageTracker = usageTracker;
         }
 
@@ -63,7 +66,8 @@ public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTex
             }
 
             return new PullRequestFileMargin(
-                wpfTextViewHost.TextView, enableInlineCommentsCommand, goToSolutionOrPullRequestFileCommand, sessionManager, usageTracker);
+                wpfTextViewHost.TextView, enableInlineCommentsCommand, goToSolutionOrPullRequestFileCommand,
+                sessionManager, inlineCommentMarginEnabled, usageTracker);
         }
 
         bool IsDiffView(ITextView textView) => textView.Roles.Contains("DIFF");

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace GitHub.InlineReviews.Margins`
`9`	`9`	`[Name(OptionName)]`
`10`	`10`	`public class InlineCommentMarginEnabled : ViewOptionDefinition<bool>`
`11`	`11`	`{`
`12`		`- public const string OptionName = "TextViewHost/InlineCommentMarginEnabled";`
	`12`	`+ const string OptionName = "TextViewHost/InlineCommentMarginEnabled";`
`13`	`13`
`14`	`14`	`public override bool Default => false;`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -22,24 +22,28 @@ internal sealed class InlineCommentMarginProvider : IWpfTextViewMarginProvider`
`22`	`22`	`readonly IViewTagAggregatorFactoryService tagAggregatorFactory;`
`23`	`23`	`readonly IInlineCommentPeekService peekService;`
`24`	`24`	`readonly Lazy<IPullRequestSessionManager> sessionManager;`
	`25`	`+ readonly InlineCommentMarginEnabled inlineCommentMarginEnabled;`
`25`	`26`
`26`	`27`	`[ImportingConstructor]`
`27`	`28`	`public InlineCommentMarginProvider(`
`28`	`29`	`IGitHubServiceProvider serviceProvider,`
`29`	`30`	`IEditorFormatMapService editorFormatMapService,`
`30`	`31`	`IViewTagAggregatorFactoryService tagAggregatorFactory,`
`31`		`- IInlineCommentPeekService peekService)`
	`32`	`+ IInlineCommentPeekService peekService,`
	`33`	`+ InlineCommentMarginEnabled inlineCommentMarginEnabled)`
`32`	`34`	`{`
`33`	`35`	`this.editorFormatMapService = editorFormatMapService;`
`34`	`36`	`this.tagAggregatorFactory = tagAggregatorFactory;`
`35`	`37`	`this.peekService = peekService;`
`36`	`38`	`sessionManager = new Lazy<IPullRequestSessionManager>(() => serviceProvider.GetService<IPullRequestSessionManager>());`
	`39`	`+ this.inlineCommentMarginEnabled = inlineCommentMarginEnabled;`
`37`	`40`	`}`
`38`	`41`
`39`	`42`	`public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)`
`40`	`43`	`{`
`41`	`44`	`return new InlineCommentMargin(`
`42`		`- wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager);`
	`45`	`+ wpfTextViewHost, peekService, editorFormatMapService, tagAggregatorFactory, sessionManager,`
	`46`	`+ inlineCommentMarginEnabled);`
`43`	`47`	`}`
`44`	`48`	`}`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public PullRequestFileMargin(`
`38`	`38`	`IToggleInlineCommentMarginCommand toggleInlineCommentMarginCommand,`
`39`	`39`	`IGoToSolutionOrPullRequestFileCommand goToSolutionOrPullRequestFileCommand,`
`40`	`40`	`IPullRequestSessionManager sessionManager,`
	`41`	`+ InlineCommentMarginEnabled inlineCommentMarginEnabled,`
`41`	`42`	`Lazy<IUsageTracker> usageTracker)`
`42`	`43`	`{`
`43`	`44`	`this.textView = textView;`
`@@ -53,7 +54,7 @@ public PullRequestFileMargin(`
`53`	`54`
`54`	`55`	`optionChangedSubscription = Observable.FromEventPattern(textView.Options, nameof(textView.Options.OptionChanged)).Subscribe(_ =>`
`55`	`56`	`{`
`56`		`- viewModel.MarginEnabled = textView.Options.GetOptionValue<bool>(InlineCommentMarginEnabled.OptionName);`
	`57`	`+ viewModel.MarginEnabled = textView.Options.GetOptionValue(inlineCommentMarginEnabled.Key);`
`57`	`58`	`});`
`58`	`59`
`59`	`60`	`currentSessionSubscription = sessionManager.WhenAnyValue(x => x.CurrentSession)`