ReadFileInto skips a single leading UTF8 BOM sequence if it exists. #14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
speter
requested changes
May 17, 2018
read.go
Outdated
| @@ -231,6 +234,15 @@ func ReadFileInto(config interface{}, filename string) error { | |||
| if err != nil { | |||
| return err | |||
| } | |||
|
|
|||
| //Skips a single leading UTF8 BOM sequence if it exists. | |||
| if len(src) > 3 { | |||
There was a problem hiding this comment.
>should be>=- make this a helper function, say skipLeadingUtf8Bom([]byte) []byte
- the end-to-end test is fine, but please add table-driven unit tests for this new helper function:
- 0 bytes input
- 3 bytes input (BOM only)
- 3 bytes input (comment only, without BOM)
- normal input with BOM
- normal input without BOM
read.go
Outdated
| @@ -231,6 +234,15 @@ func ReadFileInto(config interface{}, filename string) error { | |||
| if err != nil { | |||
| return err | |||
| } | |||
|
|
|||
| //Skips a single leading UTF8 BOM sequence if it exists. | |||
| if len(src) > 3 { | |||
There was a problem hiding this comment.
Starting to look good. A couple more requests.
2. Make helper function, say skipLeadingUtf8Bom([]byte) []byte 3. Add table-driven unit tests for skipLeadingUtf8Bom
|
Thanks for your guidance. Please take another look. |
speter
requested changes
May 17, 2018
read.go
Outdated
| fset := token.NewFileSet() | ||
| file := fset.AddFile(filename, fset.Base(), len(src)) | ||
| return readInto(config, fset, file, src) | ||
| } | ||
|
|
||
| func skipLeadingUtf8Bom(src []byte) []byte{ | ||
| if len(src) >= 3 { |
There was a problem hiding this comment.
- create global
var utf8Bom = []byte("\ufeff") - use
len(utf8Bom)instead of3 - get rid of variable
bom, join the twoifs into one, and usebytes.Equalwith utf8Bom for comparison
read_test.go
Outdated
| out []byte | ||
| }{ | ||
| {"0 bytes input",[]byte{}, []byte{}}, | ||
| {"3 bytes input (BOM only)",[]byte{0xEF,0xBB,0xBF}, []byte{}}, |
There was a problem hiding this comment.
use []byte("\ufeff") for consistency. same 2 lines below.
|
These changes make them better. |
speter
approved these changes
May 17, 2018
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For compatibility with files created on Windows, ReadFileInto skips a single leading UTF8 BOM sequence if it exists.
Related pull request#13