Move more classes into Internal namespaces.

- These classes aren't needed as top level public classes.

#779

src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs

@@ -3,12 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     public class AutoCompleteEditHandler : SpanEditHandler
     {

src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs

@@ -9,9 +9,9 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Editor
 {

src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs

@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;

src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs

@@ -4,8 +4,10 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs

@@ -7,7 +7,7 @@ using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Parser

src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Parser

src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs

@@ -4,10 +4,11 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/DisposableAction.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal class DisposableAction : IDisposable
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/CallbackVisitor.cs

@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public class CallbackVisitor : ParserVisitor
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlLanguageCharacteristics.cs

@@ -1,14 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Block.cs

@@ -10,8 +10,9 @@ using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Document.cs

@@ -7,8 +7,9 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Section.cs

@@ -5,8 +5,9 @@ using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {

src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.cs

@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {

src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
 namespace Microsoft.AspNetCore.Razor.Parser

src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs

@@ -8,9 +8,9 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;

src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperBlockRewriter.cs

@@ -7,9 +7,10 @@ using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {

src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperParseTreeRewriter.cs

@@ -9,7 +9,7 @@ using System.Text;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {

src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs

@@ -7,10 +7,10 @@ using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {

src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
 namespace Microsoft.AspNetCore.Razor.Parser
@@ -24,36 +25,6 @@ namespace Microsoft.AspNetCore.Razor.Parser
             return block.Type == BlockType.Expression && Parent != null;
         }
 
-        //public override void VisitBlock(Block block)
-        //{
-        //    BlockBuilder parent = null;
-        //    if (_blocks.Count > 0)
-        //    {
-        //        parent = _blocks.Peek();
-        //    }
-        //    BlockBuilder newBlock = new BlockBuilder(block);
-        //    newBlock.Children.Clear();
-        //    _blocks.Push(newBlock);
-        //    if (block.Type == BlockType.Expression && parent != null)
-        //    {
-        //        VisitExpressionBlock(block, parent);
-        //    }
-        //    else
-        //    {
-        //        base.VisitBlock(block);
-        //    }
-        //    if (_blocks.Count > 1)
-        //    {
-        //        parent.Children.Add(_blocks.Pop().Build());
-        //    }
-        //}
-
-        //public override void VisitSpan(Span span)
-        //{
-        //    Debug.Assert(_blocks.Count > 0);
-        //    _blocks.Peek().Children.Add(span);
-        //}
-
         protected override SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block)
         {
             var newBlock = new BlockBuilder(block);

src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor
 {

src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs

@@ -10,10 +10,4 @@ namespace Microsoft.AspNetCore.Razor.Text
         int Read();
         int Peek();
     }
-
-    // TextBuffer with Location tracking
-    public interface ITextDocument : ITextBuffer
-    {
-        SourceLocation Location { get; }
-    }
 }

src/Microsoft.AspNetCore.Razor/Text/ITextDocument.cs

@@ -1,11 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 namespace Microsoft.AspNetCore.Razor.Text
 {
-    public enum TextChangeType
+    public interface ITextDocument : ITextBuffer
     {
-        Insert,
+        SourceLocation Location { get; }
-        Remove
     }
 }

src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpHelpers.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     public static class CSharpHelpers
     {

src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpTokenizer.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     public class CSharpTokenizer : Tokenizer<CSharpSymbol, CSharpSymbolType>
     {

src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/HtmlTokenizer.cs

@@ -1,14 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization
     public class HtmlTokenizer : Tokenizer<HtmlSymbol, HtmlSymbolType>

src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbol.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
 {
     public class HtmlSymbol : SymbolBase<HtmlSymbolType>
     {

src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolExtensions.cs

@@ -0,0 +1,25 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
+{
+    public static class HtmlSymbolExtensions
+    {
+        /// <summary>
+        /// Converts the generic <see cref="IEnumerable{ISymbol}"/> to a <see cref="IEnumerable{HtmlSymbol}"/> and
+        /// finds the first <see cref="HtmlSymbol"/> with type <paramref name="type"/>.
+        /// </summary>
+        /// <param name="symbols">The <see cref="IEnumerable{ISymbol}"/> instance this method extends.</param>
+        /// <param name="type">The <see cref="HtmlSymbolType"/> to search for.</param>
+        /// <returns>The first <see cref="HtmlSymbol"/> of type <paramref name="type"/>.</returns>
+        public static HtmlSymbol FirstHtmlSymbolAs(this IEnumerable<ISymbol> symbols, HtmlSymbolType type)
+        {
+            return symbols.OfType<HtmlSymbol>().FirstOrDefault(sym => (type & sym.Type) == sym.Type);
+        }
+    }
+}

src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolType.cs

@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
 {
     [Flags]
     public enum HtmlSymbolType

src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs

@@ -37,17 +37,5 @@ namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
         {
             return new LocationTagged<string>(symbol.Content, symbol.Start);
         }
-
-        /// <summary>
-        /// Converts the generic <see cref="IEnumerable{ISymbol}"/> to a <see cref="IEnumerable{HtmlSymbol}"/> and
-        /// finds the first <see cref="HtmlSymbol"/> with type <paramref name="type"/>.
-        /// </summary>
-        /// <param name="symbols">The <see cref="IEnumerable{ISymbol}"/> instance this method extends.</param>
-        /// <param name="type">The <see cref="HtmlSymbolType"/> to search for.</param>
-        /// <returns>The first <see cref="HtmlSymbol"/> of type <paramref name="type"/>.</returns>
-        public static HtmlSymbol FirstHtmlSymbolAs(this IEnumerable<ISymbol> symbols, HtmlSymbolType type)
-        {
-            return symbols.OfType<HtmlSymbol>().FirstOrDefault(sym => (type & sym.Type) == sym.Type);
-        }
     }
 }

test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs

@@ -1,11 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers
 {

test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {

test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {

test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Text;
-using Microsoft.AspNetCore.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Parser;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {

test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs

@@ -10,7 +10,9 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs

@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs

@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp

test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp

test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading;
-using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;

test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs

@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;

test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs

@@ -5,11 +5,12 @@ using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html

test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs

@@ -5,11 +5,12 @@ using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html

test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html

test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;

test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs

@@ -5,9 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Parser;
-using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;
 using Moq.Protected;
@@ -69,16 +70,16 @@ namespace Microsoft.AspNetCore.Razor.Test.Parser
         {
             // Arrange
             var factory = SpanFactory.CreateCsHtml();
-            var parser = new Mock<RazorParser>(new CSharpCodeParser(),
+            var parser = new Mock<RazorParser>(
-                                               new HtmlMarkupParser(),
+                new CSharpCodeParser(),
-                                               Mock.Of<ITagHelperDescriptorResolver>());
+                new HtmlMarkupParser(),
+                Mock.Of<ITagHelperDescriptorResolver>());
             parser.CallBase = true;
-            parser.Protected()
+            parser
-                  .Setup<IEnumerable<TagHelperDescriptor>>("GetTagHelperDescriptors", 
+                .Protected()
-                                                           ItExpr.IsAny<Block>(), 
+                .Setup<IEnumerable<TagHelperDescriptor>>("GetTagHelperDescriptors", ItExpr.IsAny<Block>(), ItExpr.IsAny<ErrorSink>())
-                                                           ItExpr.IsAny<ErrorSink>())
+                .Returns(Enumerable.Empty<TagHelperDescriptor>())
-                  .Returns(Enumerable.Empty<TagHelperDescriptor>())
+                .Verifiable();
-                  .Verifiable();
 
             // Act
             parser.Object.Parse(new StringReader("<p>Hello world. The time is @DateTime.UtcNow</p>"));

test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 

test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs

@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test

test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs

@@ -9,6 +9,7 @@ using System.Web.WebPages.TestUtils;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Text;
 using Moq;
 using Xunit;

test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs

@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
 using Microsoft.AspNetCore.Razor.Test.Framework;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.Extensions.Internal;
 using Moq;
 using Xunit;

test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs

@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {

test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {

test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Text

test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer

test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer

test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs

@@ -3,7 +3,8 @@
 
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {

test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs

@@ -7,7 +7,9 @@ using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer

test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 
-using Microsoft.AspNetCore.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Parser;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Utils