Add live preview to theme picker #1798

jharrilim · 2022-03-12T06:47:36Z

I'm probably annoying at this point, as I'm spamming this repo with my experiments. This one was fun though. It even reverts back to the original theme if you didn't select any. Perhaps it's a good start?

misc stuff:

~~Also added theme caching to reduce FS reads (although tbh it might be better to load them at the start)~~
~~Added more callbacks to the picker~~
A last_theme property is used now, this is useful for when a user cancels the theme preview so we can reset back to that theme
TypableCommands now must declare a list of PromptEvents they want to react upon

sudormrfbin · 2022-03-12T09:13:17Z

A better way to approach this would be to implement live preview on :theme <TAB>, so that you can see how the syntax highlighting for code changes on each theme. IIRC it was attempted before but dropped because of some architectural challenges, but I think it might be easier to implement now. And experiments are never a bad thing :)

jharrilim · 2022-03-12T15:40:59Z

A better way to approach this would be to implement live preview on :theme , so that you can see how the syntax highlighting for code changes on each theme.

Agreed, that seems like a good choice. I was going to fiddle with setting a smaller height to the picker, but the :theme command has that going for it naturally. I'll try poking around with that too!

jharrilim · 2022-03-12T18:45:32Z

jharrilim · 2022-03-13T19:40:35Z

Removed the picker variant and kept the :command variant

helix-term/src/ui/picker.rs

helix-term/src/commands/typed.rs

helix-view/src/editor.rs

…arrilim

helix-term/src/application.rs

helix-view/src/editor.rs

helix-view/src/theme.rs

…arrilim

TIL flatmap on Option is called and_then

jharrilim · 2022-06-18T22:26:07Z

helix-editor/website#10 (comment)

@the-mikedavis sorry for the wait! This is ready to be re-reviewed.

