Better preview strings.

src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs

@@ -27,24 +27,92 @@ internal override bool ShouldPersistOption(OptionKey key)
 
         #region "Preview Text"
 
-        private static readonly string s_declarationPreviewTrue = @"
+        private static readonly string s_fieldDeclarationPreviewTrue = @"
 class C{
-    int x;
+    int capacity;
     void foo()
     {
 //[
-        this.x = 0;
+        this.capacity = 0;
 //]
     }
 }";
 
-        private static readonly string s_declarationPreviewFalse = @"
+        private static readonly string s_fieldDeclarationPreviewFalse = @"
 class C{
-    int x;
+    int capacity;
     void foo()
     {
 //[
-        x = 0;
+        capacity = 0;
+//]
+    }
+}";
+
+        private static readonly string s_propertyDeclarationPreviewTrue = @"
+class C{
+    public int Id { get; set; }
+    void foo()
+    {
+//[
+        this.Id = 0;
+//]
+    }
+}";
+
+        private static readonly string s_propertyDeclarationPreviewFalse = @"
+class C{
+    public int Id { get; set; }
+    void foo()
+    {
+//[
+        Id = 0;
+//]
+    }
+}";
+
+        private static readonly string s_eventDeclarationPreviewTrue = @"
+using System;
+class C{
+    event EventHandler e;
+    void Handler(object sender, EventArgs args)
+    {
+//[
+        this.e += Handler;
+//]
+    }
+}";
+
+        private static readonly string s_eventDeclarationPreviewFalse = @"
+using System;
+class C{
+    event EventHandler e;
+    void Handler(object sender, EventArgs args)
+    {
+//[
+        e += Handler;
+//]
+    }
+}";
+
+        private static readonly string s_methodDeclarationPreviewTrue = @"
+using System;
+class C{
+    void Display()
+    {
+//[
+        this.Display();
+//]
+    }
+}";
+
+        private static readonly string s_methodDeclarationPreviewFalse = @"
+using System;
+class C{
+    void Display()
+    {
+//[
+        Display();
 //]
     }
 }";
@@ -103,7 +171,7 @@ class C{
     void foo()
     {
 //[
-        int x = 5; // intrinsic types
+        int x = 5; // built-in types
 //]
     }
 }";
@@ -114,7 +182,7 @@ class C{
     void foo()
     {
 //[
-        var x = 5; // intrinsic types
+        var x = 5; // built-in types
 //]
     }
 }";
@@ -144,10 +212,10 @@ void foo()
         private static readonly string s_varWherePossiblePreviewFalse = @"
 using System;
 class C{
-    void foo()
+    void Init()
     {
 //[
-        Action f = this.foo(); // everywhere else.
+        Action f = this.Init(); // everywhere else.
 //]
     }
 }";
@@ -155,10 +223,10 @@ void foo()
         private static readonly string s_varWherePossiblePreviewTrue = @"
 using System;
 class C{
-    void foo()
+    void Init()
     {
 //[
-        var f = this.foo(); // everywhere else.
+        var f = this.Init(); // everywhere else.
 //]
     }
 }";
@@ -191,10 +259,10 @@ internal StyleViewModel(OptionSet optionSet, IServiceProvider serviceProvider) :
                 new CodeStylePreference(CSharpVSResources.PreferExplicitType, isChecked: false),
             };
 
-            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyFieldAccess, CSharpVSResources.QualifyFieldAccessWithThis, s_declarationPreviewTrue, s_declarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
-            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyPropertyAccess, CSharpVSResources.QualifyPropertyAccessWithThis, s_declarationPreviewTrue, s_declarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
-            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyMethodAccess, CSharpVSResources.QualifyMethodAccessWithThis, s_declarationPreviewTrue, s_declarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
-            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyEventAccess, CSharpVSResources.QualifyEventAccessWithThis, s_declarationPreviewTrue, s_declarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyFieldAccess, CSharpVSResources.QualifyFieldAccessWithThis, s_fieldDeclarationPreviewTrue, s_fieldDeclarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyPropertyAccess, CSharpVSResources.QualifyPropertyAccessWithThis, s_propertyDeclarationPreviewTrue, s_propertyDeclarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyMethodAccess, CSharpVSResources.QualifyMethodAccessWithThis, s_methodDeclarationPreviewTrue, s_methodDeclarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.QualifyEventAccess, CSharpVSResources.QualifyEventAccessWithThis, s_eventDeclarationPreviewTrue, s_eventDeclarationPreviewFalse, this, optionSet, qualifyGroupTitle, qualifyMemberAccessPreferences));
 
             CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.PreferIntrinsicPredefinedTypeKeywordInDeclaration, CSharpVSResources.PreferIntrinsicPredefinedTypeKeywordInDeclaration, s_intrinsicPreviewDeclarationTrue, s_intrinsicPreviewDeclarationFalse, this, optionSet, predefinedTypesGroupTitle, predefinedTypesPreferences));
             CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(SimplificationOptions.PreferIntrinsicPredefinedTypeKeywordInMemberAccess, CSharpVSResources.PreferIntrinsicPredefinedTypeKeywordInMemberAccess, s_intrinsicPreviewMemberAccessTrue, s_intrinsicPreviewMemberAccessFalse, this, optionSet, predefinedTypesGroupTitle, predefinedTypesPreferences));