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 code snippets coloring macOS and Linux #7495

Closed
wants to merge 1 commit into from
Closed

Fix code snippets coloring macOS and Linux #7495

wants to merge 1 commit into from

Conversation

YorickdeJong
Copy link

@YorickdeJong YorickdeJong commented Jan 31, 2024 •
edited

Current behavior

Coloring of code snippets for macOS and Linux was not working

Proposed changes

I have added a default background of dark when the background of the terminal cannot be determined. Furthermore, a syntect to ansi function has been added for better code coloring in /ockam_command/docs.rs

Checks

  • All commits in this Pull Request are signed and Verified by Github.
  • [x ] All commits in this Pull Request follow the Ockam commit message convention.
  • [ x] There are no Merge commits in this Pull Request. Ockam repo maintains a linear commit history. We merge Pull Requests by rebasing them onto the develop branch. Rebasing to the latest develop branch and force pushing to your Pull Request branch is okay.
  • [ x] I have read and accept the Ockam Community Code of Conduct.
  • [x ] I have read and accepted the Ockam Contributor License Agreement by adding my Git/Github details in a row at the end of the CONTRIBUTORS.csv file in a separate pull request to the build-trust/ockam repository. The easiest way to do this is to edit the CONTRIBUTORS.csv file in the github web UI and create a separate Pull Request, this will mark the commit as verified.

@YorickdeJong YorickdeJong requested a review from a team as a code owner January 31, 2024 08:06
@YorickdeJong YorickdeJong mentioned this pull request Jan 31, 2024
Open
@YorickdeJong
Copy link
Author

@nazmulidris

@adrianbenavides adrianbenavides linked an issue Feb 13, 2024 that may be closed by this pull request
Syntax highlighting for fenced code blocks, in command help output, on macOS works #7472
Open
@adrianbenavides adrianbenavides force-pushed the fix-syntax-highlighting branch 2 times, most recently from 72ea4bf to 24156cb Compare February 13, 2024 14:27
adrianbenavides
adrianbenavides reviewed Feb 13, 2024
View reviewed changes
Copy link
Member

@adrianbenavides adrianbenavides left a comment

Choose a reason for hiding this comment

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

Hey @YorickdeJong it looks awesome! I've done some cleanup to make cargo and the CI checks happy. I've left a comment 👍

Thanks again 🙏

implementations/rust/ockam/ockam_command/src/docs.rs Outdated Show resolved Hide resolved
@adrianbenavides
Copy link
Member

Btw, you need to open a separate PR to accept the contributor's license agreement, otherwise, we won't be able to merge your PR.

I have read and accepted the Ockam Contributor License Agreement by adding my Git/Github details in a row at the end of the CONTRIBUTORS.csv file in a separate pull request to the build-trust/ockam repository. The easiest way to do this is to edit the CONTRIBUTORS.csv file in the github web UI and create a separate Pull Request, this will mark the commit as verified.

auto-merge was automatically disabled February 19, 2024 20:21

Head branch was pushed to by a user without write access

@adrianbenavides
Copy link
Member

Looks good. We need to do some cleanup of the commits before we can proceed:

  • You need to squash all commits into a single one. You have some merge commits that could cause some problems. If you need to keep your branch up to date with develop, you should run git rebase develop
  • Use a valid commit message like the one from this commit
  • Fix the conflicts with develop

Let me know if you need help along the way 👍

@adrianbenavides
Copy link
Member

adrianbenavides commented Mar 6, 2024 •
edited

I've done some small modifications to the PR to make the CI checks pass, but there is an issue with termbg and we need to wait until the following PR is merged: dalance/termbg#22

@adrianbenavides adrianbenavides force-pushed the fix-syntax-highlighting branch 2 times, most recently from 4341658 to 1ad29f3 Compare March 6, 2024 13:58
@adrianbenavides adrianbenavides mentioned this pull request Mar 8, 2024
Merged
@adrianbenavides
Copy link
Member

Will get merged through #7731

Thanks again @YorickdeJong for your help with this one!! 🙏

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adrianbenavides adrianbenavides adrianbenavides left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Syntax highlighting for fenced code blocks, in command help output, on macOS works
2 participants
@YorickdeJong @adrianbenavides