mirror of
https://github.com/nushell/nushell.git
synced 2025-07-01 07:00:37 +02:00
update ast
to support output to json (#8962)
# Description This PR changes the `ast` command to be able to output `--json` as well as `nuon` (default) with "pretty" and "minified" output. I'm hoping this functionality will be usable in the vscode extension for semantic tokenization and highlighting. # User-Facing Changes There's a new `--json`/`-j` option. Prior version output of nuon is maintained as default. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
@ -1,10 +1,9 @@
|
||||
use super::Pipeline;
|
||||
use crate::{Signature, Span, VarId};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::ops::{Index, IndexMut};
|
||||
|
||||
use crate::{Signature, Span, VarId};
|
||||
|
||||
use super::Pipeline;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Block {
|
||||
pub signature: Box<Signature>,
|
||||
pub pipelines: Vec<Pipeline>,
|
||||
|
@ -1,8 +1,8 @@
|
||||
use crate::{ast::Expression, engine::StateWorkingSet, Span, VarId};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::ops::{Index, IndexMut};
|
||||
|
||||
use crate::{ast::Expression, engine::StateWorkingSet, Span, VarId};
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub enum Redirection {
|
||||
Stdout,
|
||||
Stderr,
|
||||
@ -10,7 +10,7 @@ pub enum Redirection {
|
||||
}
|
||||
|
||||
// Note: Span in the below is for the span of the connector not the whole element
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub enum PipelineElement {
|
||||
Expression(Option<Span>, Expression),
|
||||
Redirection(Span, Redirection, Expression),
|
||||
@ -106,7 +106,7 @@ impl PipelineElement {
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct Pipeline {
|
||||
pub elements: Vec<PipelineElement>,
|
||||
}
|
||||
|
Reference in New Issue
Block a user