This repository has been archived by the owner on Jun 22, 2023. It is now read-only.
Code highlighting #26
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
STBoyden
approved these changes
Feb 23, 2022
|
One issue I have encountered is that it needs to be made compatible with the new WASM-based client as well as the desktop client. Could you look into whether you could adapt it to use this? |
Increased perfomance by storing layout job so it is recreated every frame. It is only recreated when code is change which is checked by comparing hashes
STBoyden
suggested changes
Mar 2, 2022
codectrl-gui/src/components/details_view_components/information_grid.rs
Outdated
Show resolved
Hide resolved
|
|
||
| let ps = SyntaxSet::load_defaults_newlines(); | ||
| let ts = ThemeSet::load_defaults(); | ||
| let syntax = ps.find_syntax_by_extension("py").unwrap(); |
There was a problem hiding this comment.
Could you instead get the extension of the log file name?
codectrl-gui/src/components/details_view_components/code_highlighting.rs
Outdated
Show resolved
Hide resolved
STBoyden
reviewed
Mar 2, 2022
codectrl-gui/src/components/details_view_components/information_grid.rs
Outdated
Show resolved
Hide resolved
STBoyden
suggested changes
Mar 3, 2022
| pub fn code_highlighter(code: &str, lang: &str) -> egui::text::LayoutJob { | ||
| let ps = SyntaxSet::load_defaults_newlines(); | ||
| let ts = ThemeSet::load_defaults(); | ||
| let syntax = ps.find_syntax_by_extension("py").unwrap(); | ||
| let syntax = ps.find_syntax_by_extension(lang_to_short(lang)).unwrap(); |
There was a problem hiding this comment.
https://docs.rs/syntect/4.6.0/syntect/parsing/struct.SyntaxSet.html#method.find_syntax_by_name
You should be able to use that and just pass lang into it, rather than creating a new function for it.
Something like this:
let syntax = ps.find_syntax_by_name(lang).unwrap();
Comment on lines
9
to
17
| fn lang_to_short(lang: &str) -> &str { | ||
| // Add more language here | ||
| match lang { | ||
| "rust" => "rs", | ||
| "python" => "py", | ||
| _ => "", | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Look at previous comment to see why possibly unnecessary.
Syntax definition search goes from language specified by the logger -> the extension of the file -> plaintext.
STBoyden
approved these changes
Mar 3, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Completed code highlighting for python and rust for now. I haven't added language option to the schema. Current the highlighting is hard-coded to rust should be able to change that when all the loggers start to sent the language.