diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-11-29 14:58:59 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 14:58:59 +0900 |
| commit | e3fab1f37364c96d9c0207428bc857533918beba (patch) | |
| tree | e60caef044aefad8a74aec35fc0d6f917890fe1d | |
| parent | 66fa05313b9b5831e1596777202b835ac0811086 (diff) | |
| download | psych-e3fab1f37364c96d9c0207428bc857533918beba.zip | |
Revert "Double quote stings that contain single quotes only"
| -rw-r--r-- | lib/psych/visitors/yaml_tree.rb | 2 | ||||
| -rw-r--r-- | test/psych/test_string.rb | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/psych/visitors/yaml_tree.rb b/lib/psych/visitors/yaml_tree.rb index f44e973..cfed8f1 100644 --- a/lib/psych/visitors/yaml_tree.rb +++ b/lib/psych/visitors/yaml_tree.rb @@ -304,7 +304,7 @@ module Psych quote = false elsif @line_width && o.length > @line_width style = Nodes::Scalar::FOLDED - elsif o =~ /^[^[:word:]][^"]*$/ or o =~ /^([^"]*'+[^"]*)+$/ + elsif o =~ /^[^[:word:]][^"]*$/ style = Nodes::Scalar::DOUBLE_QUOTED elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o style = Nodes::Scalar::SINGLE_QUOTED diff --git a/test/psych/test_string.rb b/test/psych/test_string.rb index e80d191..973f38b 100644 --- a/test/psych/test_string.rb +++ b/test/psych/test_string.rb @@ -37,13 +37,6 @@ module Psych assert_equal str, Psych.load(yaml) end - def test_doublequotes_when_there_are_single_quotes_only - str = "psych: Please don't escape ' with ' here." - yaml = Psych.dump str - assert_equal "--- \"psych: Please don't escape ' with ' here.\"\n", yaml - assert_equal str, Psych.load(yaml) - end - def test_plain_when_shorten_than_line_width_and_no_final_line_break str = "Lorem ipsum" yaml = Psych.dump str, line_width: 12 |