Merge branch 'release' into dev
This commit is contained in:
commit
102e2e5739
|
|
@ -425,17 +425,17 @@ namespace Microsoft.AspNet.Razor.Parser
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CompleteBlock()
|
protected void CompleteBlock()
|
||||||
{
|
{
|
||||||
CompleteBlock(insertMarkerIfNecessary: true);
|
CompleteBlock(insertMarkerIfNecessary: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CompleteBlock(bool insertMarkerIfNecessary)
|
protected void CompleteBlock(bool insertMarkerIfNecessary)
|
||||||
{
|
{
|
||||||
CompleteBlock(insertMarkerIfNecessary, captureWhitespaceToEndOfLine: insertMarkerIfNecessary);
|
CompleteBlock(insertMarkerIfNecessary, captureWhitespaceToEndOfLine: insertMarkerIfNecessary);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void CompleteBlock(bool insertMarkerIfNecessary, bool captureWhitespaceToEndOfLine)
|
protected void CompleteBlock(bool insertMarkerIfNecessary, bool captureWhitespaceToEndOfLine)
|
||||||
{
|
{
|
||||||
if (insertMarkerIfNecessary && Context.LastAcceptedCharacters != AcceptedCharacters.Any)
|
if (insertMarkerIfNecessary && Context.LastAcceptedCharacters != AcceptedCharacters.Any)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue