Skip to content

scanner: Improve regular expression in "scanner".scanHeredoc(). #245

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

Merged
mitchellh merged 4 commits into from
Apr 3, 2018
Merged

scanner: Improve regular expression in "scanner".scanHeredoc(). #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89240c3
printer: Add another failing input to TestFormatParsable.
octo Apr 3, 2018
13daa63
scanner: Anchor heredoc-regexes at beginning of line.
octo Apr 3, 2018
6a21c5a
printer: Add another failing input to TestFormatParsable.
octo Apr 3, 2018
25340db
scanner: scanHeredoc(): Accept any number of CRs (`\r`) at end of line.
octo Apr 3, 2018
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
2 changes: 2 additions & 0 deletions hcl/printer/printer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ func TestFormatValidOutput(t *testing.T) {
cases := []string{
"#\x00",
"#\ue123t",
"Y=<<4\n4/\n\n\n/4/@=4/\n\n\n/4000000004\r\r\n00004\n",
"x=<<_\n_\r\r\n_\n",
}

for _, c := range cases {
Expand Down
1 change: 1 addition & 0 deletions hcl/printer/testdata/object_with_heredoc.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
obj {
foo = [<<EOF
TEXT!
!!EOF
EOF
]
}
1 change: 1 addition & 0 deletions hcl/printer/testdata/object_with_heredoc.input
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
obj {
foo = [<<EOF
TEXT!
!!EOF
EOF
]
}
4 changes: 2 additions & 2 deletions hcl/scanner/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,9 +440,9 @@ func (s *Scanner) scanHeredoc() {

var identRegexp *regexp.Regexp
if identBytes[0] == '-' {
identRegexp = regexp.MustCompile(fmt.Sprintf(`[[:space:]]*%s\z`, identBytes[1:]))
identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes[1:]))
} else {
identRegexp = regexp.MustCompile(fmt.Sprintf(`[[:space:]]*%s\z`, identBytes))
identRegexp = regexp.MustCompile(fmt.Sprintf(`^[[:space:]]*%s\r*\z`, identBytes))
}

// Read the actual string value
Expand Down