Add tools|options support

src/Features/CSharp/Portable/UseDeconstruction/CSharpUseDeconstructionDiagnosticAnalyzer.cs

@@ -47,7 +47,7 @@ private void AnalyzeNode(SyntaxNodeAnalysisContext context)
                 return;
             }
 
-            var option = optionSet.GetOption(CSharpCodeStyleOptions.PreferDeconstruction);
+            var option = optionSet.GetOption(CodeStyleOptions.PreferDeconstructedVariableDeclaration, context.Node.Language);
             if (!option.Value)
             {
                 return;

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

@@ -294,7 +294,7 @@ public C(string s)
 }}
 ";
 
-    private static readonly string s_preferNullPropagation = $@"
+        private static readonly string s_preferNullPropagation = $@"
 using System;
 
 class C
@@ -499,6 +499,32 @@ public Customer(string value)
 //]
     }}
 }}
+";
+
+        private static readonly string s_preferDeconstructedVariableDeclaration = $@"
+using System;
+
+class Customer
+{{
+    public Customer(string value)
+    {{
+//[
+        // {ServicesVSResources.Prefer_colon}
+        var (name, age) = GetPersonTuple();
+        Console.WriteLine($""{{name}} {{age}}"");
+
+        (int x, int y) = GetPointTuple();
+        Console.WriteLine($""{{x}} {{y}}"");
+
+        // {ServicesVSResources.Over_colon}
+        var person = GetPersonTuple();
+        Console.WriteLine($""{{person.name}} {{person.age}}"");
+
+        (int x, int y) point = GetPointTuple();
+        Console.WriteLine($""{{point.x}} {{point.y}}"");
+//]
+    }}
+}}
 ";
 
         private static readonly string s_preferBraces = $@"
@@ -798,6 +824,7 @@ internal StyleViewModel(OptionSet optionSet, IServiceProvider serviceProvider) :
 
             // Variable preferences
             CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferInlinedVariableDeclaration, ServicesVSResources.Prefer_inlined_variable_declaration, s_preferInlinedVariableDeclaration, s_preferInlinedVariableDeclaration, this, optionSet, variablePreferencesGroupTitle));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferDeconstructedVariableDeclaration, ServicesVSResources.Prefer_deconstructed_variable_declaration, s_preferDeconstructedVariableDeclaration, s_preferDeconstructedVariableDeclaration, this, optionSet, variablePreferencesGroupTitle));
 
             // Null preferences.
             CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferThrowExpression, CSharpVSResources.Prefer_throw_expression, s_preferThrowExpression, s_preferThrowExpression, this, optionSet, nullCheckingGroupTitle));

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

