Rebased onto latest dev.
- Fixed tag helper parse tree visitor rebase error.
This commit is contained in:
parent
b1b1da0781
commit
0b5f0cd565
|
|
@ -50,5 +50,10 @@ namespace Microsoft.AspNet.Razor.Generator
|
||||||
/// <see cref="TargetWriterName"/>, i.e. WriteLiteralTo(myWriter, "Hello World").
|
/// <see cref="TargetWriterName"/>, i.e. WriteLiteralTo(myWriter, "Hello World").
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
public string TargetWriterName { get; set; }
|
public string TargetWriterName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by <see cref="SourceFile"/>.
|
||||||
|
/// </summary>
|
||||||
|
public string Checksum { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -40,10 +40,5 @@ namespace Microsoft.AspNet.Razor.Generator
|
||||||
public RazorEngineHost Host { get; private set; }
|
public RazorEngineHost Host { get; private set; }
|
||||||
|
|
||||||
public CodeTreeBuilder CodeTreeBuilder { get; set; }
|
public CodeTreeBuilder CodeTreeBuilder { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets the <c>SHA1</c> based checksum for the file whose location is defined by <see cref="SourceFile"/>.
|
|
||||||
/// </summary>
|
|
||||||
public string Checksum { get; set; }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -150,6 +150,10 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
|
||||||
{
|
{
|
||||||
name = symbol.Content;
|
name = symbol.Content;
|
||||||
}
|
}
|
||||||
|
else if (afterEquals)
|
||||||
|
{
|
||||||
|
builder.Accept(symbol);
|
||||||
|
}
|
||||||
else if (symbol.Type == HtmlSymbolType.Equals)
|
else if (symbol.Type == HtmlSymbolType.Equals)
|
||||||
{
|
{
|
||||||
// We've found an '=' symbol, this means that the coming symbols will either be a quote
|
// We've found an '=' symbol, this means that the coming symbols will either be a quote
|
||||||
|
|
@ -174,10 +178,6 @@ namespace Microsoft.AspNet.Razor.Parser.TagHelpers
|
||||||
|
|
||||||
afterEquals = true;
|
afterEquals = true;
|
||||||
}
|
}
|
||||||
else if (afterEquals)
|
|
||||||
{
|
|
||||||
builder.Accept(symbol);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return new KeyValuePair<string, SyntaxTreeNode>(name, builder.Build());
|
return new KeyValuePair<string, SyntaxTreeNode>(name, builder.Build());
|
||||||
|
|
|
||||||
|
|
@ -253,10 +253,8 @@ namespace Microsoft.AspNet.Razor
|
||||||
generator.Visit(results);
|
generator.Visit(results);
|
||||||
|
|
||||||
var codeBuilderContext = new CodeBuilderContext(generator.Context);
|
var codeBuilderContext = new CodeBuilderContext(generator.Context);
|
||||||
|
codeBuilderContext.Checksum = checksum;
|
||||||
var builder = CreateCodeBuilder(codeBuilderContext);
|
var builder = CreateCodeBuilder(codeBuilderContext);
|
||||||
codeGenerationContext.Checksum = checksum;
|
|
||||||
|
|
||||||
var builder = CreateCodeBuilder(codeGenerationContext);
|
|
||||||
var builderResult = builder.Build();
|
var builderResult = builder.Build();
|
||||||
|
|
||||||
// Collect results and return
|
// Collect results and return
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue