Moved SyntaxGenerator and editors into Editting namespace. CodeGeneration...

Moved SyntaxGenerator and editors into Editting namespace.  CodeGeneration namespace is now all internal, and will eventually be removed. (changeset 1396303)

Src/Diagnostics/CodeAnalysis/Core/MetaAnalyzers/Fixers/ApplyDiagnosticAnalyzerAttributeFix.cs

@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 
 namespace Microsoft.CodeAnalysis.Analyzers.MetaAnalyzers.CodeFixes
 {

Src/Diagnostics/FxCop/CSharp/Globalization/CodeFixes/CA1309CSharpCodeFixProvider.cs

@@ -5,8 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Globalization;
 using Microsoft.CodeAnalysis.Shared.Extensions;

Src/Diagnostics/FxCop/CSharp/Globalization/CodeFixes/CA2101CSharpCodeFixProvider.cs

@@ -5,8 +5,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Globalization;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Interoperability;

Src/Diagnostics/FxCop/CSharp/Usage/CodeFixes/CA2213CSharpCodeFixProvider.cs

@@ -6,8 +6,8 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Usage;
 using Microsoft.CodeAnalysis.Shared.Extensions;

Src/Diagnostics/FxCop/Core/Design/CodeFixes/CA1008CodeFixProviderBase.cs

@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 

Src/Diagnostics/FxCop/Core/Design/CodeFixes/CA1012CodeFixProvider.cs

@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Roslyn.Utilities;
 

Src/Diagnostics/FxCop/Core/Design/CodeFixes/EnumWithFlagsCodeFixProviderBase.cs

@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Utilities;
 using Microsoft.CodeAnalysis.Shared.Extensions;

Src/Diagnostics/FxCop/Core/Globalization/CodeFixes/CA1309CodeFixProviderBase.cs

 // Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Utilities;
 using Roslyn.Utilities;

Src/Diagnostics/FxCop/Core/Globalization/CodeFixes/CA2101CodeFixProviderBase.cs

 // Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Immutable;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.FxCopAnalyzers.Globalization

Src/Diagnostics/FxCop/Core/Usage/CodeFixes/CA2229CodeFixProvider.cs

@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Utilities;
 using Microsoft.CodeAnalysis.Shared.Extensions;

Src/Diagnostics/FxCop/Core/Usage/CodeFixes/CA2235CodeFixProviderBase.cs

@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Utilities;
 using Roslyn.Utilities;
 

Src/Diagnostics/FxCop/Core/Usage/CodeFixes/CA2237CodeFixProvider.cs

@@ -5,7 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.FxCopAnalyzers.Utilities;
 using Roslyn.Utilities;
 

Src/Diagnostics/FxCop/VisualBasic/Globalization/CodeFixes/CA1309BasicCodeFixProvider.vb

@@ -4,7 +4,7 @@ Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeFixes
-Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.FxCopAnalyzers.Globalization
 Imports Microsoft.CodeAnalysis.Shared.Extensions

Src/Diagnostics/FxCop/VisualBasic/Globalization/CodeFixes/CA2101BasicCodeFixProvider.vb

@@ -4,7 +4,7 @@ Imports System.Composition
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeFixes
-Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.FxCopAnalyzers.Globalization
 Imports Microsoft.CodeAnalysis.FxCopAnalyzers.Interoperability

Src/Diagnostics/FxCop/VisualBasic/Usage/CodeFixes/CA2213BasicCodeFixProvider.vb

@@ -3,7 +3,7 @@
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeFixes
-Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.FxCopAnalyzers.Usage
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

Src/Samples/CSharp/ImplementNotifyPropertyChanged/Impl/CodeGeneration.cs

@@ -7,9 +7,9 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.Text;

Src/Samples/VisualBasic/ImplementNotifyPropertyChanged/Impl/CodeGeneration.vb

@@ -4,7 +4,7 @@ Imports System.ComponentModel
 Imports System.Runtime.CompilerServices
 Imports System.Threading
 Imports Microsoft.CodeAnalysis
-Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Formatting
 Imports Microsoft.CodeAnalysis.Simplification
 Imports Microsoft.CodeAnalysis.VisualBasic

Src/Workspaces/CSharp/Portable/CodeGeneration/CSharpFlagsEnumGenerator.cs

@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;

Src/Workspaces/CSharp/Portable/CodeGeneration/CSharpSyntaxGenerator.cs

@@ -9,6 +9,7 @@
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Host.Mef;

Src/Workspaces/CSharpTest/CodeGeneration/SymbolEditorTests.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.Test.Utilities;
@@ -10,7 +10,7 @@
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGeneration
+namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Editting
 {
     public class SymbolEditorTests
     {

Src/Workspaces/CSharpTest/CodeGeneration/SyntaxGeneratorTests.cs

@@ -2,12 +2,13 @@
 using System.Linq;
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGeneration
+namespace Microsoft.CodeAnalysis.CSharp.UnitTests.Editting
 {
     public class SyntaxGeneratorTests
     {

Src/Workspaces/Core/Portable/CodeGeneration/AbstractFlagsEnumGenerator.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationHelpers.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Formatting;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/CodeGenerationSymbolFactory.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationAbstractMethodSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationAbstractNamedTypeSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationArrayTypeSymbol.cs

@@ -2,6 +2,7 @@
 
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Microsoft.CodeAnalysis.Text;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationConstructorSymbol.cs

 // Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationConversionSymbol.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editting;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationDestructorSymbol.cs

 // Copyright (c) Microsoft Open Technologies, Inc.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationEventSymbol.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationFieldSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationMethodSymbol.cs

@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationNamedTypeSymbol.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationNamespaceOrTypeSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationNamespaceSymbol.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationOperatorSymbol.cs

@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editting;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationParameterSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPointerTypeSymbol.cs

@@ -2,6 +2,7 @@
 
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPropertySymbol.cs

@@ -4,6 +4,7 @@
 using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationSymbol.cs

@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationTypeParameterSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationTypeSymbol.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.CodeGeneration

Src/Workspaces/Core/Portable/CodeGeneration/DeclarationKind.cs → Src/Workspaces/Core/Portable/Editting/DeclarationKind.cs

@@ -3,7 +3,7 @@
 using System;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     public enum DeclarationKind
     {

Src/Workspaces/Core/Portable/CodeGeneration/DeclarationModifiers.cs → Src/Workspaces/Core/Portable/Editting/DeclarationModifiers.cs

@@ -3,7 +3,7 @@
 using System;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     public struct DeclarationModifiers : IEquatable<DeclarationModifiers>
     {

Src/Workspaces/Core/Portable/CodeGeneration/DocumentEditor.cs → Src/Workspaces/Core/Portable/Editting/DocumentEditor.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     /// <summary>
     /// An editor for making changes to a document's syntax tree. 

Src/Workspaces/Core/Portable/CodeGeneration/SolutionEditor.cs → Src/Workspaces/Core/Portable/Editting/SolutionEditor.cs

@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     /// <summary>
     /// An editor for making changes to multiple documents in a solution.

Src/Workspaces/Core/Portable/CodeGeneration/SymbolEditor.cs → Src/Workspaces/Core/Portable/Editting/SymbolEditor.cs

@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     /// <summary>
     /// An editor for making changes to symbol source declarations.

Src/Workspaces/Core/Portable/CodeGeneration/SymbolEditorExtensions.cs → Src/Workspaces/Core/Portable/Editting/SymbolEditorExtensions.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     public static class SymbolEditorExtensions
     {

Src/Workspaces/Core/Portable/CodeGeneration/SyntaxEditor.cs → Src/Workspaces/Core/Portable/Editting/SyntaxEditor.cs

@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     /// <summary>
     /// An editor for making changes to a syntax tree. 

Src/Workspaces/Core/Portable/CodeGeneration/SyntaxEditorExtensions.cs → Src/Workspaces/Core/Portable/Editting/SyntaxEditorExtensions.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     public static class SyntaxEditorExtensions
     {

Src/Workspaces/Core/Portable/CodeGeneration/SyntaxGenerator.cs → Src/Workspaces/Core/Portable/Editting/SyntaxGenerator.cs

@@ -11,7 +11,7 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     /// <summary>
     /// A language agnostic factory for creating syntax nodes.

Src/Workspaces/Core/Portable/CodeGeneration/TypeConstraintKind.cs → Src/Workspaces/Core/Portable/Editting/TypeConstraintKind.cs

@@ -2,7 +2,7 @@
 
 using System;
 
-namespace Microsoft.CodeAnalysis.CodeGeneration
+namespace Microsoft.CodeAnalysis.Editting
 {
     [Flags]
     public enum SpecialTypeConstraintKind

Src/Workspaces/Core/Portable/Shared/Extensions/ICodeDefinitionFactoryExtensions.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Simplification;
 using Roslyn.Utilities;

Src/Workspaces/Core/Portable/Shared/Extensions/ICodeDefinitionFactoryExtensions_CreateEqualsMethod.cs

@@ -5,6 +5,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;

Src/Workspaces/Core/Portable/Shared/Extensions/ICodeDefinitionFactoryExtensions_CreateGetHashCodeMethod.cs

@@ -4,6 +4,7 @@
 using System.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.Shared.Extensions

Src/Workspaces/Core/Portable/Shared/Extensions/ISymbolExtensions.cs

@@ -7,7 +7,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Threading;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Roslyn.Utilities;
 

Src/Workspaces/Core/Portable/Workspaces.csproj

@@ -325,18 +325,18 @@
     <Compile Include="CodeGeneration\CodeGenerationOptions.cs" />
     <Compile Include="CodeGeneration\CodeGenerationSymbolFactory.cs" />
     <Compile Include="CodeGeneration\CodeGenerator.cs" />
-    <Compile Include="CodeGeneration\DeclarationKind.cs" />
-    <Compile Include="CodeGeneration\DocumentEditor.cs" />
+    <Compile Include="Editting\DeclarationKind.cs" />
+    <Compile Include="Editting\DocumentEditor.cs" />
     <Compile Include="CodeGeneration\ICodeGenerationService.cs" />
     <Compile Include="CodeGeneration\INamedTypeSymbolExtensions.cs" />
     <Compile Include="CodeGeneration\LiteralSpecialValues.cs" />
-    <Compile Include="CodeGeneration\SolutionEditor.cs" />
-    <Compile Include="CodeGeneration\SymbolEditor.cs" />
-    <Compile Include="CodeGeneration\SymbolEditorExtensions.cs" />
-    <Compile Include="CodeGeneration\SyntaxEditor.cs" />
-    <Compile Include="CodeGeneration\SyntaxEditorExtensions.cs" />
-    <Compile Include="CodeGeneration\SyntaxGenerator.cs" />
-    <Compile Include="CodeGeneration\DeclarationModifiers.cs" />
+    <Compile Include="Editting\SolutionEditor.cs" />
+    <Compile Include="Editting\SymbolEditor.cs" />
+    <Compile Include="Editting\SymbolEditorExtensions.cs" />
+    <Compile Include="Editting\SyntaxEditor.cs" />
+    <Compile Include="Editting\SyntaxEditorExtensions.cs" />
+    <Compile Include="Editting\SyntaxGenerator.cs" />
+    <Compile Include="Editting\DeclarationModifiers.cs" />
     <Compile Include="CodeGeneration\Symbols\CodeGenerationAbstractMethodSymbol.cs" />
     <Compile Include="CodeGeneration\Symbols\CodeGenerationAbstractNamedTypeSymbol.cs" />
     <Compile Include="CodeGeneration\Symbols\CodeGenerationArrayTypeSymbol.cs" />
@@ -367,7 +367,7 @@
     <Compile Include="CodeGeneration\Symbols\CodeGenerationTypeParameterSymbol.cs" />
     <Compile Include="CodeGeneration\Symbols\CodeGenerationTypeSymbol.cs" />
     <Compile Include="CodeGeneration\SyntaxAnnotationExtensions.cs" />
-    <Compile Include="CodeGeneration\TypeConstraintKind.cs" />
+    <Compile Include="Editting\TypeConstraintKind.cs" />
     <Compile Include="CodeGeneration\TypeGenerator.cs" />
     <Compile Include="CodeRefactorings\CodeRefactoringContext.cs" />
     <Compile Include="Differencing\LongestCommonImmutableArraySubsequence.cs" />

Src/Workspaces/CoreTest/SyntaxNodeTests.cs

@@ -4,7 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.Editting;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
@@ -100,17 +100,11 @@ public void TestTrackNodesWithDocument()
             // use some fancy document centric rewrites
             var comp = doc.Project.GetCompilationAsync().Result;
 
-            var cgenField = CodeGenerationSymbolFactory.CreateFieldSymbol(
-                attributes: null,
-                accessibility: Accessibility.Private,
-                modifiers: new DeclarationModifiers(),
-                type: comp.GetSpecialType(SpecialType.System_Int32),
-                name: "X");
+            var gen = SyntaxGenerator.GetGenerator(doc);
+            var cgenField = gen.FieldDeclaration("X", gen.TypeExpression(SpecialType.System_Int32), Accessibility.Private); 
 
             var currentClassDecl = trackedRoot.GetCurrentNodes(classDecl).First();
-            var classDeclWithField = Formatter.Format(
-                                        CodeGenerator.AddFieldDeclaration(currentClassDecl, cgenField, sol.Workspace),
-                                        sol.Workspace);
+            var classDeclWithField = gen.InsertMembers(currentClassDecl, 0, new[] { cgenField });
 
             // we can find related bits even from sub-tree fragments
             var latestMethod = classDeclWithField.GetCurrentNodes(methodDecl).First();
@@ -128,7 +122,7 @@ public void TestTrackNodesWithDocument()
 
             // we can still find the tracked node in the new document
             var finalClassDecl = root2.GetCurrentNodes(classDecl).First();
-            Assert.Equal(@"public class C { private System.Int32 X; void M() { } }", finalClassDecl.ToString());
+            Assert.Equal("public class C\r\n{\r\n    private int X;\r\n    void M()\r\n    {\r\n    }\r\n}", finalClassDecl.NormalizeWhitespace().ToString());
 
             // and other tracked nodes too
             var finalMethodDecl = root2.GetCurrentNodes(methodDecl).First();

Src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicFlagsEnumGenerator.vb

@@ -5,6 +5,7 @@ Imports System.Collections.Generic
 Imports System.Linq
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Extensions

Src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicSyntaxGenerator.vb

@@ -3,6 +3,7 @@
 Imports System.Linq
 Imports Microsoft.CodeAnalysis
 Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Simplification
 Imports Microsoft.CodeAnalysis.VisualBasic
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax

Src/Workspaces/VisualBasicTest/CodeGeneration/SyntaxGeneratorTests.vb

 Imports System.Globalization
-Imports Microsoft.CodeAnalysis.CodeGeneration
+Imports Microsoft.CodeAnalysis.Editting
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.Test.Utilities
 Imports Microsoft.CodeAnalysis.Text
@@ -7,7 +7,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Roslyn.Test.Utilities
 Imports Xunit
 
-Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.CodeGeneration
+Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.Editting
     Public Class SyntaxGeneratorTests
         Private ReadOnly g As SyntaxGenerator = SyntaxGenerator.GetGenerator(New AdhocWorkspace(), LanguageNames.VisualBasic)