Add `command_prelude` module (#12291)
# Description
When implementing a `Command`, one must also import all the types
present in the function signatures for `Command`. This makes it so that
we often import the same set of types in each command implementation
file. E.g., something like this:
```rust
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{
record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData,
ShellError, Signature, Span, Type, Value,
};
```
This PR adds the `nu_engine::command_prelude` module which contains the
necessary and commonly used types to implement a `Command`:
```rust
// command_prelude.rs
pub use crate::CallExt;
pub use nu_protocol::{
ast::{Call, CellPath},
engine::{Command, EngineState, Stack},
record, Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, IntoSpanned,
PipelineData, Record, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
};
```
This should reduce the boilerplate needed to implement a command and
also gives us a place to track the breadth of the `Command` API. I tried
to be conservative with what went into the prelude modules, since it
might be hard/annoying to remove items from the prelude in the future.
Let me know if something should be included or excluded.
2024-03-26 21:17:30 +00:00
|
|
|
use crate::{
|
|
|
|
ast::Call,
|
|
|
|
engine::{Command, EngineState, Stack},
|
|
|
|
BlockId, PipelineData, ShellError, SyntaxShape, Type, Value, VarId,
|
|
|
|
};
|
|
|
|
use serde::{Deserialize, Serialize};
|
2022-06-04 06:47:36 +00:00
|
|
|
use std::fmt::Write;
|
2021-07-01 22:40:08 +00:00
|
|
|
|
2022-03-07 20:08:56 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct Flag {
|
|
|
|
pub long: String,
|
|
|
|
pub short: Option<char>,
|
|
|
|
pub arg: Option<SyntaxShape>,
|
|
|
|
pub required: bool,
|
|
|
|
pub desc: String,
|
2022-03-07 20:08:56 +00:00
|
|
|
|
2021-07-23 21:19:30 +00:00
|
|
|
// For custom commands
|
|
|
|
pub var_id: Option<VarId>,
|
2023-05-03 21:09:36 +00:00
|
|
|
pub default_value: Option<Value>,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
2022-03-07 20:08:56 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct PositionalArg {
|
|
|
|
pub name: String,
|
|
|
|
pub desc: String,
|
|
|
|
pub shape: SyntaxShape,
|
2022-03-07 20:08:56 +00:00
|
|
|
|
2021-07-23 21:19:30 +00:00
|
|
|
// For custom commands
|
|
|
|
pub var_id: Option<VarId>,
|
2023-04-26 14:14:02 +00:00
|
|
|
pub default_value: Option<Value>,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
2022-06-04 06:47:36 +00:00
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
2021-11-17 04:22:37 +00:00
|
|
|
pub enum Category {
|
2022-07-30 09:25:44 +00:00
|
|
|
Bits,
|
2022-07-04 10:51:07 +00:00
|
|
|
Bytes,
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Chart,
|
|
|
|
Conversions,
|
|
|
|
Core,
|
|
|
|
Custom(String),
|
2023-12-13 15:24:16 +00:00
|
|
|
Database,
|
2021-11-17 04:22:37 +00:00
|
|
|
Date,
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Debug,
|
|
|
|
Default,
|
2023-08-14 19:17:31 +00:00
|
|
|
Removed,
|
2021-11-17 04:22:37 +00:00
|
|
|
Env,
|
|
|
|
Experimental,
|
|
|
|
FileSystem,
|
|
|
|
Filters,
|
|
|
|
Formats,
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Generators,
|
|
|
|
Hash,
|
2023-12-15 12:17:12 +00:00
|
|
|
History,
|
2021-11-17 04:22:37 +00:00
|
|
|
Math,
|
2022-06-16 16:58:38 +00:00
|
|
|
Misc,
|
2021-12-10 00:09:30 +00:00
|
|
|
Network,
|
2023-08-07 04:03:23 +00:00
|
|
|
Path,
|
2021-11-28 08:32:44 +00:00
|
|
|
Platform,
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Random,
|
2021-11-26 08:00:57 +00:00
|
|
|
Shells,
|
2021-11-17 04:22:37 +00:00
|
|
|
Strings,
|
|
|
|
System,
|
|
|
|
Viewers,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl std::fmt::Display for Category {
|
|
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
|
|
let msg = match self {
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Category::Bits => "bits",
|
|
|
|
Category::Bytes => "bytes",
|
|
|
|
Category::Chart => "chart",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Conversions => "conversions",
|
|
|
|
Category::Core => "core",
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Category::Custom(name) => name,
|
2023-12-13 15:24:16 +00:00
|
|
|
Category::Database => "database",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Date => "date",
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Category::Debug => "debug",
|
|
|
|
Category::Default => "default",
|
2023-08-14 19:17:31 +00:00
|
|
|
Category::Removed => "removed",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Env => "env",
|
|
|
|
Category::Experimental => "experimental",
|
|
|
|
Category::FileSystem => "filesystem",
|
|
|
|
Category::Filters => "filters",
|
|
|
|
Category::Formats => "formats",
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Category::Generators => "generators",
|
|
|
|
Category::Hash => "hash",
|
2023-12-15 12:17:12 +00:00
|
|
|
Category::History => "history",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Math => "math",
|
2022-06-16 16:58:38 +00:00
|
|
|
Category::Misc => "misc",
|
2021-12-10 00:09:30 +00:00
|
|
|
Category::Network => "network",
|
2023-08-07 04:03:23 +00:00
|
|
|
Category::Path => "path",
|
2021-11-28 08:32:44 +00:00
|
|
|
Category::Platform => "platform",
|
view span & view files commands (#7989)
# Description
This PR does the following:
1. Adds a new command called `view span` - which shows what is at the
location of the span parameters
2. Adds a new command called `view` - which just lists all the `view`
commands.
3. Renames `view-source` to `view source`.
4. Adds a new command called `view files` - which shows you what files
are loaded into nushell's EngineState memory.
5. Added a `Category::Debug` and put these commands (and others) into
it. (`inspect` needs to be added to it, but it's not landed yet)
Spans are important to nushell. One of their uses is to show where
errors are. For instance, in this example, the leader lines pointing to
parts of the command line are able to point to `10`, `/`, and `"bob"`
because each of those items have a span.
```
> 10 / "bob"
Error: nu::parser::unsupported_operation (link)
× Types mismatched for operation.
╭─[entry #8:1:1]
1 │ 10 / "bob"
· ─┬ ┬ ──┬──
· │ │ ╰── string
· │ ╰── doesn't support these values.
· ╰── int
╰────
help: Change int or string to be the right types and try again.
```
# Examples
## view span
Example:
```
> $env.config | get keybindings | first | debug -r
... bunch of stuff
span: Span {
start: 68065,
end: 68090,
},
},
],
span: Span {
start: 68050,
end: 68101,
},
},
],
span: Span {
start: 67927,
end: 68108,
},
}
```
To view the last span:
```
> view span 67927 68108
{
name: clear_everything
modifier: control
keycode: char_l
mode: emacs
event: [
{ send: clearscrollback }
]
}
```
> To view the 2nd to last span:
```
view span 68065 68090
{ send: clearscrollback }
```
> To view the 3rd to last span:
```
view span 68050 68101
[
{ send: clearscrollback }
]
```
## view files
```
> view files
╭────┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├────┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
│ 10 │ entry #1 │ 127561 │ 127585 │ 24 │
│ 11 │ entry #2 │ 127585 │ 127595 │ 10 │
╰────┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
`entry #x` will be each command you type in the repl (i think). so, it
may be good to filter those out sometimes.
```
> view files | where filename !~ entry
╭───┬───────────────────────────────────────────────────────┬────────┬────────┬───────╮
│ # │ filename │ start │ end │ size │
├───┼───────────────────────────────────────────────────────┼────────┼────────┼───────┤
│ 0 │ source │ 0 │ 2 │ 2 │
│ 1 │ Host Environment Variables │ 2 │ 6034 │ 6032 │
│ 2 │ C:\Users\a_username\AppData\Roaming\nushell\plugin.nu │ 6034 │ 31236 │ 25202 │
│ 3 │ C:\Users\a_username\AppData\Roaming\nushell\env.nu │ 31236 │ 44961 │ 13725 │
│ 4 │ C:\Users\a_username\AppData\Roaming\nushell\config.nu │ 44961 │ 76134 │ 31173 │
│ 5 │ defs.nu │ 76134 │ 91944 │ 15810 │
│ 6 │ prompt\oh-my.nu │ 91944 │ 111523 │ 19579 │
│ 7 │ weather\get-weather.nu │ 111523 │ 125556 │ 14033 │
│ 8 │ .zoxide.nu │ 125556 │ 127504 │ 1948 │
│ 9 │ source │ 127504 │ 127561 │ 57 │
╰───┴───────────────────────────────────────────────────────┴────────┴────────┴───────╯
```
# User-Facing Changes
I renamed `view-source` to `view source` just to make a group of
commands. No functionality has changed in `view source`.
# 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
# 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.
2023-02-09 17:35:23 +00:00
|
|
|
Category::Random => "random",
|
2021-11-26 08:00:57 +00:00
|
|
|
Category::Shells => "shells",
|
2021-11-17 04:22:37 +00:00
|
|
|
Category::Strings => "strings",
|
|
|
|
Category::System => "system",
|
|
|
|
Category::Viewers => "viewers",
|
|
|
|
};
|
|
|
|
|
2023-01-30 01:37:54 +00:00
|
|
|
write!(f, "{msg}")
|
2021-11-17 04:22:37 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-19 02:51:42 +00:00
|
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
2021-07-01 22:40:08 +00:00
|
|
|
pub struct Signature {
|
|
|
|
pub name: String,
|
|
|
|
pub usage: String,
|
|
|
|
pub extra_usage: String,
|
2022-03-27 19:25:30 +00:00
|
|
|
pub search_terms: Vec<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
pub required_positional: Vec<PositionalArg>,
|
|
|
|
pub optional_positional: Vec<PositionalArg>,
|
|
|
|
pub rest_positional: Option<PositionalArg>,
|
|
|
|
pub named: Vec<Flag>,
|
2022-11-09 21:55:05 +00:00
|
|
|
pub input_output_types: Vec<(Type, Type)>,
|
|
|
|
pub allow_variants_without_examples: bool,
|
2021-07-01 22:40:08 +00:00
|
|
|
pub is_filter: bool,
|
2021-10-09 16:10:46 +00:00
|
|
|
pub creates_scope: bool,
|
2022-12-21 22:33:26 +00:00
|
|
|
pub allows_unknown_args: bool,
|
2021-11-17 04:22:37 +00:00
|
|
|
// Signature category used to classify commands stored in the list of declarations
|
|
|
|
pub category: Category,
|
2019-05-28 06:45:18 +00:00
|
|
|
}
|
|
|
|
|
2020-12-18 07:53:49 +00:00
|
|
|
impl PartialEq for Signature {
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
self.name == other.name
|
|
|
|
&& self.usage == other.usage
|
2021-07-01 22:40:08 +00:00
|
|
|
&& self.required_positional == other.required_positional
|
|
|
|
&& self.optional_positional == other.optional_positional
|
2020-12-18 07:53:49 +00:00
|
|
|
&& self.rest_positional == other.rest_positional
|
|
|
|
&& self.is_filter == other.is_filter
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Eq for Signature {}
|
|
|
|
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 22:45:03 +00:00
|
|
|
impl Signature {
|
2021-07-01 22:40:08 +00:00
|
|
|
pub fn new(name: impl Into<String>) -> Signature {
|
2019-11-18 03:12:37 +00:00
|
|
|
Signature {
|
2019-12-04 21:14:52 +00:00
|
|
|
name: name.into(),
|
2019-11-18 03:12:37 +00:00
|
|
|
usage: String::new(),
|
2021-06-29 14:27:16 +00:00
|
|
|
extra_usage: String::new(),
|
2022-03-27 19:25:30 +00:00
|
|
|
search_terms: vec![],
|
2021-07-01 22:40:08 +00:00
|
|
|
required_positional: vec![],
|
|
|
|
optional_positional: vec![],
|
|
|
|
rest_positional: None,
|
2022-11-09 21:55:05 +00:00
|
|
|
input_output_types: vec![],
|
|
|
|
allow_variants_without_examples: false,
|
2022-05-29 13:14:15 +00:00
|
|
|
named: vec![],
|
2021-07-01 22:40:08 +00:00
|
|
|
is_filter: false,
|
2021-10-09 16:10:46 +00:00
|
|
|
creates_scope: false,
|
2021-11-17 04:22:37 +00:00
|
|
|
category: Category::Default,
|
2022-12-21 22:33:26 +00:00
|
|
|
allows_unknown_args: false,
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
}
|
2022-03-27 19:25:30 +00:00
|
|
|
|
Improve type hovers (#9515)
# Description
This PR does a few things to help improve type hovers and, in the
process, fixes a few outstanding issues in the type system. Here's a
list of the changes:
* `for` now will try to infer the type of the iteration variable based
on the expression it's given. This fixes things like `for x in [1, 2, 3]
{ }` where `x` now properly gets the int type.
* Removed old input/output type fields from the signature, focuses on
the vec of signatures. Updated a bunch of dataframe commands that hadn't
moved over. This helps tie things together a bit better
* Fixed inference of types from subexpressions to use the last
expression in the block
* Fixed handling of explicit types in `let` and `mut` calls, so we now
respect that as the authoritative type
I also tried to add `def` input/output type inference, but unfortunately
we only know the predecl types universally, which means we won't have
enough information to properly know what the types of the custom
commands are.
# User-Facing Changes
Script typechecking will get tighter in some cases
Hovers should be more accurate in some cases that previously resorted to
any.
# 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 -A clippy::result_large_err` 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-06-28 17:19:48 +00:00
|
|
|
// Gets the input type from the signature
|
|
|
|
pub fn get_input_type(&self) -> Type {
|
|
|
|
match self.input_output_types.len() {
|
|
|
|
0 => Type::Any,
|
|
|
|
1 => self.input_output_types[0].0.clone(),
|
|
|
|
_ => {
|
|
|
|
let first = &self.input_output_types[0].0;
|
|
|
|
if self
|
|
|
|
.input_output_types
|
|
|
|
.iter()
|
|
|
|
.all(|(input, _)| input == first)
|
|
|
|
{
|
|
|
|
first.clone()
|
|
|
|
} else {
|
|
|
|
Type::Any
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Gets the output type from the signature
|
|
|
|
pub fn get_output_type(&self) -> Type {
|
|
|
|
match self.input_output_types.len() {
|
|
|
|
0 => Type::Any,
|
|
|
|
1 => self.input_output_types[0].1.clone(),
|
|
|
|
_ => {
|
|
|
|
let first = &self.input_output_types[0].1;
|
|
|
|
if self
|
|
|
|
.input_output_types
|
|
|
|
.iter()
|
|
|
|
.all(|(_, output)| output == first)
|
|
|
|
{
|
|
|
|
first.clone()
|
|
|
|
} else {
|
|
|
|
Type::Any
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-05-29 13:14:15 +00:00
|
|
|
// Add a default help option to a signature
|
|
|
|
pub fn add_help(mut self) -> Signature {
|
|
|
|
// default help flag
|
|
|
|
let flag = Flag {
|
|
|
|
long: "help".into(),
|
|
|
|
short: Some('h'),
|
|
|
|
arg: None,
|
2022-10-26 16:36:42 +00:00
|
|
|
desc: "Display the help message for this command".into(),
|
2022-05-29 13:14:15 +00:00
|
|
|
required: false,
|
|
|
|
var_id: None,
|
|
|
|
default_value: None,
|
|
|
|
};
|
|
|
|
self.named.push(flag);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
// Build an internal signature with default help option
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn build(name: impl Into<String>) -> Signature {
|
2022-05-29 13:14:15 +00:00
|
|
|
Signature::new(name.into()).add_help()
|
2019-07-24 04:10:48 +00:00
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a description to the signature
|
2022-03-27 19:25:30 +00:00
|
|
|
pub fn usage(mut self, msg: impl Into<String>) -> Signature {
|
|
|
|
self.usage = msg.into();
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Add an extra description to the signature
|
|
|
|
pub fn extra_usage(mut self, msg: impl Into<String>) -> Signature {
|
|
|
|
self.extra_usage = msg.into();
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Add search terms to the signature
|
|
|
|
pub fn search_terms(mut self, terms: Vec<String>) -> Signature {
|
|
|
|
self.search_terms = terms;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Update signature's fields from a Command trait implementation
|
2023-08-11 17:58:49 +00:00
|
|
|
pub fn update_from_command(mut self, command: &dyn Command) -> Signature {
|
2022-03-27 19:25:30 +00:00
|
|
|
self.search_terms = command
|
|
|
|
.search_terms()
|
|
|
|
.into_iter()
|
|
|
|
.map(|term| term.to_string())
|
|
|
|
.collect();
|
|
|
|
self.extra_usage = command.extra_usage().to_string();
|
|
|
|
self.usage = command.usage().to_string();
|
2019-08-29 22:52:32 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-12-21 22:33:26 +00:00
|
|
|
/// Allow unknown signature parameters
|
|
|
|
pub fn allows_unknown_args(mut self) -> Signature {
|
|
|
|
self.allows_unknown_args = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a required positional argument to the signature
|
2019-10-28 05:15:35 +00:00
|
|
|
pub fn required(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
|
|
|
self.required_positional.push(PositionalArg {
|
|
|
|
name: name.into(),
|
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2019-07-24 04:10:48 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-06-01 02:24:16 +00:00
|
|
|
/// Add an optional positional argument to the signature
|
2021-07-01 22:40:08 +00:00
|
|
|
pub fn optional(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
|
|
|
self.optional_positional.push(PositionalArg {
|
|
|
|
name: name.into(),
|
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-09-07 03:37:02 +00:00
|
|
|
pub fn rest(
|
|
|
|
mut self,
|
|
|
|
name: &str,
|
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
) -> Signature {
|
2021-07-30 03:26:06 +00:00
|
|
|
self.rest_positional = Some(PositionalArg {
|
2021-09-07 03:37:02 +00:00
|
|
|
name: name.into(),
|
2021-07-30 03:26:06 +00:00
|
|
|
desc: desc.into(),
|
|
|
|
shape: shape.into(),
|
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-30 03:26:06 +00:00
|
|
|
});
|
2019-07-24 04:10:48 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
/// Is this command capable of operating on its input via cell paths?
|
|
|
|
pub fn operates_on_cell_paths(&self) -> bool {
|
|
|
|
self.required_positional
|
|
|
|
.iter()
|
|
|
|
.chain(self.rest_positional.iter())
|
|
|
|
.any(|pos| {
|
|
|
|
matches!(
|
|
|
|
pos,
|
|
|
|
PositionalArg {
|
|
|
|
shape: SyntaxShape::CellPath,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add an optional named flag argument to the signature
|
2019-10-28 05:15:35 +00:00
|
|
|
pub fn named(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: Some(shape.into()),
|
|
|
|
required: false,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2019-08-02 19:15:07 +00:00
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a required named flag argument to the signature
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn required_named(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
2021-07-01 22:40:08 +00:00
|
|
|
shape: impl Into<SyntaxShape>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: Some(shape.into()),
|
|
|
|
required: true,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
|
|
|
|
2019-08-02 19:15:07 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Add a switch to the signature
|
2020-02-12 02:24:31 +00:00
|
|
|
pub fn switch(
|
|
|
|
mut self,
|
|
|
|
name: impl Into<String>,
|
|
|
|
desc: impl Into<String>,
|
|
|
|
short: Option<char>,
|
|
|
|
) -> Signature {
|
2021-09-04 07:45:49 +00:00
|
|
|
let (name, s) = self.check_names(name, short);
|
2021-07-01 22:40:08 +00:00
|
|
|
|
|
|
|
self.named.push(Flag {
|
2021-09-04 08:19:07 +00:00
|
|
|
long: name,
|
2021-07-01 22:40:08 +00:00
|
|
|
short: s,
|
|
|
|
arg: None,
|
|
|
|
required: false,
|
|
|
|
desc: desc.into(),
|
2021-07-23 21:19:30 +00:00
|
|
|
var_id: None,
|
2022-03-07 20:08:56 +00:00
|
|
|
default_value: None,
|
2021-07-01 22:40:08 +00:00
|
|
|
});
|
2021-09-04 07:45:49 +00:00
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-06-25 21:23:56 +00:00
|
|
|
/// Changes the input type of the command signature
|
Improve type hovers (#9515)
# Description
This PR does a few things to help improve type hovers and, in the
process, fixes a few outstanding issues in the type system. Here's a
list of the changes:
* `for` now will try to infer the type of the iteration variable based
on the expression it's given. This fixes things like `for x in [1, 2, 3]
{ }` where `x` now properly gets the int type.
* Removed old input/output type fields from the signature, focuses on
the vec of signatures. Updated a bunch of dataframe commands that hadn't
moved over. This helps tie things together a bit better
* Fixed inference of types from subexpressions to use the last
expression in the block
* Fixed handling of explicit types in `let` and `mut` calls, so we now
respect that as the authoritative type
I also tried to add `def` input/output type inference, but unfortunately
we only know the predecl types universally, which means we won't have
enough information to properly know what the types of the custom
commands are.
# User-Facing Changes
Script typechecking will get tighter in some cases
Hovers should be more accurate in some cases that previously resorted to
any.
# 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 -A clippy::result_large_err` 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.
-->
---------
Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com>
2023-06-28 17:19:48 +00:00
|
|
|
pub fn input_output_type(mut self, input_type: Type, output_type: Type) -> Signature {
|
|
|
|
self.input_output_types.push((input_type, output_type));
|
2022-06-25 21:23:56 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
/// Set the input-output type signature variants of the command
|
|
|
|
pub fn input_output_types(mut self, input_output_types: Vec<(Type, Type)>) -> Signature {
|
|
|
|
self.input_output_types = input_output_types;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-11-17 04:22:37 +00:00
|
|
|
/// Changes the signature category
|
|
|
|
pub fn category(mut self, category: Category) -> Signature {
|
|
|
|
self.category = category;
|
|
|
|
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-10-09 16:10:46 +00:00
|
|
|
/// Sets that signature will create a scope as it parses
|
|
|
|
pub fn creates_scope(mut self) -> Signature {
|
|
|
|
self.creates_scope = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-11-09 21:55:05 +00:00
|
|
|
// Is it allowed for the type signature to feature a variant that has no corresponding example?
|
|
|
|
pub fn allow_variants_without_examples(mut self, allow: bool) -> Signature {
|
|
|
|
self.allow_variants_without_examples = allow;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
pub fn call_signature(&self) -> String {
|
|
|
|
let mut one_liner = String::new();
|
|
|
|
one_liner.push_str(&self.name);
|
|
|
|
one_liner.push(' ');
|
|
|
|
|
2022-01-26 14:42:39 +00:00
|
|
|
// Note: the call signature needs flags first because on the nu commandline,
|
|
|
|
// flags will precede the script file name. Flags for internal commands can come
|
|
|
|
// either before or after (or around) positional parameters, so there isn't a strong
|
|
|
|
// preference, so we default to the more constrained example.
|
|
|
|
if self.named.len() > 1 {
|
|
|
|
one_liner.push_str("{flags} ");
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
for positional in &self.required_positional {
|
|
|
|
one_liner.push_str(&get_positional_short_name(positional, true));
|
|
|
|
}
|
|
|
|
for positional in &self.optional_positional {
|
|
|
|
one_liner.push_str(&get_positional_short_name(positional, false));
|
|
|
|
}
|
|
|
|
|
2022-01-26 14:42:39 +00:00
|
|
|
if let Some(rest) = &self.rest_positional {
|
2022-06-04 06:47:36 +00:00
|
|
|
let _ = write!(one_liner, "...{}", get_positional_short_name(rest, false));
|
2022-01-03 23:14:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// if !self.subcommands.is_empty() {
|
|
|
|
// one_liner.push_str("<subcommand> ");
|
|
|
|
// }
|
|
|
|
|
|
|
|
one_liner
|
|
|
|
}
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
/// Get list of the short-hand flags
|
|
|
|
pub fn get_shorts(&self) -> Vec<char> {
|
2021-09-04 07:45:49 +00:00
|
|
|
self.named.iter().filter_map(|f| f.short).collect()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Get list of the long-hand flags
|
2021-09-04 08:10:31 +00:00
|
|
|
pub fn get_names(&self) -> Vec<&str> {
|
|
|
|
self.named.iter().map(|f| f.long.as_str()).collect()
|
2021-09-04 07:45:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Checks if short or long are already present
|
|
|
|
/// Panics if one of them is found
|
|
|
|
fn check_names(&self, name: impl Into<String>, short: Option<char>) -> (String, Option<char>) {
|
2020-07-17 17:57:15 +00:00
|
|
|
let s = short.map(|c| {
|
Replace debug_assert! with assert! in Signature::check_names (#11937)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Debug assertions don't run at release, which means that `cargo test
--release` fails because the tests for name checks don't run properly.
These checks are not really expensive, and there shouldn't be any
noticeable difference to startup time, so there isn't much reason not to
just leave them in.
It's valuable to be able to run `cargo test --release`, as that can
expose race conditions and dependencies on undefined behavior that
aren't exposed in debug builds.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This shouldn't affect anything. Any violations of this rule were being
caught with debug tests, which are run by the CI.
# 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` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# 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.
-->
2024-02-22 22:17:06 +00:00
|
|
|
assert!(
|
2020-07-11 21:49:44 +00:00
|
|
|
!self.get_shorts().contains(&c),
|
2023-12-04 14:06:27 +00:00
|
|
|
"There may be duplicate short flags for '-{}'",
|
|
|
|
c
|
2020-07-11 21:49:44 +00:00
|
|
|
);
|
2020-07-17 17:57:15 +00:00
|
|
|
c
|
2020-02-12 02:24:31 +00:00
|
|
|
});
|
|
|
|
|
2021-09-04 07:45:49 +00:00
|
|
|
let name = {
|
2021-09-04 08:10:31 +00:00
|
|
|
let name: String = name.into();
|
Replace debug_assert! with assert! in Signature::check_names (#11937)
<!--
if this PR closes one or more issues, you can automatically link the PR
with
them by using one of the [*linking
keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword),
e.g.
- this PR should close #xxxx
- fixes #xxxx
you can also mention related issues, PRs or discussions!
-->
# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.
Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->
Debug assertions don't run at release, which means that `cargo test
--release` fails because the tests for name checks don't run properly.
These checks are not really expensive, and there shouldn't be any
noticeable difference to startup time, so there isn't much reason not to
just leave them in.
It's valuable to be able to run `cargo test --release`, as that can
expose race conditions and dependencies on undefined behavior that
aren't exposed in debug builds.
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This shouldn't affect anything. Any violations of this rule were being
caught with debug tests, which are run by the CI.
# 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` to
check that you're using the standard code style
- `cargo test --workspace` to check that all tests pass (on Windows make
sure to [enable developer
mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging))
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` 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
> ```
-->
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# 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.
-->
2024-02-22 22:17:06 +00:00
|
|
|
assert!(
|
2021-09-04 08:10:31 +00:00
|
|
|
!self.get_names().contains(&name.as_str()),
|
2023-12-04 14:06:27 +00:00
|
|
|
"There may be duplicate name flags for '--{}'",
|
|
|
|
name
|
2021-09-04 07:45:49 +00:00
|
|
|
);
|
|
|
|
name
|
|
|
|
};
|
|
|
|
|
|
|
|
(name, s)
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn get_positional(&self, position: usize) -> Option<PositionalArg> {
|
|
|
|
if position < self.required_positional.len() {
|
|
|
|
self.required_positional.get(position).cloned()
|
|
|
|
} else if position < (self.required_positional.len() + self.optional_positional.len()) {
|
|
|
|
self.optional_positional
|
|
|
|
.get(position - self.required_positional.len())
|
|
|
|
.cloned()
|
|
|
|
} else {
|
|
|
|
self.rest_positional.clone()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-07-07 22:55:46 +00:00
|
|
|
pub fn num_positionals(&self) -> usize {
|
2021-07-24 05:57:17 +00:00
|
|
|
let mut total = self.required_positional.len() + self.optional_positional.len();
|
|
|
|
|
|
|
|
for positional in &self.required_positional {
|
2021-07-29 22:56:51 +00:00
|
|
|
if let SyntaxShape::Keyword(..) = positional.shape {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
total += 1;
|
2021-07-24 05:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for positional in &self.optional_positional {
|
2021-07-29 22:56:51 +00:00
|
|
|
if let SyntaxShape::Keyword(..) = positional.shape {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
total += 1;
|
2021-07-24 05:57:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
total
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn num_positionals_after(&self, idx: usize) -> usize {
|
|
|
|
let mut total = 0;
|
|
|
|
|
2021-09-04 07:59:38 +00:00
|
|
|
for (curr, positional) in self.required_positional.iter().enumerate() {
|
2021-07-24 05:57:17 +00:00
|
|
|
match positional.shape {
|
|
|
|
SyntaxShape::Keyword(..) => {
|
|
|
|
// Keywords have a required argument, so account for that
|
|
|
|
if curr > idx {
|
|
|
|
total += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
if curr > idx {
|
|
|
|
total += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
total
|
2021-07-07 22:55:46 +00:00
|
|
|
}
|
|
|
|
|
2021-07-01 22:40:08 +00:00
|
|
|
/// Find the matching long flag
|
|
|
|
pub fn get_long_flag(&self, name: &str) -> Option<Flag> {
|
|
|
|
for flag in &self.named {
|
|
|
|
if flag.long == name {
|
|
|
|
return Some(flag.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Find the matching long flag
|
|
|
|
pub fn get_short_flag(&self, short: char) -> Option<Flag> {
|
|
|
|
for flag in &self.named {
|
|
|
|
if let Some(short_flag) = &flag.short {
|
|
|
|
if *short_flag == short {
|
|
|
|
return Some(flag.clone());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None
|
2020-01-17 22:46:18 +00:00
|
|
|
}
|
|
|
|
|
2020-01-15 18:32:46 +00:00
|
|
|
/// Set the filter flag for the signature
|
2019-08-02 19:15:07 +00:00
|
|
|
pub fn filter(mut self) -> Signature {
|
|
|
|
self.is_filter = true;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2021-09-02 08:25:22 +00:00
|
|
|
/// Create a placeholder implementation of Command as a way to predeclare a definition's
|
|
|
|
/// signature so other definitions can see it. This placeholder is later replaced with the
|
|
|
|
/// full definition in a second pass of the parser.
|
|
|
|
pub fn predeclare(self) -> Box<dyn Command> {
|
|
|
|
Box::new(Predeclaration { signature: self })
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Combines a signature and a block into a runnable block
|
|
|
|
pub fn into_block_command(self, block_id: BlockId) -> Box<dyn Command> {
|
|
|
|
Box::new(BlockCommand {
|
|
|
|
signature: self,
|
|
|
|
block_id,
|
|
|
|
})
|
|
|
|
}
|
2022-12-13 12:45:33 +00:00
|
|
|
|
|
|
|
pub fn formatted_flags(self) -> String {
|
|
|
|
if self.named.len() < 11 {
|
|
|
|
let mut s = "Available flags:".to_string();
|
|
|
|
for flag in self.named {
|
|
|
|
if let Some(short) = flag.short {
|
|
|
|
let _ = write!(s, " --{}(-{}),", flag.long, short);
|
|
|
|
} else {
|
|
|
|
let _ = write!(s, " --{},", flag.long);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.remove(s.len() - 1);
|
|
|
|
let _ = write!(s, ". Use `--help` for more information.");
|
|
|
|
s
|
|
|
|
} else {
|
|
|
|
let mut s = "Some available flags:".to_string();
|
|
|
|
for flag in self.named {
|
|
|
|
if let Some(short) = flag.short {
|
|
|
|
let _ = write!(s, " --{}(-{}),", flag.long, short);
|
|
|
|
} else {
|
|
|
|
let _ = write!(s, " --{},", flag.long);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s.remove(s.len() - 1);
|
|
|
|
let _ = write!(
|
|
|
|
s,
|
|
|
|
"... Use `--help` for a full list of flags and more information."
|
|
|
|
);
|
|
|
|
s
|
|
|
|
}
|
|
|
|
}
|
2021-07-01 22:40:08 +00:00
|
|
|
}
|
2021-07-16 01:10:22 +00:00
|
|
|
|
2021-10-25 04:01:02 +00:00
|
|
|
#[derive(Clone)]
|
2021-09-02 08:25:22 +00:00
|
|
|
struct Predeclaration {
|
|
|
|
signature: Signature,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Command for Predeclaration {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
&self.signature.name
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
|
|
|
self.signature.clone()
|
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
&self.signature.usage
|
2021-07-29 22:56:51 +00:00
|
|
|
}
|
2021-09-02 18:21:37 +00:00
|
|
|
|
2022-12-30 15:44:37 +00:00
|
|
|
fn extra_usage(&self) -> &str {
|
|
|
|
&self.signature.extra_usage
|
|
|
|
}
|
|
|
|
|
2021-09-02 22:58:15 +00:00
|
|
|
fn run(
|
|
|
|
&self,
|
2021-10-25 06:31:39 +00:00
|
|
|
_engine_state: &EngineState,
|
|
|
|
_stack: &mut Stack,
|
2021-09-02 22:58:15 +00:00
|
|
|
_call: &Call,
|
2021-10-25 04:01:02 +00:00
|
|
|
_input: PipelineData,
|
|
|
|
) -> Result<PipelineData, crate::ShellError> {
|
2021-09-02 18:21:37 +00:00
|
|
|
panic!("Internal error: can't run a predeclaration without a body")
|
2021-07-29 22:56:51 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-03 23:14:33 +00:00
|
|
|
fn get_positional_short_name(arg: &PositionalArg, is_required: bool) -> String {
|
|
|
|
match &arg.shape {
|
|
|
|
SyntaxShape::Keyword(name, ..) => {
|
|
|
|
if is_required {
|
|
|
|
format!("{} <{}> ", String::from_utf8_lossy(name), arg.name)
|
|
|
|
} else {
|
|
|
|
format!("({} <{}>) ", String::from_utf8_lossy(name), arg.name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
if is_required {
|
|
|
|
format!("<{}> ", arg.name)
|
|
|
|
} else {
|
|
|
|
format!("({}) ", arg.name)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-25 04:01:02 +00:00
|
|
|
#[derive(Clone)]
|
2021-09-02 08:25:22 +00:00
|
|
|
struct BlockCommand {
|
|
|
|
signature: Signature,
|
|
|
|
block_id: BlockId,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Command for BlockCommand {
|
|
|
|
fn name(&self) -> &str {
|
|
|
|
&self.signature.name
|
|
|
|
}
|
|
|
|
|
|
|
|
fn signature(&self) -> Signature {
|
2021-09-06 02:20:02 +00:00
|
|
|
self.signature.clone()
|
2021-09-02 08:25:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn usage(&self) -> &str {
|
|
|
|
&self.signature.usage
|
2021-07-16 01:10:22 +00:00
|
|
|
}
|
2021-09-02 18:21:37 +00:00
|
|
|
|
2022-12-30 15:44:37 +00:00
|
|
|
fn extra_usage(&self) -> &str {
|
|
|
|
&self.signature.extra_usage
|
|
|
|
}
|
|
|
|
|
2021-09-02 22:58:15 +00:00
|
|
|
fn run(
|
|
|
|
&self,
|
2021-10-25 06:31:39 +00:00
|
|
|
_engine_state: &EngineState,
|
|
|
|
_stack: &mut Stack,
|
2021-09-02 22:58:15 +00:00
|
|
|
_call: &Call,
|
2021-10-25 04:01:02 +00:00
|
|
|
_input: PipelineData,
|
|
|
|
) -> Result<crate::PipelineData, crate::ShellError> {
|
2023-12-06 23:40:03 +00:00
|
|
|
Err(ShellError::GenericError {
|
|
|
|
error: "Internal error: can't run custom command with 'run', use block_id".into(),
|
|
|
|
msg: "".into(),
|
|
|
|
span: None,
|
|
|
|
help: None,
|
|
|
|
inner: vec![],
|
|
|
|
})
|
2021-09-02 18:21:37 +00:00
|
|
|
}
|
|
|
|
|
2021-09-05 23:16:27 +00:00
|
|
|
fn get_block_id(&self) -> Option<BlockId> {
|
2021-09-02 18:21:37 +00:00
|
|
|
Some(self.block_id)
|
2020-02-12 02:24:31 +00:00
|
|
|
}
|
2019-07-24 04:10:48 +00:00
|
|
|
}
|