mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-21 17:50:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add CellOffsets abstraction (#8814)

Browse source 
Refactor `Notebook::cell_offsets` to use an abstract struct for storing
the cell offsets. This will allow us to add useful methods on it.
This commit is contained in:
Dhruv Manilawala 2023-11-22 09:27:00 -06:00 • committed by GitHub
parent 0cb438dd65
commit 727e389cac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 50 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ruff_notebook/src/notebook.rs
View file

@ -15,6 +15,7 @@ use ruff_diagnostics::{SourceMap, SourceMarker};
use ruff_source_file::{NewlineWithTrailingNewline, OneIndexed, UniversalNewlineIterator};
use ruff_text_size::TextSize;
use crate::cell::CellOffsets;
use crate::index::NotebookIndex;
use crate::schema::{Cell, RawNotebook, SortAlphabetically, SourceValue};
@ -65,7 +66,7 @@ pub struct Notebook {
raw: RawNotebook,
/// The offsets of each cell in the concatenated source code. This includes
/// the first and last character offsets as well.
cell_offsets: Vec<TextSize>,
cell_offsets: CellOffsets,
/// The cell index of all valid code cells in the notebook.
valid_code_cells: Vec<u32>,
/// Flag to indicate if the JSON string of the notebook has a trailing newline.
@ -128,7 +129,7 @@ impl Notebook {
let mut contents = Vec::with_capacity(valid_code_cells.len());
let mut current_offset = TextSize::from(0);
let mut cell_offsets = Vec::with_capacity(valid_code_cells.len());
let mut cell_offsets = CellOffsets::with_capacity(valid_code_cells.len());
cell_offsets.push(TextSize::from(0));
for &idx in &valid_code_cells {
@ -324,9 +325,9 @@ impl Notebook {
self.index.take().unwrap_or_else(|| self.build_index())
}
/// Return the cell offsets for the concatenated source code corresponding
/// Return the [`CellOffsets`] for the concatenated source code corresponding
/// the Jupyter notebook.
pub fn cell_offsets(&self) -> &[TextSize] {
pub fn cell_offsets(&self) -> &CellOffsets {
&self.cell_offsets
}
@ -503,7 +504,7 @@ print("after empty cells")
}
);
assert_eq!(
notebook.cell_offsets(),
notebook.cell_offsets().as_ref(),
&[
0.into(),
90.into(),