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

Fish importing #234

Merged
merged 14 commits into from
Dec 11, 2021
Merged

Fish importing #234

merged 14 commits into from
Dec 11, 2021

Conversation

conradludgate
Copy link
Collaborator

@conradludgate conradludgate commented Dec 10, 2021

Closes #57

So, Fish YAML is not real YAML. So there's no point bringing out a YAML parser for this. Instead, we read line by line.

We use - at the beginning to determine whether the line is a new entry. If we find a new entry line and we've found a cmd: ... value, we exit the loop and return our history item.

It's pretty fault tolerant, ignoring bad lines and missing values.

@conradludgate conradludgate marked this pull request as ready for review December 10, 2021 21:42
@conradludgate conradludgate changed the title WIP: Fish importing Fish importing Dec 10, 2021
@panekj
Copy link
Contributor

panekj commented Dec 10, 2021

IMHO, keybinds should not a default setting

src/shell/atuin.fish Outdated Show resolved Hide resolved
@conradludgate
Copy link
Collaborator Author

IMHO, keybinds should not a default setting

This is currently the standard behaviour of all of the shell integrations, I don't think we should handle fish any differently

Co-authored-by: PJ <me@panekj.dev>
src/shell/atuin.fish Outdated Show resolved Hide resolved
src/shell/atuin.fish Outdated Show resolved Hide resolved
conradludgate and others added 2 commits December 10, 2021 23:05
Co-authored-by: PJ <me@panekj.dev>
Co-authored-by: PJ <me@panekj.dev>
src/shell/atuin.fish Outdated Show resolved Hide resolved
Co-authored-by: PJ <me@panekj.dev>
@panekj
Copy link
Contributor

panekj commented Dec 10, 2021

Also missing fish in here
https://github.com/ellie/atuin/blob/28f78ba4e1874f6ab2eee2b833fb1b12d50e3ebe/README.md#L63-L67

@ellie ellie enabled auto-merge (squash) December 11, 2021 09:47
Copy link
Member

@ellie ellie left a comment

Choose a reason for hiding this comment

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

Amaaazing, thanks @conradludgate!

And thanks @panekj for your help too 😊 Really happy to get this issue closed off, I'll release it soon

@ellie ellie merged commit 87df7d8 into main Dec 11, 2021
@ellie ellie deleted the fish branch December 11, 2021 09:48
@davinkevin
Copy link

So happy to see it ❤️, Thank you @conradludgate.

I can't wait to see the next release !

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.

Fish support
4 participants