From a8a4b54b90e6433cf4a25a88a4765243f831ebef Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 11:20:24 +0900 Subject: refactor(seld-json-lint): extract seld/json_lint into the shirabe-seld-json-lint crate Move `Seld\JsonLint` out of shirabe-external-packages and into its own crate, so the path is `shirabe_seld_json_lint::ParsingException` instead of `shirabe_external_packages::seld::json_lint::ParsingException`. Co-Authored-By: Claude Opus 5 (1M context) --- .../src/seld/json_lint.rs | 15 -------- .../src/seld/json_lint/parsing_exception.rs | 45 ---------------------- 2 files changed, 60 deletions(-) delete mode 100644 crates/shirabe-external-packages/src/seld/json_lint.rs delete mode 100644 crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs (limited to 'crates/shirabe-external-packages/src/seld') diff --git a/crates/shirabe-external-packages/src/seld/json_lint.rs b/crates/shirabe-external-packages/src/seld/json_lint.rs deleted file mode 100644 index 2165c8f2..00000000 --- a/crates/shirabe-external-packages/src/seld/json_lint.rs +++ /dev/null @@ -1,15 +0,0 @@ -//! Partial port of seld/jsonlint. -//! -//! The parser, lexer, and duplicate-key exception (`JsonParser`, `Lexer`, -//! `DuplicateKeyException`) are intentionally not ported: JSON syntax validation now relies on -//! serde_json, and duplicate-key detection is done with a hand-written serde visitor, so -//! jsonlint's own parsing machinery is no longer needed. -//! -//! `ParsingException` is kept because it is the exception type thrown for invalid JSON and is -//! matched (via downcast) across the codebase as an error-kind signal; it also carries detail -//! such as the error line. Porting it keeps both the thrown exception class and the information -//! it carries unchanged. - -pub mod parsing_exception; - -pub use parsing_exception::*; diff --git a/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs b/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs deleted file mode 100644 index 9d3eaa57..00000000 --- a/crates/shirabe-external-packages/src/seld/json_lint/parsing_exception.rs +++ /dev/null @@ -1,45 +0,0 @@ -//! ref: composer/vendor/seld/jsonlint/src/Seld/JsonLint/ParsingException.php - -#[derive(Debug, Clone, Default)] -pub struct ParsingExceptionLoc { - pub first_line: i64, - pub first_column: i64, - pub last_line: i64, - pub last_column: i64, -} - -#[derive(Debug, Clone)] -pub enum ParsingExceptionToken { - Name(String), - Symbol(i64), -} - -#[derive(Debug, Clone, Default)] -pub struct ParsingExceptionDetails { - pub text: Option, - pub token: Option, - pub line: Option, - pub loc: Option, - pub expected: Option>, -} - -#[derive(Debug)] -pub struct ParsingException { - inner: shirabe_php_shim::Exception, - pub(crate) details: Box, -} - -impl ParsingException { - pub fn new(message: String, details: ParsingExceptionDetails) -> Self { - Self { - inner: shirabe_php_shim::Exception::new(message), - details: Box::new(details), - } - } - - pub fn get_details(&self) -> &ParsingExceptionDetails { - &self.details - } -} - -shirabe_php_shim::impl_php_exception!(ParsingException, inner, r"Seld\JsonLint\ParsingException"); -- cgit v1.3.1-4-g156e