-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
Fix line ending bug #90
Draft
kekavc24
wants to merge
11
commits into
dart-lang:main
Choose a base branch
from
kekavc24:fix-line-ending-bug
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+355
−63
Draft
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
7501cb4
Add function to skip and/or extract comments
kekavc24 647329c
Add function to normalize trailing line breaks in encode block
kekavc24 502fa0a
Return index getting key node in map
kekavc24 c3056c8
Apply line-break after each encoded yaml block
kekavc24 e610993
Encode folded/literal strings based on c3056c8
kekavc24 e659cb9
Skip comments and include `\n` in map mutations
kekavc24 53f9637
Skip comments and remove additional `\n` added in list mutations
kekavc24 edd8d38
Normalize top level edits
kekavc24 f5a259b
Remove defensive encoding function after fix in e659cb9 and 53f9637
kekavc24 5a51cbe
Run dart format
kekavc24 c7aec85
Skip comments for top-level edits
kekavc24 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -87,8 +87,10 @@ int deepHashCode(Object? value) { | |
} | ||
|
||
/// Returns the [YamlNode] corresponding to the provided [key]. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: consider updating the documentation. Also feel free to submit this as a separate PR, and hint that you plan on using it in this PR. Then we can reduce the size of this PR a bit. |
||
YamlNode getKeyNode(YamlMap map, Object? key) { | ||
return map.nodes.keys.firstWhere((node) => deepEquals(node, key)) as YamlNode; | ||
(int index, YamlNode keyNode) getKeyNode(YamlMap map, Object? key) { | ||
return map.nodes.keys.indexed.firstWhere( | ||
(value) => deepEquals(value.$2, key), | ||
) as (int, YamlNode); | ||
} | ||
|
||
/// Returns the [YamlNode] after the [YamlNode] corresponding to the provided | ||
|
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or similar, but let's avoid
.$1
if we can (inside a simple helper method likegetKeyNode
using.$2
is probably not so bad, but elsewhere, especially in larger code blocks, I'd suggest avoiding it).Or make
skipAndExtractCommentsInBlock
return a record with named properties. So we can do:skipAndExtractCommentsInBlock(...).endOffset;
.