Improve help text for Prefer Braces style

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

@@ -628,6 +628,76 @@ void M2(string value)
 //]
     }}
 }}
+";
+
+        private static readonly string s_doNotPreferBraces = $@"
+using System;
+
+class Customer
+{{
+    private int Age;
+
+    void M1()
+    {{
+//[
+        // {ServicesVSResources.Allow_colon}
+        if (test) Console.WriteLine(""Text"");
+
+        // {ServicesVSResources.Allow_colon}
+        if (test)
+            Console.WriteLine(""Text"");
+
+        // {ServicesVSResources.Allow_colon}
+        if (test)
+            Console.WriteLine(
+                ""Text"");
+
+        // {ServicesVSResources.Allow_colon}
+        if (test)
+        {{
+            Console.WriteLine(
+                ""Text"");
+        }}
+//]
+    }}
+}}
+";
+
+        private static readonly string s_preferBracesWhenMultiline = $@"
+using System;
+
+class Customer
+{{
+    private int Age;
+
+    void M1()
+    {{
+//[
+        // {ServicesVSResources.Allow_colon}
+        if (test) Console.WriteLine(""Text"");
+
+        // {ServicesVSResources.Allow_colon}
+        if (test)
+            Console.WriteLine(""Text"");
+
+        // {ServicesVSResources.Prefer_colon}
+        if (test)
+        {{
+            Console.WriteLine(
+                ""Text"");
+        }}
+//]
+    }}
+    void M2()
+    {{
+//[
+        // {ServicesVSResources.Over_colon}
+        if (test)
+            Console.WriteLine(
+                ""Text"");
+//]
+    }}
+}}
 ";
 
         private static readonly string s_preferBraces = $@"
@@ -643,7 +713,7 @@ void M1()
         // {ServicesVSResources.Prefer_colon}
         if (test)
         {{
-            this.Display();
+            Console.WriteLine(""Text"");
         }}
 //]
     }}
@@ -652,7 +722,7 @@ void M2()
 //[
         // {ServicesVSResources.Over_colon}
         if (test)
-            this.Display();
+            Console.WriteLine(""Text"");
 //]
     }}
 }}
@@ -1467,7 +1537,7 @@ private void AddBracesOptions(OptionSet optionSet, string bracesPreferenceGroupT
                 CSharpCodeStyleOptions.PreferBraces,
                 ServicesVSResources.Prefer_braces,
                 enumValues,
-                new[] { s_preferBraces, s_preferBraces, s_preferBraces },
+                new[] { s_preferBraces, s_doNotPreferBraces, s_preferBracesWhenMultiline },
                 this, optionSet, bracesPreferenceGroupTitle, bracesPreferences));
         }
 

src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs

@@ -19,7 +19,7 @@ namespace Microsoft.VisualStudio.LanguageServices {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class ServicesVSResources {
@@ -206,6 +206,15 @@ internal class ServicesVSResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Allow:.
+        /// </summary>
+        internal static string Allow_colon {
+            get {
+                return ResourceManager.GetString("Allow_colon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Always for clarity.
         /// </summary>

src/VisualStudio/Core/Def/ServicesVSResources.resx

@@ -1114,4 +1114,7 @@ I agree to all of the foregoing:</value>
   <data name="Value_returned_by_invocation_is_implicitly_ignored" xml:space="preserve">
     <value>Value returned by invocation is implicitly ignored</value>
   </data>
+  <data name="Allow_colon" xml:space="preserve">
+    <value>Allow:</value>
+  </data>
 </root>
\ No newline at end of file

src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Vždy kvůli srozumitelnosti</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Immer zur besseren Unterscheidung</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Siempre por claridad</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Toujours pour plus de clarté</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Sempre per chiarezza</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">わかりやすくするために常に</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">명확하게 하기 위해 항상</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Zawsze w celu zachowania jednoznaczności</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Sempre para esclarecimento</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Всегда использовать для ясности</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">Açıklık sağlamak için her zaman</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">为始终保持清楚起见</target>

src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf

@@ -7,6 +7,11 @@
         <target state="new">All methods</target>
         <note />
       </trans-unit>
+      <trans-unit id="Allow_colon">
+        <source>Allow:</source>
+        <target state="new">Allow:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Always_for_clarity">
         <source>Always for clarity</source>
         <target state="translated">一律使用以明確表示</target>