Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions src/Spark.Tests/Parser/ViewLoaderTester.cs
Original file line number Diff line number Diff line change
Expand Up @@ -311,5 +311,31 @@ public void PartialsInCascadingBaseFoldersAndSharedFoldersAreDiscovered()
Assert.That(partials, Has.None.EqualTo("dontfind2"));
Assert.That(partials, Has.None.EqualTo("dontfind3"));
}

[Test]
public void LoadingEmptyFile()
{
var viewFolder = new InMemoryViewFolder
{
{Path.Combine("home", "empty.spark"), ""},
};
var viewLoader = new ViewLoader { SyntaxProvider = new DefaultSyntaxProvider(ParserSettings.DefaultBehavior), ViewFolder = viewFolder };
var chunks = viewLoader.Load(Path.Combine("home", "empty.spark"));
var everything = viewLoader.GetEverythingLoaded();
Assert.AreEqual(1, everything.Count());
}

[Test]
public void LoadingEmptyShadeFile()
{
var viewFolder = new InMemoryViewFolder
{
{Path.Combine("home", "empty.shade"), ""},
};
var viewLoader = new ViewLoader { SyntaxProvider = new DefaultSyntaxProvider(ParserSettings.DefaultBehavior), ViewFolder = viewFolder };
var chunks = viewLoader.Load(Path.Combine("home", "empty.shade"));
var everything = viewLoader.GetEverythingLoaded();
Assert.AreEqual(1, everything.Count());
}
}
}
2 changes: 1 addition & 1 deletion src/Spark/Parser/Grammar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public static ParseAction<IList<TValue>> Rep<TValue>(ParseAction<TValue> parse)

var rest = input;
var result = parse(rest);
while (result != null)
while (result != null && !rest.IsSamePosition(result.Rest))
{
list.Add(result.Value);
rest = result.Rest;
Expand Down
12 changes: 12 additions & 0 deletions src/Spark/Parser/Position.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,18 @@ public Position(SourceContext sourceContext, int sourceContextLength, int offset
this.paintLink = paintLink;
}

public bool IsSamePosition(Position position)
{
if (position == null)
throw new ArgumentNullException("position");

if (object.ReferenceEquals(position, this)) //obviously
return true;
return position.Column == this.Column
&& position.Line == this.Line
&& position.Offset == this.Offset;
}

public SourceContext SourceContext
{
get
Expand Down