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

Update the ssh-config submodule #2697

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Update the ssh-config submodule #2697

merged 2 commits into from
Oct 10, 2023

Conversation

mrmeszaros
Copy link
Contributor

Pull in the fix for the syntax.
Fixes #2359

Pull in the fix for the syntax.
Fixes sharkdp#2359
@sharkdp
Copy link
Owner

sharkdp commented Oct 5, 2023

Thank you. Can we maybe update tests/syntax-tests/source/SSH Config/ssh_config to include a User section? See https://github.com/sharkdp/bat/blob/master/doc/assets.md#syntax-tests for details

@mrmeszaros
Copy link
Contributor Author

mrmeszaros commented Oct 6, 2023

Did you think something like this?

I have built bat locally:

cargo clean
cargo build --no-default-features --features minimal-application,bugreport,build-assets

Then called update.sh from test/syntax-tests just as it was written.

However, the generated file ("highlighted/SSH Config/ssh_config") does not have the proper syntax highlighting.

I tried manually using the freshly built bat binary located at target/debug/bat, however, it also does not take into consideration the changed syntax files.

@sharkdp Could You help me in what step I am missing?

PS.: I am a newcomer to rust and cargo, and am not fully aware of it's specifics.

@mrmeszaros
Copy link
Contributor Author

Got it to work! Steps:

  1. Run cargo build and add ./target/debug to the PATH
  2. Run assets/create.sh - this will update the compiled syntaxes.bin
  3. Run cargo build to include the changed syntaxes.bin in the built bat binary
  4. Run tests/syntax-tests/update.sh to update the regression tests (with the just built bat binary)

@Enselic Enselic merged commit 63aaa03 into sharkdp:master Oct 10, 2023
21 checks passed
@sharkdp
Copy link
Owner

sharkdp commented Oct 10, 2023

@mrmeszaros Thank you!

@michaelblyons
Copy link
Contributor

Congrats!

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.

Incomplete syntax highlighting for ssh config?
4 participants