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.

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 endings for inserted maps on Windows #66

Merged
merged 2 commits into from
Feb 21, 2024

Conversation

DanTup
Copy link
Contributor

@DanTup DanTup commented Feb 20, 2024

Replaces a hard-coded \n to instead use the correct line-ending for the document.

This fixes an issue where documents on Windows using \r\n could end up with mismatched newlines.

@kevmoo I bumped the version and added to changelog, but not sure what the process is (and there's no contributing file here).

Fixes #65

@devoncarew devoncarew mentioned this pull request Feb 20, 2024
1 task
Copy link
Member

@devoncarew devoncarew left a comment

Choose a reason for hiding this comment

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

lgtm, but, can you wait for #67 to land? I want to make sure this repo is configured properly to allow the publish status comments to show up on PRs from forks.

CHANGELOG.md Outdated Show resolved Hide resolved
pubspec.yaml Outdated Show resolved Hide resolved
@DanTup
Copy link
Contributor Author

DanTup commented Feb 20, 2024

Sure, this isn't urgent (I landed a workaround in the analysis server in the meantime).

I also can't merge here, so you might need to merge it anyway :-)

Let me know if you need me to rebase it or anything (I don't entirely understand the change #67 is making :-) )

@devoncarew
Copy link
Member

@DanTup - can you merge main into this PR, just to get the bots to process it again?

@DanTup
Copy link
Contributor Author

DanTup commented Feb 20, 2024

@devoncarew I've rebased on main, but you'll need to re-approve the bots :)

Copy link

Package publishing

Package Version Status Publish tag (post-merge)
package:yaml_edit 2.2.0 ready to publish v2.2.0

Documentation at https://github.com/dart-lang/ecosystem/wiki/Publishing-automation.

@DanTup
Copy link
Contributor Author

DanTup commented Feb 20, 2024

@kevmoo
Copy link
Member

kevmoo commented Feb 20, 2024

https://github.com/dart-lang/ecosystem/wiki/Publishing-automation

Oh, I see - that's neat :-)

RIGHT?!?!

@DanTup
Copy link
Contributor Author

DanTup commented Feb 21, 2024

Someone else will need to land this if/when you're happy with it, I have no powers here :-)

@kevmoo kevmoo merged commit 82ab64d into dart-lang:main Feb 21, 2024
18 checks passed
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request Feb 21, 2024
…, sse, stream_channel, tools, vector_math, web, webdev, yaml_edit

Revisions updated by `dart tools/rev_sdk_deps.dart`.

async (https://github.com/dart-lang/async/compare/24266ca..6cdbc41):
  6cdbc41  2024-02-15  Kevin Moore  Update to latest lints, require Dart 3.2 (dart-archive/async#267)

browser_launcher (https://github.com/dart-lang/browser_launcher/compare/74a0efe..7956230):
  7956230  2024-02-16  sigmundch  Add extra flags to disable throttling behavior. (dart-archive/browser_launcher#55)

dartdoc (https://github.com/dart-lang/dartdoc/compare/7e171fc..7a9df65):
  7a9df65f  2024-02-20  Parker Lougheed  Add fallback text for sidebar failing to load (dart-lang/dartdoc#3643)
  9bcabb50  2024-02-20  Parker Lougheed  Fix missing left sidebar on extension type pages (dart-lang/dartdoc#3662)
  e8b8faa2  2024-02-16  Sam Rawlins  Include extension types in 'implementers' list (dart-lang/dartdoc#3658)

http (https://github.com/dart-lang/http/compare/6d9f9ef..ce0de37):
  ce0de37  2024-02-21  Derek Xu  Populate package:http_profile (dart-lang/http#1046)
  75e01f4  2024-02-20  Brian Quinlan  Create a simple WebSocket interface (dart-lang/http#1128)

markdown (https://github.com/dart-lang/markdown/compare/c2b8429..d735b0b):
  d735b0b  2024-02-21  Tom Yeh  Fix `#578`: list with checkbox mixed with empty lines (dart-lang/markdown#583)
  6efe141  2024-02-14  Kevin Moore  Migrate example to pkg:web, update minimum required Dart version (dart-lang/markdown#582)

protobuf (https://github.com/dart-lang/protobuf/compare/a293fb9..f085bfd):
  f085bfd  2024-02-20  Ömer Sinan Ağacan  Fix message_set.dart copyright year (google/protobuf.dart#912)

sse (https://github.com/dart-lang/sse/compare/af7d8d0..13ec752):
  13ec752  2024-02-20  Kevin Moore  blast_repo fixes (dart-lang/sse#104)
  2830dc9  2024-02-16  Kevin Moore  Support the latest pkg:web, require Dart 3.3 (dart-lang/sse#103)

stream_channel (https://github.com/dart-lang/stream_channel/compare/851336f..e02a5dd):
  e02a5dd  2024-02-16  Kevin Moore  Require Dart 3.3, update and fix lints (dart-lang/stream_channel#100)
  e62706e  2024-02-16  Kevin Moore  blast_repo fixes (dart-lang/stream_channel#101)

tools (https://github.com/dart-lang/tools/compare/2ef7673..9f4e6a4):
  9f4e6a4  2024-02-16  Elias Yishak  Helper to resolve dart version for clients of analytics (dart-lang/tools#233)
  8323b21  2024-02-13  Elias Yishak  New event added for sending analytics within package on errors (dart-lang/tools#229)

vector_math (https://github.com/google/vector_math.dart/compare/cb976c7..3706feb):
  3706feb  2024-02-18  dependabot[bot]  Bump dart-lang/setup-dart from 1.6.0 to 1.6.2 (google/vector_math.dart#313)

web (https://github.com/dart-lang/web/compare/a54a1f0..975e55c):
  975e55c  2024-02-15  Kevin Moore  Add TrustedTypes (dart-lang/web#173)
  0447807  2024-02-15  Srujan Gaddam  Add info on generation conventions (dart-lang/web#171)

webdev (https://github.com/dart-lang/webdev/compare/629c632..51b5484):
  51b54843  2024-02-14  Elliott Brooks  Implement `setFlag` for 'pause_isolates_on_start' (dart-lang/webdev#2373)

yaml_edit (https://github.com/dart-lang/yaml_edit/compare/2a9a11b..82ab64d):
  82ab64d  2024-02-21  Danny Tuppeny  Fix line endings for inserted maps on Windows (dart-lang/yaml_edit#66)
  6906ac4  2024-02-20  Devon Carew  update the publish workflow (dart-lang/yaml_edit#67)

Change-Id: I246c393586e3d6239925ac3cf3a6a245d86a2bf5
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/353581
Reviewed-by: Kevin Moore <[email protected]>
Commit-Queue: Devon Carew <[email protected]>
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request Feb 21, 2024
This bumps yaml_edit to get a fix from dart-lang/yaml_edit#66 that corrects line endings on Windows.

It removes the workaround that was in the server normalizing these itself.

It also updates the tests to use normalized content to ensure consistent line endings on both platforms.

Change-Id: I096978500b30ca41d38bc9e78dc9bdf3e44474d1
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/353521
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Keerti Parthasarathy <[email protected]>
Commit-Queue: Keerti Parthasarathy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong line endings used when building YAML edits
3 participants