Delete OrganizerOptions which just forwards to GenerationOptions

This type should have been moved originally.

src/EditorFeatures/CSharpTest/Diagnostics/AddUsing/AddUsingTests.cs

@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.CSharp.Diagnostics;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.Options;
 using Roslyn.Test.Utilities;
@@ -34,7 +35,7 @@ public partial class AddUsingTests : AbstractCSharpDiagnosticProviderBasedUserDi
         {
             await TestAsync(initialMarkup, expected, index, fixProviderData: fixProviderData, options: new Dictionary<OptionKey, object>
             {
-                { new OptionKey(OrganizerOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp), systemSpecialCase }
+                { new OptionKey(GenerationOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp), systemSpecialCase }
             });
         }
 
@@ -2372,7 +2373,7 @@ public partial class AddUsingTestsWithAddImportDiagnosticProvider : AbstractCSha
             {
                 return TestAsync(initialMarkup, expected, index: index, options: new Dictionary<OptionKey, object>
                 {
-                    { new OptionKey(OrganizerOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp), systemSpecialCase }
+                    { new OptionKey(GenerationOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp), systemSpecialCase }
                 });
             }
 

src/EditorFeatures/Core/Implementation/Organizing/OrganizeDocumentCommandHandler.cs

@@ -3,6 +3,7 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Threading;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Commands;
 using Microsoft.CodeAnalysis.Editor.Host;
 using Microsoft.CodeAnalysis.Editor.Shared;
@@ -123,7 +124,7 @@ private void SortAndRemoveUnusedImports(ITextBuffer subjectBuffer, CancellationT
             if (document != null)
             {
                 var newDocument = document.GetLanguageService<IRemoveUnnecessaryImportsService>().RemoveUnnecessaryImportsAsync(document, cancellationToken).WaitAndGetResult(cancellationToken);
-                newDocument = OrganizeImportsService.OrganizeImportsAsync(newDocument, subjectBuffer.GetOption(OrganizerOptions.PlaceSystemNamespaceFirst), cancellationToken).WaitAndGetResult(cancellationToken);
+                newDocument = OrganizeImportsService.OrganizeImportsAsync(newDocument, subjectBuffer.GetOption(GenerationOptions.PlaceSystemNamespaceFirst), cancellationToken).WaitAndGetResult(cancellationToken);
                 if (document != newDocument)
                 {
                     ApplyTextChange(document, newDocument);

src/Features/CSharp/Portable/GenerateType/CSharpGenerateTypeService.cs

@@ -851,7 +851,7 @@ internal override async Task<Solution> TryAddUsingsOrImportToDocumentAsync(Solut
                     return updatedSolution;
                 }
 
-                var placeSystemNamespaceFirst = document.Options.GetOption(OrganizerOptions.PlaceSystemNamespaceFirst);
+                var placeSystemNamespaceFirst = document.Options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst);
                 var addedCompilationRoot = compilationRoot.AddUsingDirectives(new[] { usingDirective }, placeSystemNamespaceFirst, Formatter.Annotation);
                 updatedSolution = updatedSolution.WithDocumentSyntaxRoot(document.Id, addedCompilationRoot, PreservationMode.PreserveIdentity);
             }

src/Features/Core/Portable/CodeFixes/AddImport/AbstractAddImportCodeFixProvider.cs

@@ -7,12 +7,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Packaging;
 using Microsoft.CodeAnalysis.Shared.Extensions;
-using Microsoft.CodeAnalysis.Shared.Options;
 using Microsoft.CodeAnalysis.SymbolSearch;
 using Roslyn.Utilities;
 
@@ -76,7 +76,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
             }
 
             var placeSystemNamespaceFirst = document.Options.GetOption(
-                OrganizerOptions.PlaceSystemNamespaceFirst);
+                GenerationOptions.PlaceSystemNamespaceFirst);
 
             using (Logger.LogBlock(FunctionId.Refactoring_AddImport, cancellationToken))
             {

src/Features/Core/Portable/Features.csproj

@@ -578,7 +578,6 @@
     <Compile Include="Shared\Extensions\DocumentExtensions.cs" />
     <Compile Include="Shared\Extensions\ISymbolExtensions_2.cs" />
     <Compile Include="Shared\Extensions\ISymbolExtensions_Sorting.cs" />
-    <Compile Include="Shared\Options\OrganizerOptions.cs" />
     <Compile Include="Shared\Options\ServiceComponentOnOffOptions.cs" />
     <Compile Include="Shared\TestHooks\AggregateAsynchronousOperationListener.cs" />
     <Compile Include="Shared\TestHooks\AsynchronousOperationListener.AsyncToken.cs" />
@@ -669,4 +668,4 @@
   <ItemGroup />
   <Import Project="..\..\..\Compilers\Core\AnalyzerDriver\AnalyzerDriver.projitems" Label="Shared" />
   <Import Project="..\..\..\..\build\Targets\VSL.Imports.targets" />
-</Project>
\ No newline at end of file
+</Project>

src/Features/Core/Portable/Shared/Options/OrganizerOptions.cs

-// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Options;
-
-namespace Microsoft.CodeAnalysis.Shared.Options
-{
-    // TODO: split these into VB and C# options
-    internal partial class OrganizerOptions
-    {
-        public const string FeatureName = "Organizer";
-
-        public static PerLanguageOption<bool> PlaceSystemNamespaceFirst
-        {
-            get { return Editing.GenerationOptions.PlaceSystemNamespaceFirst; }
-        }
-    }
-}

src/Features/VisualBasic/Portable/GenerateType/VisualBasicGenerateTypeService.vb

@@ -629,7 +629,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateType
                 Return updatedSolution
             End If
 
-            Dim placeSystemNamespaceFirst = document.Options.GetOption(OrganizerOptions.PlaceSystemNamespaceFirst)
+            Dim placeSystemNamespaceFirst = document.Options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst)
             Dim root As SyntaxNode = Nothing
             If (modifiedRoot Is Nothing) Then
                 root = Await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(False)