(I had initially been distracted by Elden Ring if that's fair)

pickfire · 2022-06-19T23:34:48Z

helix-term/src/ui/prompt.rs

+#[repr(u8)]
 #[derive(Clone, Copy, PartialEq)]
 pub enum PromptEvent {
    /// The prompt input has been updated.
-    Update,
+    Update = 1 << 0,
    /// Validate and finalize the change.
-    Validate,
+    Validate = 1 << 1,
    /// Abort the change, reverting to the initial state.
-    Abort,
+    Abort = 1 << 2,
 }


Oh, I thought you are going to use bitflags crate. That one is more ergonomic.

I gave it a shot and it's a tad more complicated: If we make PromptEvent itself bitflags, The match arms would only exhaust after all possible combinations of the flags. The TypeableCommand functions technically only can receive one type of event at once, thus causing this code:

match event { PromptEvent::Abort => {}, PromptEvent::Update => {}, PromptEvent::Validate => {}, }

to error with:

| 607 | match event { | ^^^^^ patterns `PromptEvent { bits: 0_u8 }`, `PromptEvent { bits: 3_u8 }` and `PromptEvent { bits: 5_u8..=u8::MAX }` not covered |

I think at least for now, it seems more correct to not allow those other possibilities, so I went with a more traditional solution

helix-term/src/commands/typed.rs

helix-view/src/editor.rs

helix-view/src/theme.rs

…arrilim

sudormrfbin

Looks good, awesome work @jharrilim !

archseer

Is there any other typable commands we could live preview?

archseer · 2022-06-26T08:39:36Z

helix-term/src/commands/typed.rs

+    /// Use `prompt_events` to declare which events this command will respond to.
+    pub prompt_events: u8,


Is this really worth it? It adds extra complexity. I'd just always call the prompt

And then return early inside the function. That way it behaves exactly like regex_prompt and other command prompts.

I had that initially, but swapped to this approach to avoid touching the existing functions: #1798 (comment)

I don't think it's going to be a clean revert at this point unfortunately
8dfd840

I don't have strong opinions on either approach. If you confirm that you'd prefer what was done originally I'll change it back, but I'll only do it one more time or else I might get tendonitis 😳

Yeah I'd prefer to handle these inside existing functions, it's a bit more flexible. Sorry for the trouble!

Switched it back, should be good to go!

helix-term/src/commands/typed.rs

helix-view/src/editor.rs

jharrilim · 2022-06-26T20:11:45Z

Is there any other typable commands we could live preview?

goto_line_number is a great candidate for that IMO.

For not-so-live-previews, I could imagine it might be nice a nice option for showing the contents of the clipboard if the size of the yank isn't too large.

…ithub.com:jharrilim/helix into feat/add-theme-picker-with-live-preview-jharrilim

pickfire · 2022-06-27T15:26:42Z

Is there any other typable commands we could live preview?

~~Indent style~~ (we don't change existing stuff) and substitution (we don't have this) that I know of? If anything I find only live preview for theme picker far more useful than anything, at least don't have to select theme and go out, and select another one. The others that I know live preview is not that useful since we already have an expected result in mind.

archseer · 2022-07-01T09:32:51Z

goto_line_number is a great candidate for that IMO.

That's a good point! Feel free to exclude that from this initial PR though.

contents of the clipboard

We do show a register preview window you can use when selecting registers before pasting ("). But it doesn't cover the system clipboard.

jharrilim · 2022-07-02T21:03:16Z

That's a good point! Feel free to exclude that from this initial PR though.

Agreed, let's keep that separate, it'll be easier to review that way

pickfire

Looks good to me.

archseer

Thanks for working on this!

jharrilim · 2022-07-06T02:08:06Z

Tagging this here for posterity. PR for goto preview:
#2982

Add theme picker with live preview

94a377f

Add live theme preview to :theme command

753131e

jharrilim added 3 commits March 12, 2022 13:58

cargo fmt

b0c4f7c

Fix clippy warnings

6bfde21

Remove picker variant

1481093

jharrilim marked this pull request as ready for review March 13, 2022 19:40

Remove unused import

fe5ec9e

sudormrfbin reviewed Mar 14, 2022

View reviewed changes

helix-term/src/ui/picker.rs Outdated Show resolved Hide resolved

helix-term/src/commands/typed.rs Show resolved Hide resolved

helix-view/src/editor.rs Outdated Show resolved Hide resolved

jharrilim added 4 commits March 14, 2022 21:44

Cleanup

2d96be2

Change current_theme to last_theme

c638d0b

Fix accidental comment flash deletion

dcb09e0

Merge branch 'master' into feat/add-theme-picker-with-live-preview-jh…

3c1638b

…arrilim

jharrilim requested a review from sudormrfbin March 18, 2022 03:40

pickfire reviewed Mar 18, 2022

View reviewed changes

helix-term/src/application.rs Outdated Show resolved Hide resolved

pickfire reviewed Mar 18, 2022

View reviewed changes

helix-view/src/editor.rs Outdated Show resolved Hide resolved

pickfire reviewed Mar 18, 2022

View reviewed changes

helix-view/src/theme.rs Outdated Show resolved Hide resolved

the-mikedavis added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 18, 2022

the-mikedavis mentioned this pull request May 28, 2022

add 22.05 release notes helix-editor/website#10

Merged

jharrilim added 5 commits June 18, 2022 17:52

Merge branch 'master' into feat/add-theme-picker-with-live-preview-jh…

8dfd840

…arrilim

Typo

0178162

Remove theme cache

5f85522

Add some comments

97ed0d6

Refactor some theme handling

01467e3

TIL flatmap on Option is called and_then

jharrilim requested a review from pickfire June 18, 2022 22:23

Remove unnecessary renames

b782d07

pickfire reviewed Jun 19, 2022

View reviewed changes

jharrilim added 4 commits June 19, 2022 20:02

Better handling of last_theme

a83069e

Sort theme names

89ec841

Better memory juggling

1d1c8cc

Missed a branch

0af7ed6

pickfire reviewed Jun 21, 2022

View reviewed changes

helix-term/src/commands/typed.rs Outdated Show resolved Hide resolved

pickfire reviewed Jun 21, 2022

View reviewed changes

helix-view/src/editor.rs Outdated Show resolved Hide resolved

pickfire reviewed Jun 21, 2022

View reviewed changes

helix-view/src/theme.rs Outdated Show resolved Hide resolved

jharrilim added 3 commits June 21, 2022 21:49

Remove name from theme, switch bitand to &

a8514d0

Merge branch 'master' into feat/add-theme-picker-with-live-preview-jh…

1961ac5

…arrilim

cargo fmt

860665b

jharrilim requested a review from pickfire June 22, 2022 03:59

sudormrfbin approved these changes Jun 23, 2022

View reviewed changes

Update helix-view/src/editor.rs

5eb1d41

jharrilim changed the title ~~[Proposal] Add theme picker with live preview~~ Add live preview to theme picker Jun 24, 2022

archseer requested changes Jun 26, 2022

View reviewed changes

jharrilim added 2 commits June 26, 2022 16:54

Switch boolean to enum

5a313c9

Merge branch 'feat/add-theme-picker-with-live-preview-jharrilim' of g…

bc3a1de

…ithub.com:jharrilim/helix into feat/add-theme-picker-with-live-preview-jharrilim

jharrilim added 4 commits July 2, 2022 12:25

Remove bitflag impl

670f0b8

cargo fmt

b81aedf

Remove un-needed type arg

8f6991f

cargo fmt

251d61a

pickfire approved these changes Jul 4, 2022

View reviewed changes

archseer approved these changes Jul 5, 2022

View reviewed changes

archseer merged commit b26e7e2 into helix-editor:master Jul 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add live preview to theme picker #1798

Add live preview to theme picker #1798

jharrilim commented Mar 12, 2022 •

edited

Loading

sudormrfbin commented Mar 12, 2022

jharrilim commented Mar 12, 2022

jharrilim commented Mar 12, 2022

jharrilim commented Mar 13, 2022

jharrilim commented Jun 18, 2022

pickfire Jun 19, 2022

jharrilim Jun 19, 2022

sudormrfbin left a comment

archseer left a comment

archseer Jun 26, 2022

archseer Jun 26, 2022

jharrilim Jun 26, 2022 •

edited

Loading

archseer Jul 1, 2022

archseer Jul 1, 2022

jharrilim Jul 2, 2022

jharrilim commented Jun 26, 2022

pickfire commented Jun 27, 2022 •

edited

Loading

archseer commented Jul 1, 2022

jharrilim commented Jul 2, 2022

pickfire left a comment

archseer left a comment

jharrilim commented Jul 6, 2022

		/// Use `prompt_events` to declare which events this command will respond to.
		pub prompt_events: u8,

Add live preview to theme picker #1798

Add live preview to theme picker #1798

Conversation

jharrilim commented Mar 12, 2022 • edited Loading

sudormrfbin commented Mar 12, 2022

jharrilim commented Mar 12, 2022

jharrilim commented Mar 12, 2022

jharrilim commented Mar 13, 2022

jharrilim commented Jun 18, 2022

pickfire Jun 19, 2022

Choose a reason for hiding this comment

jharrilim Jun 19, 2022

Choose a reason for hiding this comment

sudormrfbin left a comment

Choose a reason for hiding this comment

archseer left a comment

Choose a reason for hiding this comment

archseer Jun 26, 2022

Choose a reason for hiding this comment

archseer Jun 26, 2022

Choose a reason for hiding this comment

jharrilim Jun 26, 2022 • edited Loading

Choose a reason for hiding this comment

archseer Jul 1, 2022

Choose a reason for hiding this comment

archseer Jul 1, 2022

Choose a reason for hiding this comment

jharrilim Jul 2, 2022

Choose a reason for hiding this comment

jharrilim commented Jun 26, 2022

pickfire commented Jun 27, 2022 • edited Loading

archseer commented Jul 1, 2022

jharrilim commented Jul 2, 2022

pickfire left a comment

Choose a reason for hiding this comment

archseer left a comment

Choose a reason for hiding this comment

jharrilim commented Jul 6, 2022

jharrilim commented Mar 12, 2022 •

edited

Loading

jharrilim Jun 26, 2022 •

edited

Loading

pickfire commented Jun 27, 2022 •

edited

Loading