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

Deduplicate path separator duplicates #10646

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from

Conversation

philderbeast
Copy link
Collaborator

@philderbeast philderbeast commented Dec 17, 2024

Fixes #10645, a small Windows gotcha missed with #10546.

I really had to get into the weeds with this one. The assertOutputContains function was modifying the output but in a way not 'visible' enough. I've added an assertOn function (that assertOutputContains calls) that takes a NeedleHaystack configuration for how the search, expectation and display are made. I had wanted to add a pilcrow for line endings but the terminal output is restricted to ASCII so I've marked line beginnings with ^ and line endings with $. The needle (the expected output fragment) is shown annotated this way as can the haystack (the output). The haystack is not shown annotated with line delimiters but can be.

The concatOutput function, I've renamed to lineBreaksToSpaces.


Sorry, something went wrong.

@philderbeast philderbeast changed the title Configuration from message path separator duplicates Deduplicate path separator duplicates Dec 17, 2024
@philderbeast philderbeast force-pushed the fix/path-sep-duplicates branch from 2d03f00 to 53fd7b0 Compare December 17, 2024 17:02
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

I'm confused: is the .md file a GitHub artifact, or did you really add two changelog.d entries?

@philderbeast philderbeast force-pushed the fix/path-sep-duplicates branch from 53fd7b0 to ca61a07 Compare December 17, 2024 17:13
@philderbeast
Copy link
Collaborator Author

I'm confused: is the .md file a GitHub artifact, or did you really add two changelog.d entries?

Thanks for catching that mistake of mine @geekosaur. I let the .md slip in. I rename locally to check the markdown preview. I've deleted that extra file now.

Can we use a .md extension for changelog.d entries?

@geekosaur
Copy link
Collaborator

geekosaur commented Dec 17, 2024

changelog-d doesn't care; the only special name is config, where its own configuration is stored, and you can't use subdirectories. It might even be better to use the extension, since that way GitHub will also render it (although it will probably be confused by the YAML frontmatter).

@philderbeast philderbeast marked this pull request as draft December 18, 2024 11:07
@philderbeast
Copy link
Collaborator Author

Reverting to draft while I settle some Windows versus POSIX file path issues.

@philderbeast philderbeast force-pushed the fix/path-sep-duplicates branch 4 times, most recently from cc0cc78 to 1fd13df Compare December 19, 2024 16:44

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux
- Manually replace path separators before anything else

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux
- Can't print pilcrow so use grep char for marking end of line
- Marking the start of line distinguishes "expected" intro from its content too, same for "output"

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux
- Rename original concatOutput to lineBreaksToSpaces

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux
- Sort language pragmas

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux

Verified

This commit was signed with the committer’s verified signature.
philderbeast Phil de Joux
@philderbeast philderbeast force-pushed the fix/path-sep-duplicates branch from 1fd13df to c06ba60 Compare December 20, 2024 13:20
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.

When using configuration from show duplicate paths
2 participants