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

read themes from bat's cache #76

Merged
merged 1 commit into from
Jan 9, 2020

Conversation

data-pup
Copy link
Contributor

This does not entirely address #19, but does address this comment.

This pulls in some more code from bat to read themes from ~/.cache/bat/. Tested locally on my machine (with an existing bat install) and this does work properly. That said, I know this does not include tests: I would be happy to add some, just unsure of where those would go.

@data-pup data-pup changed the title read themes from bat's cache as well read themes from bat's cache Dec 24, 2019
@dandavison
Copy link
Owner

@data-pup Thanks very much for this! It looks great; very clean. I've tried it out, rebuilding the bat cache with bat cache --build and can see that delta is picking up new theme and syntax files. I guess I have no excuse not to work on an emacs-lisp sublime syntax definition now...

So the one blocker is we need to figure out what's up with the Windows build: https://travis-ci.com/dandavison/delta/jobs/269918710

If you would like to add some tests, src/delta.rs would be a reasonable place. (It already has some tests related to theme).

@data-pup
Copy link
Contributor Author

@dandavison Hmmm, so I tried running cargo build --target x86_64-pc-windows-msvc on master at 13e39b1de9ef0a8324b882fade04eeff65241f40, and 1c3e7baf0f96bc0ff07da8d0aab9b1f2d15b02d2, and ended up seeing the same build errors. I am suspicious that something elsewhere may have broken the build? I'm not quite sure how to debug this tbh 😖

@dandavison
Copy link
Owner

Just FYI I'm going to be offline for the next 10 days so will go quiet, but I'm keen to get this PR merged. Thanks for looking at the build failure.

@dandavison
Copy link
Owner

You're right, I see now that Windows builds have started to fail on master also, so unrelated to this PR. Thanks very much then! I'll merge this now.

@dandavison dandavison merged commit 9f258c1 into dandavison:master Jan 9, 2020
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.

2 participants