From 21d64b4ae26f0d5c3cfe0f1bb454823b5ecb42fa Mon Sep 17 00:00:00 2001 From: Pranav K Date: Wed, 22 Oct 2014 13:17:59 -0700 Subject: [PATCH] MQ: Cleanup to use var --- .../Common/HashCodeCombiner.cs | 4 +- .../Editor/AutoCompleteEditHandler.cs | 2 +- .../Editor/BackgroundParser.cs | 28 +-- .../Editor/ImplicitExpressionEditHandler.cs | 18 +- .../Editor/SpanEditHandler.cs | 18 +- .../Generator/AddImportCodeGenerator.cs | 4 +- .../Generator/AttributeBlockCodeGenerator.cs | 2 +- .../CodeBuilder/CSharp/CSharpCodeBuilder.cs | 2 +- .../CSharp/CSharpLineMappingWriter.cs | 2 +- .../CSharp/CSharpPaddingBuilder.cs | 20 +- .../CSharp/Visitors/CSharpCodeVisitor.cs | 12 +- .../CSharp/Visitors/CSharpHelperVisitor.cs | 6 +- .../CSharp/Visitors/CSharpUsingVisitor.cs | 4 +- .../Compiler/LineMappings/LineMapping.cs | 2 +- .../Compiler/LineMappings/MappingLocation.cs | 2 +- .../DynamicAttributeBlockCodeGenerator.cs | 2 +- .../Generator/HelperCodeGenerator.cs | 2 +- .../LiteralAttributeCodeGenerator.cs | 2 +- .../RazorDirectiveAttributeCodeGenerator.cs | 2 +- .../Generator/SectionCodeGenerator.cs | 2 +- .../Generator/SetBaseTypeCodeGenerator.cs | 2 +- .../Generator/SetLayoutCodeGenerator.cs | 2 +- .../Parser/CSharpCodeParser.Directives.cs | 50 ++--- .../Parser/CSharpCodeParser.Statements.cs | 28 +-- .../Parser/CSharpCodeParser.cs | 14 +- .../Parser/ConditionalAttributeCollapser.cs | 10 +- .../Parser/HtmlMarkupParser.Block.cs | 48 ++--- .../Parser/HtmlMarkupParser.Section.cs | 18 +- .../Parser/HtmlMarkupParser.cs | 4 +- .../Parser/LanguageCharacteristics.cs | 4 +- .../Parser/MarkupCollapser.cs | 4 +- .../Parser/MarkupRewriter.cs | 6 +- .../Parser/ParserContext.cs | 6 +- .../Parser/ParserHelpers.cs | 2 +- .../Parser/RazorParser.cs | 6 +- .../Parser/SyntaxTree/Block.cs | 10 +- .../Parser/SyntaxTree/RazorError.cs | 2 +- .../Parser/SyntaxTree/Span.cs | 12 +- .../Parser/TextReaderExtensions.cs | 4 +- .../Parser/TokenizerBackedParser.Helpers.cs | 20 +- .../Parser/WhitespaceRewriter.cs | 6 +- .../RazorDebugHelpers.cs | 6 +- .../RazorDirectiveAttribute.cs | 2 +- .../RazorEditorParser.cs | 14 +- .../Text/BufferingTextReader.cs | 8 +- .../Text/LineTrackingStringBuffer.cs | 6 +- .../Text/SeekableTextReader.cs | 2 +- .../Text/SourceLocation.cs | 4 +- .../Text/SourceLocationTracker.cs | 2 +- .../Text/TextBufferReader.cs | 10 +- src/Microsoft.AspNet.Razor/Text/TextChange.cs | 8 +- .../Text/TextExtensions.cs | 6 +- .../Tokenizer/CSharpHelpers.cs | 2 +- .../Tokenizer/CSharpTokenizer.cs | 8 +- .../Tokenizer/HtmlTokenizer.cs | 10 +- .../Tokenizer/Symbols/CSharpSymbol.cs | 2 +- .../Tokenizer/Tokenizer.cs | 14 +- .../CSharpRazorCodeLanguageTest.cs | 10 +- .../Editor/RazorEditorParserTest.cs | 36 ++-- .../Framework/CodeParserTestBase.cs | 2 +- .../Framework/MarkupParserTestBase.cs | 2 +- .../Framework/ParserTestBase.cs | 24 +-- .../Framework/RawTextSymbol.cs | 2 +- .../Framework/TestSpanBuilder.cs | 6 +- .../Generator/CSharpRazorCodeGeneratorTest.cs | 2 +- .../CodeTree/CSharpPaddingBuilderTests.cs | 4 +- .../Generator/RazorCodeGeneratorTest.cs | 12 +- .../Generator/TestSpan.cs | 2 +- .../Parser/BlockTest.cs | 30 +-- .../Parser/CSharp/CSharpBlockTest.cs | 6 +- .../Parser/CSharp/CSharpErrorTest.cs | 2 +- .../Parser/CallbackParserListenerTest.cs | 6 +- .../Parser/Html/HtmlAttributeTest.cs | 4 +- .../Parser/Html/HtmlBlockTest.cs | 2 +- .../Parser/Html/HtmlDocumentTest.cs | 6 +- .../Parser/ParserContextTest.cs | 38 ++-- .../Parser/ParserVisitorExtensionsTest.cs | 16 +- .../CSharpPartialParsingTest.cs | 172 +++++++++--------- .../PartialParsing/PartialParsingTestBase.cs | 22 +-- .../Parser/WhitespaceRewriterTest.cs | 4 +- .../RazorCodeLanguageTest.cs | 4 +- .../RazorDirectiveAttributeTest.cs | 4 +- .../RazorEngineHostTest.cs | 22 +-- .../Text/BufferingTextReaderTest.cs | 8 +- .../Text/LineTrackingStringBufferTest.cs | 4 +- .../Text/LookaheadTextReaderTestBase.cs | 20 +- .../Text/SourceLocationTest.cs | 2 +- .../Text/SourceLocationTrackerTest.cs | 28 +-- .../Text/TextBufferReaderTest.cs | 4 +- .../Text/TextChangeTest.cs | 74 ++++---- .../Text/TextReaderExtensionsTest.cs | 4 +- .../Tokenizer/TokenizerLookaheadTest.cs | 4 +- .../Tokenizer/TokenizerTestBase.cs | 6 +- .../Utils/DisposableActionTest.cs | 4 +- .../Utils/TestFile.cs | 2 +- 95 files changed, 549 insertions(+), 549 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/Common/HashCodeCombiner.cs b/src/Microsoft.AspNet.Razor/Common/HashCodeCombiner.cs index b8158f3af7..041bd911b6 100644 --- a/src/Microsoft.AspNet.Razor/Common/HashCodeCombiner.cs +++ b/src/Microsoft.AspNet.Razor/Common/HashCodeCombiner.cs @@ -23,7 +23,7 @@ namespace Microsoft.Internal.Web.Utils } else { - int count = 0; + var count = 0; foreach (object o in e) { Add(o); @@ -42,7 +42,7 @@ namespace Microsoft.Internal.Web.Utils public HashCodeCombiner Add(object o) { - int hashCode = (o != null) ? o.GetHashCode() : 0; + var hashCode = (o != null) ? o.GetHashCode() : 0; Add(hashCode); return this; } diff --git a/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs b/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs index b46ff5dd94..a1a0b5cf72 100644 --- a/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs +++ b/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs @@ -47,7 +47,7 @@ namespace Microsoft.AspNet.Razor.Parser.SyntaxTree public override bool Equals(object obj) { - AutoCompleteEditHandler other = obj as AutoCompleteEditHandler; + var other = obj as AutoCompleteEditHandler; return base.Equals(obj) && other != null && String.Equals(other.AutoCompleteString, AutoCompleteString, StringComparison.Ordinal) && diff --git a/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs b/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs index bad9fe0bfb..944343ba9e 100644 --- a/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs +++ b/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs @@ -86,19 +86,19 @@ namespace Microsoft.AspNet.Razor.Editor foreach (TextChange change in changes) { cancelToken.ThrowIfCancellationRequested(); - Span changeOwner = leftTree.LocateOwner(change); + var changeOwner = leftTree.LocateOwner(change); // Apply the change to the tree if (changeOwner == null) { return true; } - EditResult result = changeOwner.EditHandler.ApplyChange(changeOwner, change, force: true); + var result = changeOwner.EditHandler.ApplyChange(changeOwner, change, force: true); changeOwner.ReplaceWith(result.EditedSpan); } // Now compare the trees - bool treesDifferent = !leftTree.EquivalentTo(rightTree); + var treesDifferent = !leftTree.EquivalentTo(rightTree); return treesDifferent; } @@ -143,13 +143,13 @@ namespace Microsoft.AspNet.Razor.Editor private class MainThreadState : ThreadStateBase, IDisposable { - private CancellationTokenSource _cancelSource = new CancellationTokenSource(); - private ManualResetEventSlim _hasParcel = new ManualResetEventSlim(false); + private readonly CancellationTokenSource _cancelSource = new CancellationTokenSource(); + private readonly ManualResetEventSlim _hasParcel = new ManualResetEventSlim(false); private CancellationTokenSource _currentParcelCancelSource; [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Field is used in debug code and may be used later")] private string _fileName; - private object _stateLock = new object(); + private readonly object _stateLock = new object(); private IList _changes = new List(); public MainThreadState(string fileName) @@ -299,9 +299,9 @@ namespace Microsoft.AspNet.Razor.Editor private void WorkerLoop() { long? elapsedMs = null; - string fileNameOnly = Path.GetFileName(_fileName); + var fileNameOnly = Path.GetFileName(_fileName); #if EDITOR_TRACING - Stopwatch sw = new Stopwatch(); + var sw = new Stopwatch(); #endif try @@ -316,7 +316,7 @@ namespace Microsoft.AspNet.Razor.Editor while (!_shutdownToken.IsCancellationRequested) { // Grab the parcel of work to do - WorkParcel parcel = _main.GetParcel(); + var parcel = _main.GetParcel(); if (parcel.Changes.Any()) { RazorEditorTrace.TraceLine(RazorResources.FormatTrace_ChangesArrived(fileNameOnly, parcel.Changes.Count)); @@ -345,11 +345,11 @@ namespace Microsoft.AspNet.Razor.Editor allChanges = parcel.Changes.ToList(); } - TextChange finalChange = allChanges.Last(); + var finalChange = allChanges.Last(); #if EDITOR_TRACING sw.Start(); #endif - GeneratorResults results = ParseChange(finalChange.NewBuffer, linkedCancel.Token); + var results = ParseChange(finalChange.NewBuffer, linkedCancel.Token); #if EDITOR_TRACING sw.Stop(); elapsedMs = sw.ElapsedMilliseconds; @@ -369,7 +369,7 @@ namespace Microsoft.AspNet.Razor.Editor #if EDITOR_TRACING sw.Start(); #endif - bool treeStructureChanged = _currentParseTree == null || TreesAreDifferent(_currentParseTree, results.Document, allChanges, parcel.CancelToken); + var treeStructureChanged = _currentParseTree == null || TreesAreDifferent(_currentParseTree, results.Document, allChanges, parcel.CancelToken); #if EDITOR_TRACING sw.Stop(); elapsedMs = sw.ElapsedMilliseconds; @@ -401,7 +401,7 @@ namespace Microsoft.AspNet.Razor.Editor { // Rewind the buffer and sanity check the line mappings finalChange.NewBuffer.Position = 0; - int lineCount = finalChange.NewBuffer.ReadToEnd().Split(new string[] { Environment.NewLine, "\r", "\n" }, StringSplitOptions.None).Count(); + var lineCount = finalChange.NewBuffer.ReadToEnd().Split(new string[] { Environment.NewLine, "\r", "\n" }, StringSplitOptions.None).Count(); Debug.Assert( !args.GeneratorResults.DesignTimeLineMappings.Any(pair => pair.Value.StartLine > lineCount), "Found a design-time line mapping referring to a line outside the source file!"); @@ -456,7 +456,7 @@ namespace Microsoft.AspNet.Razor.Editor EnsureOnThread(); // Create a template engine - RazorTemplateEngine engine = new RazorTemplateEngine(_host); + var engine = new RazorTemplateEngine(_host); // Seek the buffer to the beginning buffer.Position = 0; diff --git a/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs index 75de5be89d..91ccb2193e 100644 --- a/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs +++ b/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Razor.Editor public override bool Equals(object obj) { - ImplicitExpressionEditHandler other = obj as ImplicitExpressionEditHandler; + var other = obj as ImplicitExpressionEditHandler; return other != null && base.Equals(other) && Keywords.SetEquals(other.Keywords) && @@ -74,7 +74,7 @@ namespace Microsoft.AspNet.Razor.Editor { return HandleReplacement(target, normalizedChange); } - int changeRelativePosition = normalizedChange.OldPosition - target.Start.AbsoluteIndex; + var changeRelativePosition = normalizedChange.OldPosition - target.Start.AbsoluteIndex; // Get the edit context char? lastChar = null; @@ -186,13 +186,13 @@ namespace Microsoft.AspNet.Razor.Editor private static bool RemainingIsWhitespace(Span target, TextChange change) { - int offset = (change.OldPosition - target.Start.AbsoluteIndex) + change.OldLength; + var offset = (change.OldPosition - target.Start.AbsoluteIndex) + change.OldLength; return String.IsNullOrWhiteSpace(target.Content.Substring(offset)); } private PartialParseResult HandleDotlessCommitInsertion(Span target) { - PartialParseResult result = PartialParseResult.Accepted; + var result = PartialParseResult.Accepted; if (!AcceptTrailingDot && target.Content.LastOrDefault() == '.') { result |= PartialParseResult.Provisional; @@ -207,9 +207,9 @@ namespace Microsoft.AspNet.Razor.Editor // 1. Insert "." at the end of this span // 2. Replace the "Date." at the end of the span with "DateTime." // We need partial parsing to accept case #2. - string oldText = GetOldText(target, change); + var oldText = GetOldText(target, change); - PartialParseResult result = PartialParseResult.Rejected; + var result = PartialParseResult.Rejected; if (EndsWithDot(oldText) && EndsWithDot(change.NewText)) { result = PartialParseResult.Accepted; @@ -265,7 +265,7 @@ namespace Microsoft.AspNet.Razor.Editor else if (EndsWithDot(change.NewText)) { // Accept it, possibly provisionally - PartialParseResult result = PartialParseResult.Accepted; + var result = PartialParseResult.Accepted; if (!AcceptTrailingDot) { result |= PartialParseResult.Provisional; @@ -297,7 +297,7 @@ namespace Microsoft.AspNet.Razor.Editor private PartialParseResult TryAcceptChange(Span target, TextChange change, PartialParseResult acceptResult = PartialParseResult.Accepted) { - string content = change.ApplyChange(target); + var content = change.ApplyChange(target); if (StartsWithKeyword(content)) { return PartialParseResult.Rejected | PartialParseResult.SpanContextChanged; @@ -308,7 +308,7 @@ namespace Microsoft.AspNet.Razor.Editor private bool StartsWithKeyword(string newContent) { - using (StringReader reader = new StringReader(newContent)) + using (var reader = new StringReader(newContent)) { return Keywords.Contains(reader.ReadWhile(ParserHelpers.IsIdentifierPart)); } diff --git a/src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs b/src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs index 87789fe904..d9b6b8279f 100644 --- a/src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs +++ b/src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs @@ -56,8 +56,8 @@ namespace Microsoft.AspNet.Razor.Editor public virtual EditResult ApplyChange(Span target, TextChange change, bool force) { - PartialParseResult result = PartialParseResult.Accepted; - TextChange normalized = change.Normalize(); + var result = PartialParseResult.Accepted; + var normalized = change.Normalize(); if (!force) { result = CanAcceptChange(target, normalized); @@ -73,8 +73,8 @@ namespace Microsoft.AspNet.Razor.Editor public virtual bool OwnsChange(Span target, TextChange change) { - int end = target.Start.AbsoluteIndex + target.Length; - int changeOldEnd = change.OldPosition + change.OldLength; + var end = target.Start.AbsoluteIndex + target.Length; + var changeOldEnd = change.OldPosition + change.OldLength; return change.OldPosition >= target.Start.AbsoluteIndex && (changeOldEnd < end || (changeOldEnd == end && AcceptedCharacters != AcceptedCharacters.None)); } @@ -86,8 +86,8 @@ namespace Microsoft.AspNet.Razor.Editor protected virtual SpanBuilder UpdateSpan(Span target, TextChange normalizedChange) { - string newContent = normalizedChange.ApplyChange(target); - SpanBuilder newSpan = new SpanBuilder(target); + var newContent = normalizedChange.ApplyChange(target); + var newSpan = new SpanBuilder(target); newSpan.ClearSymbols(); foreach (ISymbol sym in Tokenizer(newContent)) { @@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Razor.Editor } if (target.Next != null) { - SourceLocation newEnd = SourceLocationTracker.CalculateNewLocation(target.Start, newContent); + var newEnd = SourceLocationTracker.CalculateNewLocation(target.Start, newContent); target.Next.ChangeStart(newEnd); } return newSpan; @@ -104,7 +104,7 @@ namespace Microsoft.AspNet.Razor.Editor protected internal static bool IsAtEndOfFirstLine(Span target, TextChange change) { - int endOfFirstLine = target.Content.IndexOfAny(new char[] { (char)0x000d, (char)0x000a, (char)0x2028, (char)0x2029 }); + var endOfFirstLine = target.Content.IndexOfAny(new char[] { (char)0x000d, (char)0x000a, (char)0x2028, (char)0x2029 }); return (endOfFirstLine == -1 || (change.OldPosition - target.Start.AbsoluteIndex) <= endOfFirstLine); } @@ -168,7 +168,7 @@ namespace Microsoft.AspNet.Razor.Editor public override bool Equals(object obj) { - SpanEditHandler other = obj as SpanEditHandler; + var other = obj as SpanEditHandler; return other != null && AcceptedCharacters == other.AcceptedCharacters && EditorHints == other.EditorHints; diff --git a/src/Microsoft.AspNet.Razor/Generator/AddImportCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/AddImportCodeGenerator.cs index 848f6d89a9..b22eb474d4 100644 --- a/src/Microsoft.AspNet.Razor/Generator/AddImportCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/AddImportCodeGenerator.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Razor.Generator public override void GenerateCode(Span target, CodeGeneratorContext context) { - string ns = Namespace; + var ns = Namespace; if (!String.IsNullOrEmpty(ns) && Char.IsWhiteSpace(ns[0])) { @@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - AddImportCodeGenerator other = obj as AddImportCodeGenerator; + var other = obj as AddImportCodeGenerator; return other != null && String.Equals(Namespace, other.Namespace, StringComparison.Ordinal) && NamespaceKeywordLength == other.NamespaceKeywordLength; diff --git a/src/Microsoft.AspNet.Razor/Generator/AttributeBlockCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/AttributeBlockCodeGenerator.cs index 4e3c605391..a9873ecb87 100644 --- a/src/Microsoft.AspNet.Razor/Generator/AttributeBlockCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/AttributeBlockCodeGenerator.cs @@ -44,7 +44,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - AttributeBlockCodeGenerator other = obj as AttributeBlockCodeGenerator; + var other = obj as AttributeBlockCodeGenerator; return other != null && String.Equals(other.Name, Name, StringComparison.Ordinal) && Equals(other.Prefix, Prefix) && diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs index 4556ac2f12..dc2aa52d1a 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs @@ -120,7 +120,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp writer.WriteUsing(import); } - string taskNamespace = typeof(Task).Namespace; + var taskNamespace = typeof(Task).Namespace; // We need to add the task namespace but ONLY if it hasn't been added by the default imports or using imports yet. if (!defaultImports.Contains(taskNamespace) && !usingVisitor.ImportedUsings.Contains(taskNamespace)) diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs index 8b998fa154..f960a85d61 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpLineMappingWriter.cs @@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp { // Need to add an additional line at the end IF there wasn't one already written. // This is needed to work with the C# editor's handling of #line ... - bool endsWithNewline = _writer.GenerateCode().EndsWith("\n"); + var endsWithNewline = _writer.GenerateCode().EndsWith("\n"); // Always write at least 1 empty line to potentially separate code from pragmas. _writer.WriteLine(); diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpPaddingBuilder.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpPaddingBuilder.cs index f06ffe6257..db185651db 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpPaddingBuilder.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpPaddingBuilder.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp throw new ArgumentNullException("target"); } - int padding = CalculatePadding(target, generatedStart: 0); + var padding = CalculatePadding(target, generatedStart: 0); // We treat statement padding specially so for brace positioning, so that in the following example: // @if (foo > 0) @@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp padding--; } - string generatedCode = BuildPaddingInternal(padding); + var generatedCode = BuildPaddingInternal(padding); return generatedCode; } @@ -54,7 +54,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp public string BuildExpressionPadding(Span target, int generatedStart) { - int padding = CalculatePadding(target, generatedStart); + var padding = CalculatePadding(target, generatedStart); return BuildPaddingInternal(padding); } @@ -91,8 +91,8 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp { if (_host.DesignTimeMode && _host.IsIndentingWithTabs) { - int spaces = padding % _host.TabSize; - int tabs = padding / _host.TabSize; + var spaces = padding % _host.TabSize; + var tabs = padding / _host.TabSize; return new string('\t', tabs) + new string(' ', spaces); } @@ -104,7 +104,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp private static int CollectSpacesAndTabs(Span target, int tabSize) { - Span firstSpanInLine = target; + var firstSpanInLine = target; string currentContent = null; @@ -113,9 +113,9 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp // When scanning previous spans we need to be break down the spans with spaces. The parser combines // whitespace into existing spans so you'll see tabs, newlines etc. within spans. We only care about // the \t in existing spans. - String previousContent = firstSpanInLine.Previous.Content ?? String.Empty; + var previousContent = firstSpanInLine.Previous.Content ?? String.Empty; - int lastNewLineIndex = previousContent.LastIndexOfAny(_newLineChars); + var lastNewLineIndex = previousContent.LastIndexOfAny(_newLineChars); if (lastNewLineIndex < 0) { @@ -134,14 +134,14 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp } // We need to walk from the beginning of the line, because space + tab(tabSize) = tabSize columns, but tab(tabSize) + space = tabSize+1 columns. - Span currentSpanInLine = firstSpanInLine; + var currentSpanInLine = firstSpanInLine; if (currentContent == null) { currentContent = currentSpanInLine.Content; } - int padding = 0; + var padding = 0; while (currentSpanInLine != target) { if (currentContent != null) diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs index 14d4d0c682..b59154b911 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpCodeVisitor.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp Writer.Write(ItemParameterName).Write(" => ") .WriteStartNewObject(Context.Host.GeneratedClassContext.TemplateTypeName); - string currentTargetWriterName = Context.TargetWriterName; + var currentTargetWriterName = Context.TargetWriterName; Context.TargetWriterName = TemplateWriterName; using (Writer.BuildLambda(endLine: false, parameterNames: TemplateWriterName)) @@ -184,8 +184,8 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp return; } - ExpressionRenderingMode currentRenderingMode = Context.ExpressionRenderingMode; - string currentTargetWriterName = Context.TargetWriterName; + var currentRenderingMode = Context.ExpressionRenderingMode; + var currentTargetWriterName = Context.TargetWriterName; Context.TargetWriterName = ValueWriterName; @@ -261,7 +261,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp { Writer.WriteStartMethodInvocation("Tuple.Create", new string[] { "System.Object", "System.Int32" }); - ExpressionRenderingMode currentRenderingMode = Context.ExpressionRenderingMode; + var currentRenderingMode = Context.ExpressionRenderingMode; Context.ExpressionRenderingMode = ExpressionRenderingMode.InjectCode; Accept(chunk.Children); @@ -339,8 +339,8 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp if (firstChild != null) { - int currentIndent = Writer.CurrentIndent; - string designTimeAssignment = "__o = "; + var currentIndent = Writer.CurrentIndent; + var designTimeAssignment = "__o = "; Writer.ResetIndent(); var documentLocation = firstChild.Association.Start; diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpHelperVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpHelperVisitor.cs index 2f68e86aae..5ca07d9b42 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpHelperVisitor.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpHelperVisitor.cs @@ -23,10 +23,10 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp { IDisposable lambdaScope = null; - string accessibility = "public " + (Context.Host.StaticHelpers ? "static" : String.Empty); + var accessibility = "public " + (Context.Host.StaticHelpers ? "static" : String.Empty); // We want to write the method signature at 0 indentation so if helper's are formatted they format correctly. - int currentIndentation = Writer.CurrentIndent; + var currentIndentation = Writer.CurrentIndent; Writer.ResetIndent(); Writer.Write(accessibility).Write(" ").Write(Context.Host.GeneratedClassContext.TemplateTypeName).Write(" "); Writer.SetIndent(currentIndentation); @@ -44,7 +44,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp lambdaScope = Writer.BuildLambda(endLine: false, parameterNames: HelperWriterName); } - string currentTargetWriterName = Context.TargetWriterName; + var currentTargetWriterName = Context.TargetWriterName; Context.TargetWriterName = HelperWriterName; // Generate children code diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs index eda684ede8..39d9376baa 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs @@ -23,8 +23,8 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp protected override void Visit(UsingChunk chunk) { - string documentContent = ((Span)chunk.Association).Content.Trim(); - bool mapSemicolon = false; + var documentContent = ((Span)chunk.Association).Content.Trim(); + var mapSemicolon = false; if (documentContent.LastOrDefault() == ';') { diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/LineMapping.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/LineMapping.cs index 55e2b8a878..6bf06bd1ec 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/LineMapping.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/LineMapping.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler public override bool Equals(object obj) { - LineMapping other = obj as LineMapping; + var other = obj as LineMapping; return DocumentLocation.Equals(other.DocumentLocation) && GeneratedLocation.Equals(other.GeneratedLocation); } diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/MappingLocation.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/MappingLocation.cs index bb72d660b7..53a372892e 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/MappingLocation.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/LineMappings/MappingLocation.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler public override bool Equals(object obj) { - MappingLocation other = obj as MappingLocation; + var other = obj as MappingLocation; return AbsoluteIndex == other.AbsoluteIndex && ContentLength == other.ContentLength && diff --git a/src/Microsoft.AspNet.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs index 661cf4c68b..1dc4bf0a3b 100644 --- a/src/Microsoft.AspNet.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/DynamicAttributeBlockCodeGenerator.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - DynamicAttributeBlockCodeGenerator other = obj as DynamicAttributeBlockCodeGenerator; + var other = obj as DynamicAttributeBlockCodeGenerator; return other != null && Equals(other.Prefix, Prefix); } diff --git a/src/Microsoft.AspNet.Razor/Generator/HelperCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/HelperCodeGenerator.cs index bf05126bb0..68d21ecc8c 100644 --- a/src/Microsoft.AspNet.Razor/Generator/HelperCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/HelperCodeGenerator.cs @@ -37,7 +37,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - HelperCodeGenerator other = obj as HelperCodeGenerator; + var other = obj as HelperCodeGenerator; return other != null && base.Equals(other) && HeaderComplete == other.HeaderComplete && diff --git a/src/Microsoft.AspNet.Razor/Generator/LiteralAttributeCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/LiteralAttributeCodeGenerator.cs index d1cd665d9d..09fcdc1bb4 100644 --- a/src/Microsoft.AspNet.Razor/Generator/LiteralAttributeCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/LiteralAttributeCodeGenerator.cs @@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - LiteralAttributeCodeGenerator other = obj as LiteralAttributeCodeGenerator; + var other = obj as LiteralAttributeCodeGenerator; return other != null && Equals(other.Prefix, Prefix) && Equals(other.Value, Value) && diff --git a/src/Microsoft.AspNet.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs index 2184d9fda0..177a91e303 100644 --- a/src/Microsoft.AspNet.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/RazorDirectiveAttributeCodeGenerator.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - RazorDirectiveAttributeCodeGenerator other = obj as RazorDirectiveAttributeCodeGenerator; + var other = obj as RazorDirectiveAttributeCodeGenerator; return other != null && Name.Equals(other.Name, StringComparison.OrdinalIgnoreCase) && Value.Equals(other.Value, StringComparison.OrdinalIgnoreCase); diff --git a/src/Microsoft.AspNet.Razor/Generator/SectionCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/SectionCodeGenerator.cs index e4e2c7a76b..88b541e5c5 100644 --- a/src/Microsoft.AspNet.Razor/Generator/SectionCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/SectionCodeGenerator.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - SectionCodeGenerator other = obj as SectionCodeGenerator; + var other = obj as SectionCodeGenerator; return other != null && base.Equals(other) && String.Equals(SectionName, other.SectionName, StringComparison.Ordinal); diff --git a/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs index e37086cae1..7f62b0ab83 100644 --- a/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/SetBaseTypeCodeGenerator.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - SetBaseTypeCodeGenerator other = obj as SetBaseTypeCodeGenerator; + var other = obj as SetBaseTypeCodeGenerator; return other != null && String.Equals(BaseType, other.BaseType, StringComparison.Ordinal); } diff --git a/src/Microsoft.AspNet.Razor/Generator/SetLayoutCodeGenerator.cs b/src/Microsoft.AspNet.Razor/Generator/SetLayoutCodeGenerator.cs index 9ae0e9ec50..36edcfa207 100644 --- a/src/Microsoft.AspNet.Razor/Generator/SetLayoutCodeGenerator.cs +++ b/src/Microsoft.AspNet.Razor/Generator/SetLayoutCodeGenerator.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Razor.Generator public override bool Equals(object obj) { - SetLayoutCodeGenerator other = obj as SetLayoutCodeGenerator; + var other = obj as SetLayoutCodeGenerator; return other != null && String.Equals(other.LayoutPath, LayoutPath, StringComparison.Ordinal); } diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs index 03b6c4ae6d..db0d49678c 100644 --- a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs +++ b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Razor.Parser Context.CurrentBlock.Type = BlockType.Directive; // Accept spaces, but not newlines - bool foundSomeWhitespace = At(CSharpSymbolType.WhiteSpace); + var foundSomeWhitespace = At(CSharpSymbolType.WhiteSpace); AcceptWhile(CSharpSymbolType.WhiteSpace); Output(SpanKind.MetaCode, foundSomeWhitespace ? AcceptedCharacters.None : AcceptedCharacters.Any); @@ -51,7 +51,7 @@ namespace Microsoft.AspNet.Razor.Parser AcceptUntil(CSharpSymbolType.NewLine); Span.CodeGenerator = new SetLayoutCodeGenerator(Span.GetContent()); Span.EditHandler.EditorHints = EditorHints.LayoutPage | EditorHints.VirtualPath; - bool foundNewline = Optional(CSharpSymbolType.NewLine); + var foundNewline = Optional(CSharpSymbolType.NewLine); AddMarkerSymbolIfNecessary(); Output(SpanKind.MetaCode, foundNewline ? AcceptedCharacters.None : AcceptedCharacters.Any); } @@ -75,7 +75,7 @@ namespace Microsoft.AspNet.Razor.Parser Context.CurrentBlock.Type = BlockType.Directive; // Accept whitespace - CSharpSymbol remainingWs = AcceptSingleWhiteSpaceCharacter(); + var remainingWs = AcceptSingleWhiteSpaceCharacter(); if (Span.Symbols.Count > 1) { @@ -97,7 +97,7 @@ namespace Microsoft.AspNet.Razor.Parser } // Pull out the type name - string sessionStateValue = String.Concat( + var sessionStateValue = String.Concat( Span.Symbols .Cast() .Select(sym => sym.Content)).Trim(); @@ -119,14 +119,14 @@ namespace Microsoft.AspNet.Razor.Parser [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "C# Keywords are always lower-case")] protected virtual void HelperDirective() { - bool nested = Context.IsWithin(BlockType.Helper); + var nested = Context.IsWithin(BlockType.Helper); // Set the block and span type Context.CurrentBlock.Type = BlockType.Helper; // Verify we're on "helper" and accept AssertDirective(SyntaxConstants.CSharp.HelperKeyword); - Block block = new Block(CurrentSymbol.Content.ToString().ToLowerInvariant(), CurrentLocation); + var block = new Block(CurrentSymbol.Content.ToString().ToLowerInvariant(), CurrentLocation); AcceptAndMoveNext(); if (nested) @@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Razor.Parser return; } - CSharpSymbol remainingWs = AcceptSingleWhiteSpaceCharacter(); + var remainingWs = AcceptSingleWhiteSpaceCharacter(); // Output metacode and continue Output(SpanKind.MetaCode); @@ -170,7 +170,7 @@ namespace Microsoft.AspNet.Razor.Parser AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); // Don't accept newlines. // Expecting an identifier (helper name) - bool errorReported = !Required(CSharpSymbolType.Identifier, errorIfNotFound: true, errorBase: RazorResources.FormatParseError_Unexpected_Character_At_Helper_Name_Start); + var errorReported = !Required(CSharpSymbolType.Identifier, errorIfNotFound: true, errorBase: RazorResources.FormatParseError_Unexpected_Character_At_Helper_Name_Start); if (!errorReported) { Assert(CSharpSymbolType.Identifier); @@ -180,7 +180,7 @@ namespace Microsoft.AspNet.Razor.Parser AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); // Expecting parameter list start: "(" - SourceLocation bracketErrorPos = CurrentLocation; + var bracketErrorPos = CurrentLocation; if (!Optional(CSharpSymbolType.LeftParenthesis)) { if (!errorReported) @@ -193,7 +193,7 @@ namespace Microsoft.AspNet.Razor.Parser } else { - SourceLocation bracketStart = CurrentLocation; + var bracketStart = CurrentLocation; if (!Balance(BalancingModes.NoErrorOnFailure, CSharpSymbolType.LeftParenthesis, CSharpSymbolType.RightParenthesis, @@ -207,12 +207,12 @@ namespace Microsoft.AspNet.Razor.Parser Optional(CSharpSymbolType.RightParenthesis); } - int bookmark = CurrentLocation.AbsoluteIndex; + var bookmark = CurrentLocation.AbsoluteIndex; IEnumerable ws = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); // Expecting a "{" - SourceLocation errorLocation = CurrentLocation; - bool headerComplete = At(CSharpSymbolType.LeftBrace); + var errorLocation = CurrentLocation; + var headerComplete = At(CSharpSymbolType.LeftBrace); if (headerComplete) { Accept(ws); @@ -235,7 +235,7 @@ namespace Microsoft.AspNet.Razor.Parser // Grab the signature and build the code generator AddMarkerSymbolIfNecessary(); LocationTagged signature = Span.GetContent(); - HelperCodeGenerator blockGen = new HelperCodeGenerator(signature, headerComplete); + var blockGen = new HelperCodeGenerator(signature, headerComplete); Context.CurrentBlock.CodeGenerator = blockGen; // The block will generate appropriate code, @@ -254,7 +254,7 @@ namespace Microsoft.AspNet.Razor.Parser } // We're valid, so parse the nested block - AutoCompleteEditHandler bodyEditHandler = new AutoCompleteEditHandler(Language.TokenizeString); + var bodyEditHandler = new AutoCompleteEditHandler(Language.TokenizeString); using (PushSpanConfig(DefaultSpanConfig)) { using (Context.StartBlock(BlockType.Statement)) @@ -289,8 +289,8 @@ namespace Microsoft.AspNet.Razor.Parser protected virtual void SectionDirective() { - bool nested = Context.IsWithin(BlockType.Section); - bool errorReported = false; + var nested = Context.IsWithin(BlockType.Section); + var errorReported = false; // Set the block and span type Context.CurrentBlock.Type = BlockType.Section; @@ -308,7 +308,7 @@ namespace Microsoft.AspNet.Razor.Parser IEnumerable ws = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: false)); // Get the section name - string sectionName = String.Empty; + var sectionName = String.Empty; if (!Required(CSharpSymbolType.Identifier, errorIfNotFound: true, errorBase: RazorResources.FormatParseError_Unexpected_Character_At_Section_Name_Start)) @@ -330,11 +330,11 @@ namespace Microsoft.AspNet.Razor.Parser } Context.CurrentBlock.CodeGenerator = new SectionCodeGenerator(sectionName); - SourceLocation errorLocation = CurrentLocation; + var errorLocation = CurrentLocation; ws = ReadWhile(IsSpacingToken(includeNewLines: true, includeComments: false)); // Get the starting brace - bool sawStartingBrace = At(CSharpSymbolType.LeftBrace); + var sawStartingBrace = At(CSharpSymbolType.LeftBrace); if (!sawStartingBrace) { if (!errorReported) @@ -357,7 +357,7 @@ namespace Microsoft.AspNet.Razor.Parser } // Set up edit handler - AutoCompleteEditHandler editHandler = new AutoCompleteEditHandler(Language.TokenizeString) { AutoCompleteAtEndOfSpan = true }; + var editHandler = new AutoCompleteEditHandler(Language.TokenizeString) { AutoCompleteAtEndOfSpan = true }; Span.EditHandler = editHandler; Span.Accept(CurrentSymbol); @@ -391,7 +391,7 @@ namespace Microsoft.AspNet.Razor.Parser // Verify we're on "functions" and accept AssertDirective(SyntaxConstants.CSharp.FunctionsKeyword); - Block block = new Block(CurrentSymbol); + var block = new Block(CurrentSymbol); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: false)); @@ -410,13 +410,13 @@ namespace Microsoft.AspNet.Razor.Parser } // Capture start point and continue - SourceLocation blockStart = CurrentLocation; + var blockStart = CurrentLocation; AcceptAndMoveNext(); // Output what we've seen and continue Output(SpanKind.MetaCode); - AutoCompleteEditHandler editHandler = new AutoCompleteEditHandler(Language.TokenizeString); + var editHandler = new AutoCompleteEditHandler(Language.TokenizeString); Span.EditHandler = editHandler; Balance(BalancingModes.NoErrorOnFailure, CSharpSymbolType.LeftBrace, CSharpSymbolType.RightBrace, blockStart); @@ -469,7 +469,7 @@ namespace Microsoft.AspNet.Razor.Parser Context.CurrentBlock.Type = BlockType.Directive; // Accept whitespace - CSharpSymbol remainingWs = AcceptSingleWhiteSpaceCharacter(); + var remainingWs = AcceptSingleWhiteSpaceCharacter(); if (Span.Symbols.Count > 1) { diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs index 72f63b1127..795f4a307d 100644 --- a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs +++ b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs @@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Razor.Parser private void UsingKeyword(bool topLevel) { Assert(CSharpKeyword.Using); - Block block = new Block(CurrentSymbol); + var block = new Block(CurrentSymbol); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); @@ -293,7 +293,7 @@ namespace Microsoft.AspNet.Razor.Parser { return; } - Block block = new Block(CurrentSymbol); + var block = new Block(CurrentSymbol); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); @@ -332,7 +332,7 @@ namespace Microsoft.AspNet.Razor.Parser private void UnconditionalBlock() { Assert(CSharpSymbolType.Keyword); - Block block = new Block(CurrentSymbol); + var block = new Block(CurrentSymbol); AcceptAndMoveNext(); AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); ExpectCodeBlock(block); @@ -341,7 +341,7 @@ namespace Microsoft.AspNet.Razor.Parser private void ConditionalBlock(bool topLevel) { Assert(CSharpSymbolType.Keyword); - Block block = new Block(CurrentSymbol); + var block = new Block(CurrentSymbol); ConditionalBlock(block); if (topLevel) { @@ -366,7 +366,7 @@ namespace Microsoft.AspNet.Razor.Parser { if (At(CSharpSymbolType.LeftParenthesis)) { - bool complete = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates); + var complete = Balance(BalancingModes.BacktrackOnFailure | BalancingModes.AllowCommentsAndTemplates); if (!complete) { AcceptUntil(CSharpSymbolType.NewLine); @@ -390,7 +390,7 @@ namespace Microsoft.AspNet.Razor.Parser Span.EditHandler.AcceptedCharacters = AcceptedCharacters.Any; // Accept whitespace but always keep the last whitespace node so we can put it back if necessary - CSharpSymbol lastWs = AcceptWhiteSpaceInLines(); + var lastWs = AcceptWhiteSpaceInLines(); Debug.Assert(lastWs == null || (lastWs.Start.AbsoluteIndex + lastWs.Content.Length == CurrentLocation.AbsoluteIndex)); if (EndOfFile) @@ -402,13 +402,13 @@ namespace Microsoft.AspNet.Razor.Parser return; } - CSharpSymbolType type = CurrentSymbol.Type; - SourceLocation loc = CurrentLocation; + var type = CurrentSymbol.Type; + var loc = CurrentLocation; - bool isSingleLineMarkup = type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.Colon); - bool isMarkup = isSingleLineMarkup || - type == CSharpSymbolType.LessThan || - (type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.LessThan)); + var isSingleLineMarkup = type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.Colon); + var isMarkup = isSingleLineMarkup || + type == CSharpSymbolType.LessThan || + (type == CSharpSymbolType.Transition && NextIs(CSharpSymbolType.LessThan)); if (Context.DesignTimeMode || !isMarkup) { @@ -487,7 +487,7 @@ namespace Microsoft.AspNet.Razor.Parser { // First, verify the type of the block Assert(CSharpSymbolType.Transition); - CSharpSymbol transition = CurrentSymbol; + var transition = CurrentSymbol; NextToken(); if (At(CSharpSymbolType.Transition)) @@ -527,7 +527,7 @@ namespace Microsoft.AspNet.Razor.Parser { while (!EndOfFile) { - int bookmark = CurrentLocation.AbsoluteIndex; + var bookmark = CurrentLocation.AbsoluteIndex; IEnumerable read = ReadWhile(sym => sym.Type != CSharpSymbolType.Semicolon && sym.Type != CSharpSymbolType.RazorCommentTransition && sym.Type != CSharpSymbolType.Transition && diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs index c26241b6a9..018d11683e 100644 --- a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs +++ b/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs @@ -147,7 +147,7 @@ namespace Microsoft.AspNet.Razor.Parser AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); - CSharpSymbol current = CurrentSymbol; + var current = CurrentSymbol; if (At(CSharpSymbolType.StringLiteral) && CurrentSymbol.Content.Length > 0 && CurrentSymbol.Content[0] == SyntaxConstants.TransitionCharacter) { Tuple split = Language.SplitSymbol(CurrentSymbol, 1, CSharpSymbolType.Transition); @@ -279,7 +279,7 @@ namespace Microsoft.AspNet.Razor.Parser private void VerbatimBlock() { Assert(CSharpSymbolType.LeftBrace); - Block block = new Block(RazorResources.BlockName_Code, CurrentLocation); + var block = new Block(RazorResources.BlockName_Code, CurrentLocation); AcceptAndMoveNext(); // Set up the "{" span and output @@ -288,7 +288,7 @@ namespace Microsoft.AspNet.Razor.Parser Output(SpanKind.MetaCode); // Set up auto-complete and parse the code block - AutoCompleteEditHandler editHandler = new AutoCompleteEditHandler(Language.TokenizeString); + var editHandler = new AutoCompleteEditHandler(Language.TokenizeString); Span.EditHandler = editHandler; CodeBlock(false, block); @@ -391,7 +391,7 @@ namespace Microsoft.AspNet.Razor.Parser } if (CurrentSymbol.Type == CSharpSymbolType.Dot) { - CSharpSymbol dot = CurrentSymbol; + var dot = CurrentSymbol; if (NextToken()) { if (At(CSharpSymbolType.Identifier) || At(CSharpSymbolType.Keyword)) @@ -485,7 +485,7 @@ namespace Microsoft.AspNet.Razor.Parser private void ExplicitExpression() { - Block block = new Block(RazorResources.BlockName_ExplicitExpression, CurrentLocation); + var block = new Block(RazorResources.BlockName_ExplicitExpression, CurrentLocation); Assert(CSharpSymbolType.LeftParenthesis); AcceptAndMoveNext(); Span.EditHandler.AcceptedCharacters = AcceptedCharacters.None; @@ -493,7 +493,7 @@ namespace Microsoft.AspNet.Razor.Parser Output(SpanKind.MetaCode); using (PushSpanConfig(ConfigureExplicitExpressionSpan)) { - bool success = Balance( + var success = Balance( BalancingModes.BacktrackOnFailure | BalancingModes.NoErrorOnFailure | BalancingModes.AllowCommentsAndTemplates, CSharpSymbolType.LeftParenthesis, CSharpSymbolType.RightParenthesis, @@ -553,7 +553,7 @@ namespace Microsoft.AspNet.Razor.Parser private void NestedBlock() { Output(SpanKind.Code); - bool wasNested = IsNested; + var wasNested = IsNested; IsNested = true; using (PushSpanConfig()) { diff --git a/src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs b/src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs index c9a2508df2..c49c0cdf49 100644 --- a/src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs +++ b/src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs @@ -20,17 +20,17 @@ namespace Microsoft.AspNet.Razor.Parser protected override bool CanRewrite(Block block) { - AttributeBlockCodeGenerator gen = block.CodeGenerator as AttributeBlockCodeGenerator; + var gen = block.CodeGenerator as AttributeBlockCodeGenerator; return gen != null && block.Children.Any() && block.Children.All(IsLiteralAttributeValue); } protected override SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block) { // Collect the content of this node - string content = String.Concat(block.Children.Cast().Select(s => s.Content)); + var content = String.Concat(block.Children.Cast().Select(s => s.Content)); // Create a new span containing this content - SpanBuilder span = new SpanBuilder(); + var span = new SpanBuilder(); span.EditHandler = new SpanEditHandler(HtmlTokenizer.Tokenize); FillSpan(span, block.Children.Cast().First().Start, content); return span.Build(); @@ -42,10 +42,10 @@ namespace Microsoft.AspNet.Razor.Parser { return false; } - Span span = node as Span; + var span = node as Span; Debug.Assert(span != null); - LiteralAttributeCodeGenerator litGen = span.CodeGenerator as LiteralAttributeCodeGenerator; + var litGen = span.CodeGenerator as LiteralAttributeCodeGenerator; return span != null && ((litGen != null && litGen.ValueGenerator == null) || diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs b/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs index 858e3a635c..cd95ce4e1e 100644 --- a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs +++ b/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs @@ -104,7 +104,7 @@ namespace Microsoft.AspNet.Razor.Parser { // Parse until a newline, it's that simple! // First, signal to code parser that whitespace is significant to us. - bool old = Context.WhiteSpaceIsSignificantToAncestorBlock; + var old = Context.WhiteSpaceIsSignificantToAncestorBlock; Context.WhiteSpaceIsSignificantToAncestorBlock = true; Span.EditHandler = new SingleLineMarkupEditHandler(Language.TokenizeString); SkipToAndParseCode(HtmlSymbolType.NewLine); @@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Razor.Parser private void TagBlock(Stack> tags) { // Skip Whitespace and Text - bool complete = false; + var complete = false; do { SkipToAndParseCode(HtmlSymbolType.OpenAngle); @@ -149,7 +149,7 @@ namespace Microsoft.AspNet.Razor.Parser _lastTagStart = CurrentLocation; Assert(HtmlSymbolType.OpenAngle); _bufferedOpenAngle = CurrentSymbol; - SourceLocation tagStart = CurrentLocation; + var tagStart = CurrentLocation; if (!NextToken()) { Accept(_bufferedOpenAngle); @@ -275,7 +275,7 @@ namespace Microsoft.AspNet.Razor.Parser { // Accept "/" and move next Assert(HtmlSymbolType.ForwardSlash); - HtmlSymbol solidus = CurrentSymbol; + var solidus = CurrentSymbol; if (!NextToken()) { Accept(_bufferedOpenAngle); @@ -284,12 +284,12 @@ namespace Microsoft.AspNet.Razor.Parser } else { - string tagName = String.Empty; + var tagName = String.Empty; if (At(HtmlSymbolType.Text)) { tagName = CurrentSymbol.Content; } - bool matched = RemoveTag(tags, tagName, tagStart); + var matched = RemoveTag(tags, tagName, tagStart); if (tags.Count == 0 && String.Equals(tagName, SyntaxConstants.TextTagName, StringComparison.OrdinalIgnoreCase) && @@ -318,7 +318,7 @@ namespace Microsoft.AspNet.Razor.Parser private bool EndTextTag(HtmlSymbol solidus, IDisposable tagBlockWrapper) { - SourceLocation start = _bufferedOpenAngle.Start; + var start = _bufferedOpenAngle.Start; Accept(_bufferedOpenAngle); Accept(solidus); @@ -326,7 +326,7 @@ namespace Microsoft.AspNet.Razor.Parser Assert(HtmlSymbolType.Text); AcceptAndMoveNext(); - bool seenCloseAngle = Optional(HtmlSymbolType.CloseAngle); + var seenCloseAngle = Optional(HtmlSymbolType.CloseAngle); if (!seenCloseAngle) { @@ -456,14 +456,14 @@ namespace Microsoft.AspNet.Razor.Parser { // First, determine if this is a 'data-' attribute (since those can't use conditional attributes) LocationTagged name = nameSymbols.GetContent(Span.Start); - bool attributeCanBeConditional = !name.Value.StartsWith("data-", StringComparison.OrdinalIgnoreCase); + var attributeCanBeConditional = !name.Value.StartsWith("data-", StringComparison.OrdinalIgnoreCase); // Accept the whitespace and name Accept(whitespace); Accept(nameSymbols); Assert(HtmlSymbolType.Equals); // We should be at "=" AcceptAndMoveNext(); - HtmlSymbolType quote = HtmlSymbolType.Unknown; + var quote = HtmlSymbolType.Unknown; if (At(HtmlSymbolType.SingleQuote) || At(HtmlSymbolType.DoubleQuote)) { quote = CurrentSymbol.Type; @@ -516,13 +516,13 @@ namespace Microsoft.AspNet.Razor.Parser private void AttributeValue(HtmlSymbolType quote) { - SourceLocation prefixStart = CurrentLocation; + var prefixStart = CurrentLocation; var prefix = ReadWhile(sym => sym.Type == HtmlSymbolType.WhiteSpace || sym.Type == HtmlSymbolType.NewLine); Accept(prefix); if (At(HtmlSymbolType.Transition)) { - SourceLocation valueStart = CurrentLocation; + var valueStart = CurrentLocation; PutCurrentBack(); // Output the prefix but as a null-span. DynamicAttributeBlockCodeGenerator will render it @@ -543,7 +543,7 @@ namespace Microsoft.AspNet.Razor.Parser NextIs(HtmlSymbolType.ForwardSlash)) { // Virtual Path value - SourceLocation valueStart = CurrentLocation; + var valueStart = CurrentLocation; VirtualPath(); Span.CodeGenerator = new LiteralAttributeCodeGenerator( prefix.GetContent(prefixStart), @@ -634,7 +634,7 @@ namespace Microsoft.AspNet.Razor.Parser private void ParseQuoted() { - HtmlSymbolType type = CurrentSymbol.Type; + var type = CurrentSymbol.Type; AcceptAndMoveNext(); ParseQuoted(type); } @@ -674,9 +674,9 @@ namespace Microsoft.AspNet.Razor.Parser AcceptAndMoveNext(); - int bookmark = CurrentLocation.AbsoluteIndex; + var bookmark = CurrentLocation.AbsoluteIndex; IEnumerable tokens = ReadWhile(IsSpacingToken(includeNewLines: true)); - bool empty = At(HtmlSymbolType.ForwardSlash); + var empty = At(HtmlSymbolType.ForwardSlash); if (empty) { Accept(tokens); @@ -727,7 +727,7 @@ namespace Microsoft.AspNet.Razor.Parser return false; } - bool isEmpty = At(HtmlSymbolType.ForwardSlash); + var isEmpty = At(HtmlSymbolType.ForwardSlash); // Found a solidus, so don't accept it but DON'T push the tag to the stack if (isEmpty) { @@ -735,7 +735,7 @@ namespace Microsoft.AspNet.Razor.Parser } // Check for the '>' to determine if the tag is finished - bool seenClose = Optional(HtmlSymbolType.CloseAngle); + var seenClose = Optional(HtmlSymbolType.CloseAngle); if (!seenClose) { Context.OnError(tag.Item2, RazorResources.FormatParseError_UnfinishedTag(tag.Item1.Content)); @@ -745,7 +745,7 @@ namespace Microsoft.AspNet.Razor.Parser if (!isEmpty) { // Is this a void element? - string tagName = tag.Item1.Content.Trim(); + var tagName = tag.Item1.Content.Trim(); if (VoidElements.Contains(tagName)) { CompleteTagBlockWithSpan(tagBlockWrapper, AcceptedCharacters.None, SpanKind.Markup); @@ -753,7 +753,7 @@ namespace Microsoft.AspNet.Razor.Parser // Technically, void elements like "meta" are not allowed to have end tags. Just in case they do, // we need to look ahead at the next set of tokens. If we see "<", "/", tag name, accept it and the ">" following it // Place a bookmark - int bookmark = CurrentLocation.AbsoluteIndex; + var bookmark = CurrentLocation.AbsoluteIndex; // Skip whitespace IEnumerable whiteSpace = ReadWhile(IsSpacingToken(includeNewLines: true)); @@ -761,10 +761,10 @@ namespace Microsoft.AspNet.Razor.Parser // Open Angle if (At(HtmlSymbolType.OpenAngle) && NextIs(HtmlSymbolType.ForwardSlash)) { - HtmlSymbol openAngle = CurrentSymbol; + var openAngle = CurrentSymbol; NextToken(); Assert(HtmlSymbolType.ForwardSlash); - HtmlSymbol solidus = CurrentSymbol; + var solidus = CurrentSymbol; NextToken(); if (At(HtmlSymbolType.Text) && string.Equals(CurrentSymbol.Content, tagName, StringComparison.OrdinalIgnoreCase)) { @@ -819,12 +819,12 @@ namespace Microsoft.AspNet.Razor.Parser private void SkipToEndScriptAndParseCode(AcceptedCharacters endTagAcceptedCharacters = AcceptedCharacters.Any) { // Special case for