src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs

@@ -2,6 +2,7 @@
 
 using System;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.CSharp.SplitStringLiteral;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.ExtractMethod;
@@ -17,7 +18,7 @@ public AdvancedOptionPageControl(IServiceProvider serviceProvider) : base(servic
         {
             InitializeComponent();
 
-            BindToOption(PlaceSystemNamespaceFirst, OrganizerOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp);
+            BindToOption(PlaceSystemNamespaceFirst, GenerationOptions.PlaceSystemNamespaceFirst, LanguageNames.CSharp);
             BindToOption(SuggestForTypesInReferenceAssemblies, AddImportOptions.SuggestForTypesInReferenceAssemblies, LanguageNames.CSharp);
             BindToOption(SuggestForTypesInNuGetPackages, AddImportOptions.SuggestForTypesInNuGetPackages, LanguageNames.CSharp);
             BindToOption(Split_string_literals_on_enter, SplitStringLiteralOptions.Enabled, LanguageNames.CSharp);

src/VisualStudio/CSharp/Impl/Options/AutomationObject.cs

@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Completion;
 using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.ExtractMethod;
 using Microsoft.CodeAnalysis.Options;
@@ -352,8 +353,8 @@ public int ShowSnippets
 
         public int SortUsings_PlaceSystemFirst
         {
-            get { return GetBooleanOption(OrganizerOptions.PlaceSystemNamespaceFirst); }
-            set { SetBooleanOption(OrganizerOptions.PlaceSystemNamespaceFirst, value); }
+            get { return GetBooleanOption(GenerationOptions.PlaceSystemNamespaceFirst); }
+            set { SetBooleanOption(GenerationOptions.PlaceSystemNamespaceFirst, value); }
         }
 
         public int AddImport_SuggestForTypesInReferenceAssemblies

src/VisualStudio/CSharp/Impl/Options/CSharpSettingsManagerOptionSerializer.cs

@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Completion;
 using Microsoft.CodeAnalysis.CSharp.Formatting;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.CSharp.SplitStringLiteral;
 using Microsoft.CodeAnalysis.Editor.Shared.Options;
 using Microsoft.CodeAnalysis.ExtractMethod;
@@ -27,7 +28,7 @@ namespace Microsoft.VisualStudio.LanguageServices.CSharp.Options
 {
     [ExportLanguageSpecificOptionSerializer(
         LanguageNames.CSharp,
-        OrganizerOptions.FeatureName,
+        GenerationOptions.FeatureName,
         SplitStringLiteralOptions.FeatureName,
         AddImportOptions.FeatureName,
         CompletionOptions.FeatureName,
@@ -90,7 +91,7 @@ private bool ShouldIncludeOnOffOption(FieldInfo fieldInfo)
 
             Type[] types = new[]
                 {
-                    typeof(OrganizerOptions),
+                    typeof(GenerationOptions),
                     typeof(AddImportOptions),
                     typeof(SplitStringLiteralOptions),
                     typeof(CSharpCompletionOptions),
@@ -131,7 +132,7 @@ protected override string GetStorageKeyForOption(IOption option)
 
         protected override bool SupportsOption(IOption option, string languageName)
         {
-            if (option == OrganizerOptions.PlaceSystemNamespaceFirst ||
+            if (option == GenerationOptions.PlaceSystemNamespaceFirst ||
                 option == AddImportOptions.SuggestForTypesInReferenceAssemblies ||
                 option == AddImportOptions.SuggestForTypesInNuGetPackages ||
                 option.Feature == CodeStyleOptions.PerLanguageCodeStyleOption ||

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

@@ -24,7 +24,7 @@ internal override bool ShouldPersistOption(OptionKey key)
         {
             return key.Option.Feature == CSharpCodeStyleOptions.FeatureName ||
                 key.Option.Feature == CodeStyleOptions.PerLanguageCodeStyleOption ||
-                key.Option.Feature == SimplificationOptions.PerLanguageFeatureName;
+                key.Option.Feature == CodeAnalysis.Editing.GenerationOptions.FeatureName;
         }
 
         #region "Preview Text"

src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs

@@ -9,6 +9,7 @@
 using System.Threading;
 using System.Xml.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Formatting;
@@ -524,7 +525,7 @@ private void AddReferencesAndImports(IVsExpansionSession pSession, CancellationT
                 return;
             }
 
-            var placeSystemNamespaceFirst = documentWithImports.Options.GetOption(OrganizerOptions.PlaceSystemNamespaceFirst);
+            var placeSystemNamespaceFirst = documentWithImports.Options.GetOption(GenerationOptions.PlaceSystemNamespaceFirst);
             documentWithImports = AddImports(documentWithImports, snippetNode, placeSystemNamespaceFirst, cancellationToken);
             AddReferences(documentWithImports.Project, snippetNode);
         }

src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports Microsoft.CodeAnalysis
+Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Editor.Shared.Options
 Imports Microsoft.CodeAnalysis.ExtractMethod
 Imports Microsoft.CodeAnalysis.Shared.Options
@@ -13,7 +14,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
 
             InitializeComponent()
 
-            BindToOption(PlaceSystemNamespaceFirst, OrganizerOptions.PlaceSystemNamespaceFirst, LanguageNames.VisualBasic)
+            BindToOption(PlaceSystemNamespaceFirst, GenerationOptions.PlaceSystemNamespaceFirst, LanguageNames.VisualBasic)
             BindToOption(SuggestForTypesInReferenceAssemblies, AddImportOptions.SuggestForTypesInReferenceAssemblies, LanguageNames.VisualBasic)
             BindToOption(SuggestForTypesInNuGetPackages, AddImportOptions.SuggestForTypesInNuGetPackages, LanguageNames.VisualBasic)
 

src/VisualStudio/VisualBasic/Impl/Options/AutomationObject.vb

@@ -4,6 +4,7 @@ Imports System.Runtime.InteropServices
 Imports System.Xml.Linq
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeStyle
+Imports Microsoft.CodeAnalysis.Editing
 Imports Microsoft.CodeAnalysis.Editor.Shared.Options
 Imports Microsoft.CodeAnalysis.ExtractMethod
 Imports Microsoft.CodeAnalysis.Options
@@ -197,10 +198,10 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
 
         Public Property Option_PlaceSystemNamespaceFirst As Boolean
             Get
-                Return GetBooleanOption(OrganizerOptions.PlaceSystemNamespaceFirst)
+                Return GetBooleanOption(GenerationOptions.PlaceSystemNamespaceFirst)
             End Get
             Set(value As Boolean)
-                SetBooleanOption(OrganizerOptions.PlaceSystemNamespaceFirst, value)
+                SetBooleanOption(GenerationOptions.PlaceSystemNamespaceFirst, value)
             End Set
         End Property