Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add SingleLineComment support to object #11

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add SingleLineComment support to object #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf7c5d4
Add SingleLineComment support to object
BrentSouza Jul 27, 2022
4412131
Heredoc was matching terminator within text
BrentSouza Aug 26, 2022
bffb0f0
Only match terminator after a new line
BrentSouza Aug 26, 2022
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
13 changes: 8 additions & 5 deletions source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/Hcl2TemplateParserTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,17 @@ public void TestStringLiteralSuccess(string index, string expected)
result.ToString().Should().Be(expected);
}

[TestCase("object({name = \"string\", age = \"number\"})")]
[TestCase("object({name = \"string\", age = object({name = \"string\", age = \"number\"})})")]
[TestCase("object({name = \"string\", age = \"number\"})", -1)]
[TestCase("object({name = \"string\", age = object({name = \"string\", age = \"number\"})})", -1)]
[TestCase("object({\n name = \"string\"\n # this is a name\n age = \"number\"\n # this is the age\n})", 0)]
[TestCase(
"object({name = \"string\", age = object({name = \"string\", age = \"number\"}), address = tuple([\"string\", object({name = \"string\", age = \"number\"})])})")]
public void ObjectTypeTest(string index)
"object({name = \"string\", age = object({name = \"string\", age = \"number\"}), address = tuple([\"string\", object({name = \"string\", age = \"number\"})])})",
-1
)]
public void ObjectTypeTest(string index, int indent)
{
var result = HclParser.ObjectTypeProperty.Parse(index);
result.ToString(-1).Should().Be(index);
result.ToString(indent).Should().Be(index);
}

[TestCase("tuple([\"string\", \"number\"])")]
Expand Down
2 changes: 1 addition & 1 deletion source/Octopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/HclTemplateParserTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public void ParseHereDoc()
{
var template = TerraformLoadTemplate("multilinestring.txt");
var parsed = HclParser.HereDoc.Parse(template);
parsed.Item3.Should().Match("\nHello\nWorld\n");
parsed.Item3.Should().Match("\nHello\nWorld\nTHEPARSERSHOULDNOTMATCHTHIS DESCRIPTION\nHello\nAgain\n");
}

[Test]
Expand Down
3 changes: 3 additions & 0 deletions ...ctopus.Core.Parsers.Hcl.Tests/Octopus/CoreParsers/Hcl/TemplateSamples/multilinestring.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<<DESCRIPTION
Hello
World
THEPARSERSHOULDNOTMATCHTHIS DESCRIPTION
Hello
Again
DESCRIPTION
18 changes: 13 additions & 5 deletions source/Octopus.Core.Parsers.Hcl/Octopus/CoreParsers/Hcl/HclParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,11 +282,18 @@ from last in Parse.String("*/")
from indentMarker in Parse.Char('-').Optional()
from marker in Parse.AnyChar.Except(Parse.Char(LineBreak)).Many().Text()
from lineBreak in Parse.Char(LineBreak)
from rest in Parse.AnyChar.Except(Parse.String(marker))
.Or(Parse.Char(LineBreak))
.Many().Text()
from last in Parse.String(marker)
select Tuple.Create(marker, indentMarker.IsDefined, lineBreak + rest)).Token();
from rest in Parse.AnyChar.Except(
Parse.Contained(
Parse.String(marker),
Parse.Concat(
Parse.LineEnd,
Parse.WhiteSpace.Many()
).Or(Parse.LineEnd),
Parse.WhiteSpace.Until(Parse.LineTerminator)
)
).Many().Text()
from whitespace in Parse.WhiteSpace.Until(Parse.String(marker)).Text()
select Tuple.Create(marker, indentMarker.IsDefined, $"{lineBreak}{rest}{whitespace}")).Token();

/// <summary>
/// Represents the "//" used to start a comment
Expand Down Expand Up @@ -575,6 +582,7 @@ from content in
(
from value in ElementTypedObjectProperty
.Or(PrimitiveTypeObjectProperty)
.Or(SingleLineComment)
from comma in Comma.Optional()
select value
).Token().Many()
Expand Down