h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-01 21:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

fix: update SourceLineCache to use NonNull for last_source pointer

Browse Source 
Closes #12401
This commit is contained in:
xtqqczze
2026-01-31 02:37:50 +00:00
committed by Johannes Altmanninger
parent 24ee3afdae
commit 86b126628c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/parse_tree.rs
View File

@@ -2,6 +2,7 @@
use std::ops::Deref;
use std::pin::Pin;
use std::ptr::NonNull;
use std::sync::Arc;
use crate::ast::{self, Ast, JobList, Node};
@@ -114,19 +115,23 @@ unsafe impl Sync for ParsedSource {}
/// Caches the last source's offset and newline count.
#[derive(Default)]
pub struct SourceLineCache {
last_source: *const ParsedSource, // Pointer to last source used
offset: usize, // Exclusive offset of the number of newlines counted
count: usize, // Count of newlines up to offset
/// Pointer to last source used
last_source: Option<NonNull<ParsedSource>>,
/// Exclusive offset of the number of newlines counted
offset: usize,
/// Count of newlines up to offset
count: usize,
}
impl ParsedSource {
/// Compute the 1-based line number for a given offset, using and updating the cache.
pub fn lineno_for_offset(&self, offset: usize, cache: &mut SourceLineCache) -> u32 {
let self_ptr = std::ptr::from_ref(self);
// TODO(MSRV>=1.89): feature(non_null_from_ref)
let self_ptr = unsafe { NonNull::new_unchecked(std::ptr::from_ref(self).cast_mut()) };
// If source changed, reset cache.
if cache.last_source != self_ptr {
cache.last_source = self_ptr;
if cache.last_source != Some(self_ptr) {
cache.last_source = Some(self_ptr);
cache.offset = 0;
cache.count = 0;
}