@@ -1594,6 +1594,15 @@ internal class ServicesVSResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Prefer deconstructed variable declaration.
+        /// </summary>
+        internal static string Prefer_deconstructed_variable_declaration {
+            get {
+                return ResourceManager.GetString("Prefer_deconstructed_variable_declaration", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Prefer explicit tuple name.
         /// </summary>

src/VisualStudio/Core/Def/ServicesVSResources.resx

@@ -962,4 +962,7 @@ Additional information: {1}</value>
   <data name="Prefer_local_function_over_anonymous_function" xml:space="preserve">
     <value>Prefere local function over anonymous function</value>
   </data>
+  <data name="Prefer_deconstructed_variable_declaration" xml:space="preserve">
+    <value>Prefer deconstructed variable declaration</value>
+  </data>
 </root>
\ No newline at end of file

src/Workspaces/CSharp/Portable/CodeStyle/CSharpCodeStyleOptions.cs

@@ -180,12 +180,6 @@ internal static class CSharpCodeStyleOptions
                 EditorConfigStorageLocation.ForBoolCodeStyleOption("csharp_style_pattern_local_over_anonymous_function"),
                 new RoamingProfileStorageLocation($"TextEditor.CSharp.Specific.{nameof(PreferLocalOverAnonymousFunction)}")});
 
-        public static readonly Option<CodeStyleOption<bool>> PreferDeconstruction = new Option<CodeStyleOption<bool>>(
-            nameof(CodeStyleOptions), nameof(PreferDeconstruction), defaultValue: CodeStyleOptions.TrueWithSuggestionEnforcement,
-            storageLocations: new OptionStorageLocation[] {
-                EditorConfigStorageLocation.ForBoolCodeStyleOption("csharp_prefer_deconstruction"),
-                new RoamingProfileStorageLocation($"TextEditor.CSharp.Specific.{nameof(PreferDeconstruction)}")});
-
         public static IEnumerable<Option<CodeStyleOption<bool>>> GetCodeStyleOptions()
         {
             yield return UseImplicitTypeForIntrinsicTypes;
@@ -199,7 +193,6 @@ public static IEnumerable<Option<CodeStyleOption<bool>>> GetCodeStyleOptions()
             yield return PreferInferredTupleNames;
             yield return PreferInferredAnonymousTypeMemberNames;
             yield return PreferLocalOverAnonymousFunction;
-            yield return PreferDeconstruction;
         }
 
         public static IEnumerable<Option<CodeStyleOption<ExpressionBodyPreference>>> GetExpressionBodyOptions()

src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs

@@ -126,6 +126,14 @@ public class CodeStyleOptions
                 EditorConfigStorageLocation.ForBoolCodeStyleOption("csharp_style_inlined_variable_declaration"),
                 new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferInlinedVariableDeclaration") });
 
+        internal static readonly PerLanguageOption<CodeStyleOption<bool>> PreferDeconstructedVariableDeclaration = new PerLanguageOption<CodeStyleOption<bool>>(
+            nameof(CodeStyleOptions),
+            nameof(PreferDeconstructedVariableDeclaration),
+            defaultValue: TrueWithSuggestionEnforcement,
+            storageLocations: new OptionStorageLocation[] {
+                EditorConfigStorageLocation.ForBoolCodeStyleOption("csharp_style_deconstructed_variable_declaration"),
+                new RoamingProfileStorageLocation($"TextEditor.%LANGUAGE%.Specific.{nameof(PreferDeconstructedVariableDeclaration)}")});
+
         internal static readonly PerLanguageOption<CodeStyleOption<bool>> PreferExplicitTupleNames = new PerLanguageOption<CodeStyleOption<bool>>(
             nameof(CodeStyleOptions),
             nameof(PreferExplicitTupleNames),

src/Workspaces/Core/Portable/Execution/AbstractOptionsSerializationService.cs

@@ -228,6 +228,7 @@ protected void WriteOptionSetTo(OptionSet options, string language, ObjectWriter
             WriteOptionTo(options, language, CodeStyleOptions.PreferCollectionInitializer, writer, cancellationToken);
             WriteOptionTo(options, language, CodeStyleOptions.PreferExplicitTupleNames, writer, cancellationToken);
             WriteOptionTo(options, language, CodeStyleOptions.PreferInlinedVariableDeclaration, writer, cancellationToken);
+            WriteOptionTo(options, language, CodeStyleOptions.PreferDeconstructedVariableDeclaration, writer, cancellationToken);
             WriteOptionTo(options, language, CodeStyleOptions.PreferNullPropagation, writer, cancellationToken);
             WriteOptionTo(options, language, CodeStyleOptions.PreferObjectInitializer, writer, cancellationToken);
             WriteOptionTo(options, language, CodeStyleOptions.PreferThrowExpression, writer, cancellationToken);
@@ -249,6 +250,7 @@ protected OptionSet ReadOptionSetFrom(OptionSet options, string language, Object
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferCollectionInitializer, reader, cancellationToken);
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferExplicitTupleNames, reader, cancellationToken);
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferInlinedVariableDeclaration, reader, cancellationToken);
+            options = ReadOptionFrom(options, language, CodeStyleOptions.PreferDeconstructedVariableDeclaration, reader, cancellationToken);
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferNullPropagation, reader, cancellationToken);
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferObjectInitializer, reader, cancellationToken);
             options = ReadOptionFrom(options, language, CodeStyleOptions.PreferThrowExpression, reader, cancellationToken);