Formatter: Fix syntax error location in notebooks

Author: MichaReiser

Cargo.lock

@@ -22,6 +22,7 @@ ruff_macros = { workspace = true }
 ruff_notebook = { workspace = true }
 ruff_python_ast = { workspace = true }
 ruff_python_formatter = { workspace = true }
+ruff_python_parser = { workspace = true }
 ruff_server = { workspace = true }
 ruff_source_file = { workspace = true }
 ruff_text_size = { workspace = true }

crates/ruff/Cargo.toml

@@ -11,6 +11,7 @@ use itertools::Itertools;
 use log::{error, warn};
 use rayon::iter::Either::{Left, Right};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
+use ruff_python_parser::ParseError;
 use rustc_hash::FxHashSet;
 use thiserror::Error;
 use tracing::debug;
@@ -26,7 +27,7 @@ use ruff_linter::source_kind::{SourceError, SourceKind};
 use ruff_linter::warn_user_once;
 use ruff_python_ast::{PySourceType, SourceType};
 use ruff_python_formatter::{format_module_source, format_range, FormatModuleError, QuoteStyle};
-use ruff_source_file::LineIndex;
+use ruff_source_file::{LineIndex, SourceCode};
 use ruff_text_size::{TextLen, TextRange, TextSize};
 use ruff_workspace::resolver::{match_exclusion, python_files_in_path, ResolvedFile, Resolver};
 use ruff_workspace::FormatterSettings;
@@ -406,8 +407,12 @@ pub(crate) fn format_source(
                 let formatted =
                     format_module_source(unformatted, options.clone()).map_err(|err| {
                         if let FormatModuleError::ParseError(err) = err {
+                            // Offset the error by the start of the cell
                             DisplayParseError::from_source_kind(
-                                err,
+                                ParseError {
+                                    error: err.error,
+                                    location: err.location.checked_add(*start).unwrap(),
+                                },
                                 path.map(Path::to_path_buf),
                                 source_kind,
                             )

crates/ruff/src/commands/format.rs

@@ -1699,6 +1699,87 @@ fn test_notebook_trailing_semicolon() {
     "##);
 }
 
+#[test]
+fn syntax_error_in_notebooks() -> Result<()> {
+    let tempdir = TempDir::new()?;
+
+    let ruff_toml = tempdir.path().join("ruff.toml");
+    fs::write(
+        &ruff_toml,
+        r#"
+include = ["*.ipy"]
+"#,
+    )?;
+
+    fs::write(
+        tempdir.path().join("main.ipy"),
+        r#"
+{
+    "cells": [
+     {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+       "id": "S6nTuMqGGqp2"
+      },
+      "outputs": [],
+      "source": [
+       "np.random.seed(RANDOM_STATE)\n",
+       "X = pd.DataFrame(data=X, columns=np.arange(0, X.shape[1]))\n",
+       "X[10] = X[6] + X[7] + np.random.random() * 0.01"
+      ]
+     },
+     {
+      "cell_type": "code",
+      "execution_count": null,
+      "metadata": {
+       "id": "fTZWxz1zpb9R"
+      },
+      "outputs": [],
+      "source": [
+       "for i in range(iterations):\n",
+       "    # выберите случайный индекс в диапазон от 0 до len(X)-1 включительно при помощи функции random.randint\n",
+       "    j = # ваш код здесь\n"
+      ]
+     }
+    ],
+    "metadata": {
+     "colab": {
+      "provenance": []
+     },
+     "kernelspec": {
+      "display_name": "ml",
+      "language": "python",
+      "name": "python3"
+     },
+     "language_info": {
+      "name": "python",
+      "version": "3.12.9"
+     }
+    },
+    "nbformat": 4,
+    "nbformat_minor": 0
+   }
+"#,
+    )?;
+
+    assert_cmd_snapshot!(Command::new(get_cargo_bin(BIN_NAME))
+        .current_dir(tempdir.path())
+        .arg("format")
+        .arg("--no-cache")
+        .args(["--config", &ruff_toml.file_name().unwrap().to_string_lossy()])
+        .args(["--extension", "ipy:ipynb"])
+        .arg("."), @r"
+    success: false
+    exit_code: 2
+    ----- stdout -----
+
+    ----- stderr -----
+    error: Failed to parse main.ipy:2:3:24: Expected an expression
+    ");
+    Ok(())
+}
+
 #[test]
 fn extension() -> Result<()> {
     let tempdir = TempDir::new()?;