Skip to content

Improve syntax detection #2524

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Feb 19, 2025
Merged

Improve syntax detection #2524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e1eb8a
Improve syntax detection
acuteenvy Feb 18, 2025
1b52eb1
Add changelog entry
acuteenvy Feb 18, 2025
53e51dc
cleanup changelog
extrawurst Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

### Changed
* improve syntax highlighting file detection [[@acuteenvy](https://github.com/acuteenvy)] ([#2524](https://github.com/extrawurst/gitui/pull/2524))
* After commit: jump back to unstaged area [[@tommady](https://github.com/tommady)] ([#2476](https://github.com/extrawurst/gitui/issues/2476))

## [0.27.0] - 2024-01-14
Expand Down
29 changes: 12 additions & 17 deletions src/ui/syntax_text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use once_cell::sync::Lazy;
use ratatui::text::{Line, Span};
use scopetime::scope_time;
use std::{
ffi::OsStr,
ops::Range,
path::{Path, PathBuf},
sync::{Arc, Mutex},
Expand Down Expand Up @@ -73,24 +72,20 @@ impl SyntaxText {
params: &RunParams<AsyncAppNotification, ProgressPercent>,
) -> asyncgit::Result<Self> {
scope_time!("syntax_highlighting");

let mut state = {
scope_time!("syntax_highlighting.0");
let syntax = file_path
.extension()
.and_then(OsStr::to_str)
.map_or_else(
|| {
SYNTAX_SET.find_syntax_by_path(
file_path.to_str().unwrap_or_default(),
)
},
|ext| SYNTAX_SET.find_syntax_by_extension(ext),
);

ParseState::new(syntax.unwrap_or_else(|| {
SYNTAX_SET.find_syntax_plain_text()
}))
let plain_text = || SYNTAX_SET.find_syntax_plain_text();
let syntax = SYNTAX_SET
.find_syntax_for_file(
file_path.to_str().unwrap_or_default(),
)
.unwrap_or_else(|e| {
log::error!("Could not read the file to detect its syntax: {e}");
Some(plain_text())
})
.unwrap_or_else(plain_text);

ParseState::new(syntax)
};

let highlighter = Highlighter::new(
Expand Down