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

Fix line folding #87

Merged
merged 11 commits into from
Jun 27, 2024
Merged

Fix line folding #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f3886e6
Fix line folding to match specification
kekavc24 Jun 4, 2024
d46f402
Add test case and remove TODO for fix
kekavc24 Jun 4, 2024
c8c1695
Remove indent creation from utility function
kekavc24 Jun 6, 2024
51cc41d
Update changelog
kekavc24 Jun 6, 2024
c1a4d0a
Return null if strings cannot be encoded in desired `ScalarStyle`
kekavc24 Jun 10, 2024
2a2952b
Clean up code
kekavc24 Jun 11, 2024
60f9ae5
Remove unnecessary assertions and add docs
kekavc24 Jun 11, 2024
73af9d2
Minor refactoring
jonasfj Jun 12, 2024
df86c7d
Fix condition check for encoding as literal/folded
kekavc24 Jun 17, 2024
a9b5f6a
Remove keep chomping indicator references
kekavc24 Jun 19, 2024
53d0641
Update lib/src/strings.dart
jonasfj Jun 27, 2024
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
list.
([#69](https://github.com/dart-lang/yaml_edit/issues/69))

- Fix error thrown when inserting in nested list using `spliceList` method
([#83](https://github.com/dart-lang/yaml_edit/issues/83))
Comment on lines +8 to +9
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feel free to file this as a separate PR, if you want. Then we get to land it quickly :D

Tagging it along here is harmless though.


- Fix error thrown when string has spaces when applying `ScalarStyle.FOLDED`.
([#41](https://github.com/dart-lang/yaml_edit/issues/41)). Resolves
([[#86](https://github.com/dart-lang/yaml_edit/issues/86)]).

## 2.2.1

- Require Dart 3.0
Expand Down
2 changes: 1 addition & 1 deletion lib/src/editor.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class YamlEditor {
final end = getContentSensitiveEnd(_contents);
final lineEnding = getLineEnding(_yaml);
final edit = SourceEdit(
start, end - start, yamlEncodeBlockString(valueNode, 0, lineEnding));
start, end - start, yamlEncodeBlock(valueNode, 0, lineEnding));

return _performEdit(edit, path, valueNode);
}
Expand Down
10 changes: 5 additions & 5 deletions lib/src/list_mutations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ SourceEdit updateInList(
final listIndentation = getListIndentation(yaml, list);
final indentation = listIndentation + getIndentation(yamlEdit);
final lineEnding = getLineEnding(yaml);
valueString = yamlEncodeBlockString(
wrapAsYamlNode(newValue), indentation, lineEnding);
valueString =
yamlEncodeBlock(wrapAsYamlNode(newValue), indentation, lineEnding);

/// We prefer the compact nested notation for collections.
///
Expand All @@ -52,7 +52,7 @@ SourceEdit updateInList(

return SourceEdit(offset, end - offset, valueString);
} else {
valueString = yamlEncodeFlowString(newValue);
valueString = yamlEncodeFlow(newValue);
return SourceEdit(offset, currValue.span.length, valueString);
}
}
Expand Down Expand Up @@ -141,7 +141,7 @@ SourceEdit _appendToBlockList(
final newIndentation = listIndentation + getIndentation(yamlEdit);
final lineEnding = getLineEnding(yaml);

var valueString = yamlEncodeBlockString(item, newIndentation, lineEnding);
var valueString = yamlEncodeBlock(item, newIndentation, lineEnding);
if (isCollection(item) && !isFlowYamlCollectionNode(item) && !isEmpty(item)) {
valueString = valueString.substring(newIndentation);
}
Expand All @@ -151,7 +151,7 @@ SourceEdit _appendToBlockList(

/// Formats [item] into a new node for flow lists.
String _formatNewFlow(YamlList list, YamlNode item, [bool isLast = false]) {
var valueString = yamlEncodeFlowString(item);
var valueString = yamlEncodeFlow(item);
if (list.isNotEmpty) {
if (isLast) {
valueString = ', $valueString';
Expand Down
14 changes: 7 additions & 7 deletions lib/src/map_mutations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SourceEdit _addToBlockMap(
final yaml = yamlEdit.toString();
final newIndentation =
getMapIndentation(yaml, map) + getIndentation(yamlEdit);
final keyString = yamlEncodeFlowString(wrapAsYamlNode(key));
final keyString = yamlEncodeFlow(wrapAsYamlNode(key));
final lineEnding = getLineEnding(yaml);

var formattedValue = ' ' * getMapIndentation(yaml, map);
Expand Down Expand Up @@ -83,7 +83,7 @@ SourceEdit _addToBlockMap(
}
}

var valueString = yamlEncodeBlockString(newValue, newIndentation, lineEnding);
var valueString = yamlEncodeBlock(newValue, newIndentation, lineEnding);
if (isCollection(newValue) &&
!isFlowYamlCollectionNode(newValue) &&
!isEmpty(newValue)) {
Expand All @@ -100,8 +100,8 @@ SourceEdit _addToBlockMap(
/// map.
SourceEdit _addToFlowMap(
YamlEditor yamlEdit, YamlMap map, YamlNode keyNode, YamlNode newValue) {
final keyString = yamlEncodeFlowString(keyNode);
final valueString = yamlEncodeFlowString(newValue);
final keyString = yamlEncodeFlow(keyNode);
final valueString = yamlEncodeFlow(newValue);

// The -1 accounts for the closing bracket.
if (map.isEmpty) {
Expand Down Expand Up @@ -131,8 +131,8 @@ SourceEdit _replaceInBlockMap(
getMapIndentation(yaml, map) + getIndentation(yamlEdit);

final keyNode = getKeyNode(map, key);
var valueAsString = yamlEncodeBlockString(
wrapAsYamlNode(newValue), newIndentation, lineEnding);
var valueAsString =
yamlEncodeBlock(wrapAsYamlNode(newValue), newIndentation, lineEnding);
if (isCollection(newValue) &&
!isFlowYamlCollectionNode(newValue) &&
!isEmpty(newValue)) {
Expand Down Expand Up @@ -163,7 +163,7 @@ SourceEdit _replaceInBlockMap(
SourceEdit _replaceInFlowMap(
YamlEditor yamlEdit, YamlMap map, Object? key, YamlNode newValue) {
final valueSpan = map.nodes[key]!.span;
final valueString = yamlEncodeFlowString(newValue);
final valueString = yamlEncodeFlow(newValue);

return SourceEdit(valueSpan.start.offset, valueSpan.length, valueString);
}
Expand Down
Loading