mirror of
https://github.com/nushell/nushell.git
synced 2025-07-02 07:31:39 +02:00
Compare commits
303 Commits
Author | SHA1 | Date | |
---|---|---|---|
bc38a6a795 | |||
e89866bedb | |||
ca09dbbbee | |||
fa4531fd17 | |||
d17c970f8c | |||
6ca62ef131 | |||
8e84e33638 | |||
b9be416937 | |||
0a8c9b22b0 | |||
527c44ed84 | |||
8ee015a847 | |||
e8cabd16d5 | |||
88e07b5ea4 | |||
f3ee8b50e3 | |||
68ad854b0d | |||
789b2e603a | |||
66398fbf77 | |||
daeb3e5187 | |||
1fd1a3a456 | |||
30ac2d220c | |||
ade7bde813 | |||
cba3e100a0 | |||
664d8d3573 | |||
d5ce509e3a | |||
2f10d19c98 | |||
4c787af26d | |||
8136170431 | |||
007916c2c1 | |||
208ffdc1da | |||
4468dc835c | |||
90a2352337 | |||
0a9d14fcb3 | |||
7863fb1087 | |||
072d2a919d | |||
ccbdc9f6d8 | |||
0f5ea16605 | |||
1cd70d7505 | |||
b0775b3f1e | |||
2894668b3e | |||
1096e653b0 | |||
9777d755d5 | |||
58529aa0b2 | |||
64b6c02a22 | |||
0780300fb3 | |||
b9106b633b | |||
23dfaa2933 | |||
cfd2cc4970 | |||
710349768f | |||
f4bd78b86d | |||
ddb7e4e179 | |||
00601f1835 | |||
c31225fdcf | |||
16b99ed0ba | |||
3b6d340603 | |||
99aea0c71c | |||
023e244958 | |||
659d890ecf | |||
8e9ed14b89 | |||
f4bf7316fe | |||
0527f9bf0d | |||
055edd886d | |||
5e70d4121a | |||
f9b5d8bc5e | |||
2917c045fb | |||
6e6ef862c5 | |||
a7fdca05c6 | |||
ddc33dc74a | |||
a562f492e3 | |||
58f0d0b945 | |||
67d1249b2b | |||
66e5e42fb1 | |||
1f01b6438f | |||
bea7ec33c1 | |||
b5561f35b9 | |||
b796cda060 | |||
4c308b7f2f | |||
d50eb9b41b | |||
9168301369 | |||
e8d930f659 | |||
aef88aa03e | |||
ec4370069a | |||
c79ece2b21 | |||
99076af18b | |||
a0e3ad2b70 | |||
e89e734ca2 | |||
9945241b77 | |||
215ed141e7 | |||
f189ee67a1 | |||
babc7d3baf | |||
8f4807020f | |||
31e1410191 | |||
24d7227e27 | |||
c130ca1bc6 | |||
4db960c0a6 | |||
d13ce2aec9 | |||
5e957ecda6 | |||
17a265b197 | |||
3fabc8e1e6 | |||
517ef7cde7 | |||
ad14b763f9 | |||
f74694d5a3 | |||
1ea39abcff | |||
7402589775 | |||
e0cd5a714a | |||
c6eea5de6b | |||
809416e3f0 | |||
040d812343 | |||
72465e6724 | |||
ab480856a5 | |||
6ae497eedc | |||
421bc828ef | |||
ed65886ae5 | |||
8c7e2dbdf9 | |||
afb4209f10 | |||
1d8775d237 | |||
8787ec9fe8 | |||
1f810cd26a | |||
f4d7d19370 | |||
e616b2e247 | |||
2a39332d51 | |||
3c6b10c6b2 | |||
2a9226a55c | |||
3d65fd7cc4 | |||
36ddbfdc85 | |||
76292ef10c | |||
9ae2e528c5 | |||
2849e28c2b | |||
9d0e52b94d | |||
731f5f8523 | |||
9d6d43ee55 | |||
f9e99048c4 | |||
e1df8d14b4 | |||
b9419e0f36 | |||
e03c354e89 | |||
2e44e4d33c | |||
5cbaabeeab | |||
d64e381085 | |||
41306aa7e0 | |||
0bb2e47c98 | |||
ef660be285 | |||
4bac90a3b2 | |||
4182fc203e | |||
10e36c4233 | |||
bef397228f | |||
5cf47767d7 | |||
8f2d2535dc | |||
2aae8e6382 | |||
ba12b0de0d | |||
3552d03f6c | |||
8d5165c449 | |||
d8027656b5 | |||
4f57c5d56e | |||
2c5c81815a | |||
b97bfe9297 | |||
db07657e40 | |||
2d98d0fcc2 | |||
e6f6f17c6d | |||
166a927c20 | |||
625fe8866c | |||
69e7aa9fc9 | |||
a775cfe177 | |||
9e4a2ab824 | |||
24aa1f312a | |||
cde56741fb | |||
bbe694a622 | |||
7e575a718b | |||
ea9ca8b4ed | |||
0fe2884397 | |||
2982a2c963 | |||
6a43e1a64d | |||
3b5172a8fa | |||
be32aeee70 | |||
adcc74ab8d | |||
8acced56b2 | |||
f823c7cb5d | |||
26e6516626 | |||
5979e0cd0c | |||
3ba1bfc369 | |||
efa0e6eb62 | |||
159b4bd7dc | |||
2611c9525e | |||
0353eb4a12 | |||
92c4097f8d | |||
a909c60f05 | |||
56a9eab7eb | |||
7221eb7f39 | |||
b0b0482d71 | |||
49ab559992 | |||
3dd21c635a | |||
835bbb2e44 | |||
2ee2370a71 | |||
54dd65cfe1 | |||
b004aacd69 | |||
48b7b415e2 | |||
544cea95e1 | |||
8aa2632661 | |||
5419e8ae9d | |||
d4d28ab796 | |||
b8db928c58 | |||
bf45a5860e | |||
ca543fc8af | |||
57cf805e12 | |||
1ae9157985 | |||
206a6ae6c9 | |||
82ac590412 | |||
9a274128ce | |||
5664ee7bda | |||
9a56665c6b | |||
8044fb2db0 | |||
3a59ab9f14 | |||
f609a4f26a | |||
80463d12fb | |||
cef05d3553 | |||
5879b0df99 | |||
95cd9dd2b2 | |||
424d5611a5 | |||
9bff68a4f6 | |||
a9bdc655c1 | |||
9b617de6f0 | |||
771270d526 | |||
26d1307476 | |||
86707b9972 | |||
52cb865c5c | |||
3ea027a136 | |||
00469de93e | |||
9bc4e6794d | |||
429127793f | |||
75cb3fcc5f | |||
f0e87da830 | |||
c5639cd9fa | |||
95d4922e44 | |||
bdd52f0111 | |||
7bd07cb351 | |||
249afc5df4 | |||
d7af461173 | |||
b17e9f4ed0 | |||
6862734580 | |||
9e1f645428 | |||
c4818d79f3 | |||
d1a78a58cd | |||
65d0b5b9d9 | |||
614bc2a943 | |||
27b06358ea | |||
e56c01d0e2 | |||
ececca7ad2 | |||
e9cc417fd5 | |||
81a7d17b33 | |||
9382dd6d55 | |||
7aa2a57434 | |||
9b88ea5b60 | |||
8bfcea8054 | |||
f3d2be7a56 | |||
be31182969 | |||
b543063749 | |||
ce0060e6b0 | |||
35b12fe5ec | |||
6ac26094da | |||
8c6a0f68d4 | |||
f5d6672ccf | |||
db06edc5d3 | |||
568927349d | |||
4f812a7f34 | |||
38fc42d352 | |||
b4c5693ac6 | |||
79000aa5e0 | |||
2415381682 | |||
b499e7c682 | |||
d8cde2ae89 | |||
ddc00014be | |||
9ffa3e55c2 | |||
45fe3be83e | |||
dd6fe6a04a | |||
e76b38882c | |||
11bdab7e61 | |||
3d682fe957 | |||
a43e66ef92 | |||
3be7996e79 | |||
5041a4ffa3 | |||
b16b3c0b7f | |||
852ec3f9a0 | |||
dd7b7311b3 | |||
9364bad625 | |||
6fc5244439 | |||
8e1112c1dd | |||
9d1cb1bfaf | |||
216d7d035f | |||
ead6fbdf9c | |||
5b616770df | |||
23a5c5dc09 | |||
74656bf976 | |||
d8a2e0e9a3 | |||
046e46b962 | |||
ec08e4bc6d | |||
05e07ddf5c | |||
757d7479af | |||
440feaf74a | |||
22c50185b5 | |||
3a2c7900d6 | |||
fa8629300f | |||
37dc226996 | |||
4e1f94026c | |||
d27263af97 | |||
215f1af1da |
20
.github/dependabot.yml
vendored
Normal file
20
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
# To get started with Dependabot version updates, you'll need to specify which
|
||||||
|
# package ecosystems to update and where the package manifests are located.
|
||||||
|
# Please see the documentation for all configuration options:
|
||||||
|
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||||
|
|
||||||
|
# docs
|
||||||
|
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
|
||||||
|
version: 2
|
||||||
|
updates:
|
||||||
|
- package-ecosystem: "cargo"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
||||||
|
ignore:
|
||||||
|
- dependency-name: "*"
|
||||||
|
update-types: ["version-update:semver-patch"]
|
||||||
|
- package-ecosystem: "github-actions"
|
||||||
|
directory: "/"
|
||||||
|
schedule:
|
||||||
|
interval: "weekly"
|
71
.github/workflows/ci.yml
vendored
71
.github/workflows/ci.yml
vendored
@ -15,8 +15,22 @@ jobs:
|
|||||||
# builds to link against a too-new-for-many-Linux-installs glibc version. Consider
|
# builds to link against a too-new-for-many-Linux-installs glibc version. Consider
|
||||||
# revisiting this when 20.04 is closer to EOL (April 2025)
|
# revisiting this when 20.04 is closer to EOL (April 2025)
|
||||||
platform: [windows-latest, macos-latest, ubuntu-20.04]
|
platform: [windows-latest, macos-latest, ubuntu-20.04]
|
||||||
|
style: [default, dataframe]
|
||||||
rust:
|
rust:
|
||||||
- stable
|
- stable
|
||||||
|
include:
|
||||||
|
- style: default
|
||||||
|
flags: ""
|
||||||
|
- style: dataframe
|
||||||
|
flags: "--features=dataframe "
|
||||||
|
exclude:
|
||||||
|
# only test dataframes on Ubuntu (the fastest platform)
|
||||||
|
- platform: windows-latest
|
||||||
|
style: dataframe
|
||||||
|
- platform: macos-latest
|
||||||
|
style: dataframe
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.platform }}
|
runs-on: ${{ matrix.platform }}
|
||||||
env:
|
env:
|
||||||
@ -26,13 +40,13 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Setup Rust toolchain and cache
|
- name: Setup Rust toolchain and cache
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.3.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
|
||||||
- name: cargo fmt
|
- name: cargo fmt
|
||||||
run: cargo fmt --all -- --check
|
run: cargo fmt --all -- --check
|
||||||
|
|
||||||
- name: Clippy
|
- name: Clippy
|
||||||
run: cargo clippy --workspace --exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
run: cargo clippy --workspace ${{ matrix.flags }}--exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
||||||
|
|
||||||
nu-tests:
|
nu-tests:
|
||||||
env:
|
env:
|
||||||
@ -63,7 +77,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Setup Rust toolchain and cache
|
- name: Setup Rust toolchain and cache
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.3.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
|
||||||
- name: Tests
|
- name: Tests
|
||||||
run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.flags }}
|
run: cargo test --workspace --profile ci --exclude nu_plugin_* ${{ matrix.flags }}
|
||||||
@ -87,7 +101,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Setup Rust toolchain and cache
|
- name: Setup Rust toolchain and cache
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.3.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
|
||||||
- name: Install Nushell
|
- name: Install Nushell
|
||||||
run: cargo install --locked --path=. --profile ci --no-default-features
|
run: cargo install --locked --path=. --profile ci --no-default-features
|
||||||
@ -99,12 +113,18 @@ jobs:
|
|||||||
|
|
||||||
- run: python -m pip install tox
|
- run: python -m pip install tox
|
||||||
|
|
||||||
|
# Get only the latest tagged version for stability reasons
|
||||||
- name: Install virtualenv
|
- name: Install virtualenv
|
||||||
run: git clone https://github.com/pypa/virtualenv.git
|
run: git clone https://github.com/pypa/virtualenv.git && cd virtualenv && git checkout $(git describe --tags | cut -d - -f 1)
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
- name: Test Nushell in virtualenv
|
- name: Test Nushell in virtualenv
|
||||||
run: cd virtualenv && tox -e ${{ matrix.py }} -- -k nushell
|
run: |
|
||||||
|
cd virtualenv
|
||||||
|
# We need to disable failing on coverage levels.
|
||||||
|
nu -c "open pyproject.toml | upsert tool.coverage.report.fail_under 1 | save patchproject.toml"
|
||||||
|
mv patchproject.toml pyproject.toml
|
||||||
|
tox -e ${{ matrix.py }} -- -k nushell
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
# Build+test plugins on their own, without the rest of Nu. This helps with CI parallelization and
|
# Build+test plugins on their own, without the rest of Nu. This helps with CI parallelization and
|
||||||
@ -126,10 +146,47 @@ jobs:
|
|||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Setup Rust toolchain and cache
|
- name: Setup Rust toolchain and cache
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.3.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
|
||||||
- name: Clippy
|
- name: Clippy
|
||||||
run: cargo clippy --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
run: cargo clippy --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
||||||
|
|
||||||
- name: Tests
|
- name: Tests
|
||||||
run: cargo test --profile ci --package nu_plugin_*
|
run: cargo test --profile ci --package nu_plugin_*
|
||||||
|
|
||||||
|
|
||||||
|
nu-coverage:
|
||||||
|
needs: nu-tests
|
||||||
|
env:
|
||||||
|
NUSHELL_CARGO_TARGET: ci
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: true
|
||||||
|
matrix:
|
||||||
|
platform: [windows-latest, ubuntu-20.04]
|
||||||
|
rust:
|
||||||
|
- stable
|
||||||
|
|
||||||
|
runs-on: ${{ matrix.platform }}
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Setup Rust toolchain and cache
|
||||||
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
- name: Install cargo-llvm-cov
|
||||||
|
uses: taiki-e/install-action@cargo-llvm-cov
|
||||||
|
|
||||||
|
- name: Tests
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
source <(cargo llvm-cov show-env --export-prefix) # Set the environment variables needed to get coverage.
|
||||||
|
cargo llvm-cov clean --workspace # Remove artifacts that may affect the coverage results.
|
||||||
|
cargo build --lib --bins --examples --workspace --profile ci
|
||||||
|
cargo test --lib --bins --examples --workspace --profile ci --exclude nu_plugin_* ${{ matrix.flags }}
|
||||||
|
cargo llvm-cov report --profile ci --lcov --output-path lcov.info
|
||||||
|
|
||||||
|
- name: Upload coverage reports to Codecov with GitHub Action
|
||||||
|
uses: codecov/codecov-action@v3
|
||||||
|
with:
|
||||||
|
files: lcov.info
|
||||||
|
19
.github/workflows/release-pkg.nu
vendored
19
.github/workflows/release-pkg.nu
vendored
@ -7,18 +7,29 @@
|
|||||||
# 1. https://github.com/volks73/cargo-wix
|
# 1. https://github.com/volks73/cargo-wix
|
||||||
|
|
||||||
# Added 2022-11-29 when Windows packaging wouldn't work
|
# Added 2022-11-29 when Windows packaging wouldn't work
|
||||||
# because softprops/action-gh-release was broken
|
|
||||||
# To run this manual for windows
|
# To run this manual for windows
|
||||||
|
# unset CARGO_TARGET_DIR if set
|
||||||
|
# hide-env CARGO_TARGET_DIR
|
||||||
# let-env TARGET = 'x86_64-pc-windows-msvc'
|
# let-env TARGET = 'x86_64-pc-windows-msvc'
|
||||||
# let-env TARGET_RUSTFLAGS = ''
|
# let-env TARGET_RUSTFLAGS = ''
|
||||||
# let-env GITHUB_WORKSPACE = 'C:\Users\dschroeder\source\repos\forks\nushell'
|
# let-env GITHUB_WORKSPACE = 'C:\Users\dschroeder\source\repos\forks\nushell'
|
||||||
|
# let-env GITHUB_OUTPUT = 'C:\Users\dschroeder\source\repos\forks\nushell\output\out.txt'
|
||||||
|
# let-env OS = 'windows-latest'
|
||||||
|
# You need to run this twice. The first pass makes the output folder and builds everything
|
||||||
|
# The second pass generates the msi file
|
||||||
# Pass 1 let-env _EXTRA_ = 'bin'
|
# Pass 1 let-env _EXTRA_ = 'bin'
|
||||||
# Pass 2 let-env _EXTRA_ = 'msi'
|
# Pass 2 let-env _EXTRA_ = 'msi'
|
||||||
# make sure 7z.exe is in your path https://www.7-zip.org/download.html
|
# make sure 7z.exe is in your path https://www.7-zip.org/download.html
|
||||||
|
# let-env Path = ($env.Path | append 'c:\apps\7-zip')
|
||||||
# make sure aria2c.exe is in your path https://github.com/aria2/aria2
|
# make sure aria2c.exe is in your path https://github.com/aria2/aria2
|
||||||
|
# let-env Path = ($env.Path | append 'c:\path\to\aria2c')
|
||||||
# make sure you have the wixtools installed https://wixtoolset.org/
|
# make sure you have the wixtools installed https://wixtoolset.org/
|
||||||
# set os below like this because it's what github's runner is named
|
# let-env Path = ($env.Path | append 'C:\Users\dschroeder\AppData\Local\tauri\WixTools')
|
||||||
# let os = 'windows-latest'
|
# After msi is generated, if you have to update winget-pkgs repo, you'll need to patch the release
|
||||||
|
# by deleting the existing msi and uploading this new msi. Then you'll need to update the hash
|
||||||
|
# on the winget-pkgs PR. To generate the hash, run this command
|
||||||
|
# open target\wix\nu-0.74.0-x86_64-pc-windows-msvc.msi | hash sha256
|
||||||
|
# Then, just take the output and put it in the winget-pkgs PR for the hash on the msi
|
||||||
|
|
||||||
|
|
||||||
# The main binary file to be released
|
# The main binary file to be released
|
||||||
@ -145,7 +156,7 @@ if $os in [$USE_UBUNTU, 'macos-latest'] {
|
|||||||
cd $src; hr-line
|
cd $src; hr-line
|
||||||
# Wix need the binaries be stored in target/release/
|
# Wix need the binaries be stored in target/release/
|
||||||
cp -r $'($dist)/*' target/release/
|
cp -r $'($dist)/*' target/release/
|
||||||
cargo install cargo-wix --version 0.3.3
|
cargo install cargo-wix --version 0.3.4
|
||||||
cargo wix --no-build --nocapture --package nu --output $wixRelease
|
cargo wix --no-build --nocapture --package nu --output $wixRelease
|
||||||
print $'archive: ---> ($wixRelease)';
|
print $'archive: ---> ($wixRelease)';
|
||||||
echo $"archive=($wixRelease)" | save --append $env.GITHUB_OUTPUT
|
echo $"archive=($wixRelease)" | save --append $env.GITHUB_OUTPUT
|
||||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -70,7 +70,7 @@ jobs:
|
|||||||
echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
|
echo "targets = ['${{matrix.target}}']" >> rust-toolchain.toml
|
||||||
|
|
||||||
- name: Setup Rust toolchain and cache
|
- name: Setup Rust toolchain and cache
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.3.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.2
|
||||||
|
|
||||||
- name: Setup Nushell
|
- name: Setup Nushell
|
||||||
uses: hustcer/setup-nu@v3
|
uses: hustcer/setup-nu@v3
|
||||||
|
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
|||||||
stale:
|
stale:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/stale@v3
|
- uses: actions/stale@v6
|
||||||
with:
|
with:
|
||||||
#debug-only: true
|
#debug-only: true
|
||||||
ascending: true
|
ascending: true
|
||||||
|
13
.github/workflows/typos.yml
vendored
Normal file
13
.github/workflows/typos.yml
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
name: Typos
|
||||||
|
on: [pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
run:
|
||||||
|
name: Spell Check with Typos
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout Actions Repository
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
|
- name: Check spelling
|
||||||
|
uses: crate-ci/typos@master
|
12
.typos.toml
Normal file
12
.typos.toml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
[files]
|
||||||
|
extend-exclude = ["crates/nu-command/tests/commands/table.rs", "*.tsv", "*.json", "*.txt"]
|
||||||
|
|
||||||
|
[default.extend-words]
|
||||||
|
# Ignore false-positives
|
||||||
|
nd = "nd"
|
||||||
|
fo = "fo"
|
||||||
|
ons = "ons"
|
||||||
|
ba = "ba"
|
||||||
|
Plasticos = "Plasticos"
|
||||||
|
IIF = "IIF"
|
||||||
|
numer = "numer"
|
881
Cargo.lock
generated
881
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
73
Cargo.toml
73
Cargo.toml
@ -3,14 +3,14 @@ authors = ["The Nushell Project Developers"]
|
|||||||
default-run = "nu"
|
default-run = "nu"
|
||||||
description = "A new type of shell"
|
description = "A new type of shell"
|
||||||
documentation = "https://www.nushell.sh/book/"
|
documentation = "https://www.nushell.sh/book/"
|
||||||
edition = "2018"
|
edition = "2021"
|
||||||
exclude = ["images"]
|
exclude = ["images"]
|
||||||
homepage = "https://www.nushell.sh"
|
homepage = "https://www.nushell.sh"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "nu"
|
name = "nu"
|
||||||
repository = "https://github.com/nushell/nushell"
|
repository = "https://github.com/nushell/nushell"
|
||||||
rust-version = "1.60"
|
rust-version = "1.60"
|
||||||
version = "0.73.0"
|
version = "0.76.0"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
@ -35,6 +35,7 @@ members = [
|
|||||||
"crates/nu_plugin_example",
|
"crates/nu_plugin_example",
|
||||||
"crates/nu_plugin_query",
|
"crates/nu_plugin_query",
|
||||||
"crates/nu_plugin_custom_values",
|
"crates/nu_plugin_custom_values",
|
||||||
|
"crates/nu_plugin_formats",
|
||||||
"crates/nu-utils",
|
"crates/nu-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -43,25 +44,26 @@ chrono = { version = "0.4.23", features = ["serde"] }
|
|||||||
crossterm = "0.24.0"
|
crossterm = "0.24.0"
|
||||||
ctrlc = "3.2.1"
|
ctrlc = "3.2.1"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
miette = { version = "5.1.0", features = ["fancy-no-backtrace"] }
|
miette = { version = "5.5.0", features = ["fancy-no-backtrace"] }
|
||||||
nu-ansi-term = "0.46.0"
|
nu-ansi-term = "0.46.0"
|
||||||
nu-cli = { path="./crates/nu-cli", version = "0.73.0" }
|
nu-cli = { path = "./crates/nu-cli", version = "0.76.0" }
|
||||||
nu-color-config = { path = "./crates/nu-color-config", version = "0.73.0" }
|
nu-color-config = { path = "./crates/nu-color-config", version = "0.76.0" }
|
||||||
nu-command = { path="./crates/nu-command", version = "0.73.0" }
|
nu-command = { path = "./crates/nu-command", version = "0.76.0" }
|
||||||
nu-engine = { path="./crates/nu-engine", version = "0.73.0" }
|
nu-engine = { path = "./crates/nu-engine", version = "0.76.0" }
|
||||||
nu-json = { path="./crates/nu-json", version = "0.73.0" }
|
nu-json = { path = "./crates/nu-json", version = "0.76.0" }
|
||||||
nu-parser = { path="./crates/nu-parser", version = "0.73.0" }
|
nu-parser = { path = "./crates/nu-parser", version = "0.76.0" }
|
||||||
nu-path = { path="./crates/nu-path", version = "0.73.0" }
|
nu-path = { path = "./crates/nu-path", version = "0.76.0" }
|
||||||
nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.73.0" }
|
nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.76.0" }
|
||||||
nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.73.0" }
|
nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.76.0" }
|
||||||
nu-protocol = { path = "./crates/nu-protocol", version = "0.73.0" }
|
nu-protocol = { path = "./crates/nu-protocol", version = "0.76.0" }
|
||||||
nu-system = { path = "./crates/nu-system", version = "0.73.0" }
|
nu-system = { path = "./crates/nu-system", version = "0.76.0" }
|
||||||
nu-table = { path = "./crates/nu-table", version = "0.73.0" }
|
nu-table = { path = "./crates/nu-table", version = "0.76.0" }
|
||||||
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.73.0" }
|
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.76.0" }
|
||||||
nu-utils = { path = "./crates/nu-utils", version = "0.73.0" }
|
nu-utils = { path = "./crates/nu-utils", version = "0.76.0" }
|
||||||
reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
|
|
||||||
|
|
||||||
rayon = "1.5.1"
|
reedline = { version = "0.16.0", features = ["bashisms", "sqlite"] }
|
||||||
|
|
||||||
|
rayon = "1.6.1"
|
||||||
is_executable = "1.0.1"
|
is_executable = "1.0.1"
|
||||||
simplelog = "0.12.0"
|
simplelog = "0.12.0"
|
||||||
time = "0.3.12"
|
time = "0.3.12"
|
||||||
@ -76,21 +78,34 @@ signal-hook = { version = "0.3.14", default-features = false }
|
|||||||
winres = "0.1"
|
winres = "0.1"
|
||||||
|
|
||||||
[target.'cfg(target_family = "unix")'.dependencies]
|
[target.'cfg(target_family = "unix")'.dependencies]
|
||||||
nix = { version = "0.25", default-features = false, features = ["signal", "process", "fs", "term"]}
|
nix = { version = "0.25", default-features = false, features = [
|
||||||
|
"signal",
|
||||||
|
"process",
|
||||||
|
"fs",
|
||||||
|
"term",
|
||||||
|
] }
|
||||||
atty = "0.2"
|
atty = "0.2"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
nu-test-support = { path="./crates/nu-test-support", version = "0.73.0" }
|
nu-test-support = { path = "./crates/nu-test-support", version = "0.76.0" }
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
assert_cmd = "2.0.2"
|
assert_cmd = "2.0.2"
|
||||||
|
criterion = "0.4"
|
||||||
pretty_assertions = "1.0.0"
|
pretty_assertions = "1.0.0"
|
||||||
serial_test = "0.8.0"
|
serial_test = "1.0.0"
|
||||||
hamcrest2 = "0.3.0"
|
hamcrest2 = "0.3.0"
|
||||||
rstest = {version = "0.15.0", default-features = false}
|
rstest = { version = "0.16.0", default-features = false }
|
||||||
itertools = "0.10.3"
|
itertools = "0.10.3"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
plugin = ["nu-plugin", "nu-cli/plugin", "nu-parser/plugin", "nu-command/plugin", "nu-protocol/plugin", "nu-engine/plugin"]
|
plugin = [
|
||||||
|
"nu-plugin",
|
||||||
|
"nu-cli/plugin",
|
||||||
|
"nu-parser/plugin",
|
||||||
|
"nu-command/plugin",
|
||||||
|
"nu-protocol/plugin",
|
||||||
|
"nu-engine/plugin",
|
||||||
|
]
|
||||||
# extra used to be more useful but now it's the same as default. Leaving it in for backcompat with existing build scripts
|
# extra used to be more useful but now it's the same as default. Leaving it in for backcompat with existing build scripts
|
||||||
extra = ["default"]
|
extra = ["default"]
|
||||||
default = ["plugin", "which-support", "trash-support", "sqlite"]
|
default = ["plugin", "which-support", "trash-support", "sqlite"]
|
||||||
@ -113,7 +128,7 @@ dataframe = ["nu-command/dataframe"]
|
|||||||
sqlite = ["nu-command/sqlite"]
|
sqlite = ["nu-command/sqlite"]
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
opt-level = "s" # Optimize for size
|
opt-level = "s" # Optimize for size
|
||||||
strip = "debuginfo"
|
strip = "debuginfo"
|
||||||
lto = "thin"
|
lto = "thin"
|
||||||
|
|
||||||
@ -135,8 +150,16 @@ debug = false
|
|||||||
[[bin]]
|
[[bin]]
|
||||||
name = "nu"
|
name = "nu"
|
||||||
path = "src/main.rs"
|
path = "src/main.rs"
|
||||||
|
bench = false
|
||||||
|
|
||||||
# To use a development version of a dependency please use a global override here
|
# To use a development version of a dependency please use a global override here
|
||||||
# changing versions in each sub-crate of the workspace is tedious
|
# changing versions in each sub-crate of the workspace is tedious
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" }
|
# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" }
|
||||||
|
|
||||||
|
# Criterion benchmarking setup
|
||||||
|
# Run all benchmarks with `cargo bench`
|
||||||
|
# Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
|
||||||
|
[[bench]]
|
||||||
|
name = "benchmarks"
|
||||||
|
harness = false
|
||||||
|
9
Cross.toml
Normal file
9
Cross.toml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# Configuration for cross-rs: https://github.com/cross-rs/cross
|
||||||
|
# Run cross-rs like this:
|
||||||
|
# cross build --target aarch64-unknown-linux-musl --release
|
||||||
|
|
||||||
|
[target.aarch64-unknown-linux-gnu]
|
||||||
|
dockerfile = "./docker/cross-rs/aarch64-unknown-linux-gnu.dockerfile"
|
||||||
|
|
||||||
|
[target.aarch64-unknown-linux-musl]
|
||||||
|
dockerfile = "./docker/cross-rs/aarch64-unknown-linux-musl.dockerfile"
|
@ -6,6 +6,7 @@
|
|||||||
[](https://twitter.com/nu_shell)
|
[](https://twitter.com/nu_shell)
|
||||||

|

|
||||||

|

|
||||||
|
[](https://codecov.io/github/nushell/nushell)
|
||||||
|
|
||||||
A new type of shell.
|
A new type of shell.
|
||||||
|
|
||||||
@ -32,7 +33,7 @@ This project has reached a minimum-viable-product level of quality. Many people
|
|||||||
|
|
||||||
## Learning About Nu
|
## Learning About Nu
|
||||||
|
|
||||||
The [Nushell book](https://www.nushell.sh/book/) is the primary source of Nushell documentation. You can find [a full list of Nu commands in the book](https://www.nushell.sh/book/command_reference.html), and we have many examples of using Nu in our [cookbook](https://www.nushell.sh/cookbook/).
|
The [Nushell book](https://www.nushell.sh/book/) is the primary source of Nushell documentation. You can find [a full list of Nu commands in the book](https://www.nushell.sh/commands/), and we have many examples of using Nu in our [cookbook](https://www.nushell.sh/cookbook/).
|
||||||
|
|
||||||
We're also active on [Discord](https://discord.gg/NtAbbGn) and [Twitter](https://twitter.com/nu_shell); come and chat with us!
|
We're also active on [Discord](https://discord.gg/NtAbbGn) and [Twitter](https://twitter.com/nu_shell); come and chat with us!
|
||||||
|
|
||||||
@ -47,7 +48,7 @@ brew install nushell
|
|||||||
winget install nushell
|
winget install nushell
|
||||||
```
|
```
|
||||||
|
|
||||||
To use `Nu` in Github Action, check [setup-nu](https://github.com/marketplace/actions/setup-nu) for more detail.
|
To use `Nu` in GitHub Action, check [setup-nu](https://github.com/marketplace/actions/setup-nu) for more detail.
|
||||||
|
|
||||||
Detailed installation instructions can be found in the [installation chapter of the book](https://www.nushell.sh/book/installation.html). Nu is available via many package managers:
|
Detailed installation instructions can be found in the [installation chapter of the book](https://www.nushell.sh/book/installation.html). Nu is available via many package managers:
|
||||||
|
|
||||||
@ -174,6 +175,8 @@ These binaries interact with nu via a simple JSON-RPC protocol where the command
|
|||||||
If the plugin is a filter, data streams to it one element at a time, and it can stream data back in return via stdin/stdout.
|
If the plugin is a filter, data streams to it one element at a time, and it can stream data back in return via stdin/stdout.
|
||||||
If the plugin is a sink, it is given the full vector of final data and is given free reign over stdin/stdout to use as it pleases.
|
If the plugin is a sink, it is given the full vector of final data and is given free reign over stdin/stdout to use as it pleases.
|
||||||
|
|
||||||
|
The [awesome-nu repo](https://github.com/nushell/awesome-nu#plugins) lists a variety of nu-plugins.
|
||||||
|
|
||||||
## Goals
|
## Goals
|
||||||
|
|
||||||
Nu adheres closely to a set of goals that make up its design philosophy. As features are added, they are checked against these goals.
|
Nu adheres closely to a set of goals that make up its design philosophy. As features are added, they are checked against these goals.
|
||||||
|
7
benches/README.md
Normal file
7
benches/README.md
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# Criterion benchmarks
|
||||||
|
|
||||||
|
These are benchmarks using [Criterion](https://github.com/bheisler/criterion.rs), a microbenchmarking tool for Rust.
|
||||||
|
|
||||||
|
Run all benchmarks with `cargo bench`
|
||||||
|
|
||||||
|
Or run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
|
191
benches/benchmarks.rs
Normal file
191
benches/benchmarks.rs
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
use criterion::{criterion_group, criterion_main, BatchSize, Criterion};
|
||||||
|
use nu_cli::eval_source;
|
||||||
|
use nu_parser::parse;
|
||||||
|
use nu_plugin::{EncodingType, PluginResponse};
|
||||||
|
use nu_protocol::{PipelineData, Span, Value};
|
||||||
|
use nu_utils::{get_default_config, get_default_env};
|
||||||
|
|
||||||
|
// FIXME: All benchmarks live in this 1 file to speed up build times when benchmarking.
|
||||||
|
// When the *_benchmarks functions were in different files, `cargo bench` would build
|
||||||
|
// an executable for every single one - incredibly slowly. Would be nice to figure out
|
||||||
|
// a way to split things up again.
|
||||||
|
|
||||||
|
fn parser_benchmarks(c: &mut Criterion) {
|
||||||
|
let mut engine_state = nu_command::create_default_context();
|
||||||
|
// parsing config.nu breaks without PWD set
|
||||||
|
engine_state.add_env_var(
|
||||||
|
"PWD".into(),
|
||||||
|
Value::string("/some/dir".to_string(), Span::test_data()),
|
||||||
|
);
|
||||||
|
|
||||||
|
let default_env = get_default_env().as_bytes();
|
||||||
|
c.bench_function("parse_default_env_file", |b| {
|
||||||
|
b.iter_batched(
|
||||||
|
|| nu_protocol::engine::StateWorkingSet::new(&engine_state),
|
||||||
|
|mut working_set| parse(&mut working_set, None, default_env, false, &[]),
|
||||||
|
BatchSize::SmallInput,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
|
let default_config = get_default_config().as_bytes();
|
||||||
|
c.bench_function("parse_default_config_file", |b| {
|
||||||
|
b.iter_batched(
|
||||||
|
|| nu_protocol::engine::StateWorkingSet::new(&engine_state),
|
||||||
|
|mut working_set| parse(&mut working_set, None, default_config, false, &[]),
|
||||||
|
BatchSize::SmallInput,
|
||||||
|
)
|
||||||
|
});
|
||||||
|
|
||||||
|
c.bench_function("eval default_env.nu", |b| {
|
||||||
|
b.iter(|| {
|
||||||
|
let mut engine_state = nu_command::create_default_context();
|
||||||
|
let mut stack = nu_protocol::engine::Stack::new();
|
||||||
|
eval_source(
|
||||||
|
&mut engine_state,
|
||||||
|
&mut stack,
|
||||||
|
get_default_env().as_bytes(),
|
||||||
|
"default_env.nu",
|
||||||
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
c.bench_function("eval default_config.nu", |b| {
|
||||||
|
b.iter(|| {
|
||||||
|
let mut engine_state = nu_command::create_default_context();
|
||||||
|
// parsing config.nu breaks without PWD set
|
||||||
|
engine_state.add_env_var(
|
||||||
|
"PWD".into(),
|
||||||
|
Value::string("/some/dir".to_string(), Span::test_data()),
|
||||||
|
);
|
||||||
|
let mut stack = nu_protocol::engine::Stack::new();
|
||||||
|
eval_source(
|
||||||
|
&mut engine_state,
|
||||||
|
&mut stack,
|
||||||
|
get_default_config().as_bytes(),
|
||||||
|
"default_config.nu",
|
||||||
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
fn eval_benchmarks(c: &mut Criterion) {
|
||||||
|
c.bench_function("eval default_env.nu", |b| {
|
||||||
|
b.iter(|| {
|
||||||
|
let mut engine_state = nu_command::create_default_context();
|
||||||
|
let mut stack = nu_protocol::engine::Stack::new();
|
||||||
|
eval_source(
|
||||||
|
&mut engine_state,
|
||||||
|
&mut stack,
|
||||||
|
get_default_env().as_bytes(),
|
||||||
|
"default_env.nu",
|
||||||
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
c.bench_function("eval default_config.nu", |b| {
|
||||||
|
b.iter(|| {
|
||||||
|
let mut engine_state = nu_command::create_default_context();
|
||||||
|
// parsing config.nu breaks without PWD set
|
||||||
|
engine_state.add_env_var(
|
||||||
|
"PWD".into(),
|
||||||
|
Value::string("/some/dir".to_string(), Span::test_data()),
|
||||||
|
);
|
||||||
|
let mut stack = nu_protocol::engine::Stack::new();
|
||||||
|
eval_source(
|
||||||
|
&mut engine_state,
|
||||||
|
&mut stack,
|
||||||
|
get_default_config().as_bytes(),
|
||||||
|
"default_config.nu",
|
||||||
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// generate a new table data with `row_cnt` rows, `col_cnt` columns.
|
||||||
|
fn encoding_test_data(row_cnt: usize, col_cnt: usize) -> Value {
|
||||||
|
let columns: Vec<String> = (0..col_cnt).map(|x| format!("col_{x}")).collect();
|
||||||
|
let vals: Vec<Value> = (0..col_cnt as i64).map(Value::test_int).collect();
|
||||||
|
|
||||||
|
Value::List {
|
||||||
|
vals: (0..row_cnt)
|
||||||
|
.map(|_| Value::test_record(columns.clone(), vals.clone()))
|
||||||
|
.collect(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn encoding_benchmarks(c: &mut Criterion) {
|
||||||
|
let mut group = c.benchmark_group("Encoding");
|
||||||
|
let test_cnt_pairs = [
|
||||||
|
(100, 5),
|
||||||
|
(100, 10),
|
||||||
|
(100, 15),
|
||||||
|
(1000, 5),
|
||||||
|
(1000, 10),
|
||||||
|
(1000, 15),
|
||||||
|
(10000, 5),
|
||||||
|
(10000, 10),
|
||||||
|
(10000, 15),
|
||||||
|
];
|
||||||
|
for (row_cnt, col_cnt) in test_cnt_pairs.into_iter() {
|
||||||
|
for fmt in ["json", "msgpack"] {
|
||||||
|
group.bench_function(&format!("{fmt} encode {row_cnt} * {col_cnt}"), |b| {
|
||||||
|
let mut res = vec![];
|
||||||
|
let test_data =
|
||||||
|
PluginResponse::Value(Box::new(encoding_test_data(row_cnt, col_cnt)));
|
||||||
|
let encoder = EncodingType::try_from_bytes(fmt.as_bytes()).unwrap();
|
||||||
|
b.iter(|| encoder.encode_response(&test_data, &mut res))
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
group.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn decoding_benchmarks(c: &mut Criterion) {
|
||||||
|
let mut group = c.benchmark_group("Decoding");
|
||||||
|
let test_cnt_pairs = [
|
||||||
|
(100, 5),
|
||||||
|
(100, 10),
|
||||||
|
(100, 15),
|
||||||
|
(1000, 5),
|
||||||
|
(1000, 10),
|
||||||
|
(1000, 15),
|
||||||
|
(10000, 5),
|
||||||
|
(10000, 10),
|
||||||
|
(10000, 15),
|
||||||
|
];
|
||||||
|
for (row_cnt, col_cnt) in test_cnt_pairs.into_iter() {
|
||||||
|
for fmt in ["json", "msgpack"] {
|
||||||
|
group.bench_function(&format!("{fmt} decode for {row_cnt} * {col_cnt}"), |b| {
|
||||||
|
let mut res = vec![];
|
||||||
|
let test_data =
|
||||||
|
PluginResponse::Value(Box::new(encoding_test_data(row_cnt, col_cnt)));
|
||||||
|
let encoder = EncodingType::try_from_bytes(fmt.as_bytes()).unwrap();
|
||||||
|
encoder.encode_response(&test_data, &mut res).unwrap();
|
||||||
|
let mut binary_data = std::io::Cursor::new(res);
|
||||||
|
b.iter(|| {
|
||||||
|
binary_data.set_position(0);
|
||||||
|
encoder.decode_response(&mut binary_data)
|
||||||
|
})
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
group.finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
criterion_group!(
|
||||||
|
benches,
|
||||||
|
parser_benchmarks,
|
||||||
|
eval_benchmarks,
|
||||||
|
encoding_benchmarks,
|
||||||
|
decoding_benchmarks
|
||||||
|
);
|
||||||
|
criterion_main!(benches);
|
@ -5,7 +5,7 @@
|
|||||||
@echo.
|
@echo.
|
||||||
|
|
||||||
echo Building nushell.exe
|
echo Building nushell.exe
|
||||||
cargo build cargo build --features=dataframe
|
cargo build --features=dataframe
|
||||||
@echo.
|
@echo.
|
||||||
|
|
||||||
@cd crates\nu_plugin_example
|
@cd crates\nu_plugin_example
|
||||||
|
@ -12,6 +12,7 @@ let plugins = [
|
|||||||
nu_plugin_query,
|
nu_plugin_query,
|
||||||
nu_plugin_example,
|
nu_plugin_example,
|
||||||
nu_plugin_custom_values,
|
nu_plugin_custom_values,
|
||||||
|
nu_plugin_formats,
|
||||||
]
|
]
|
||||||
|
|
||||||
for plugin in $plugins {
|
for plugin in $plugins {
|
||||||
|
17
codecov.yml
Normal file
17
codecov.yml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
coverage:
|
||||||
|
status:
|
||||||
|
project:
|
||||||
|
default:
|
||||||
|
target: 55%
|
||||||
|
threshold: 2%
|
||||||
|
patch:
|
||||||
|
default:
|
||||||
|
informational: true
|
||||||
|
|
||||||
|
comment:
|
||||||
|
layout: reach, diff, files
|
||||||
|
behavior: default
|
||||||
|
require_base: yes
|
||||||
|
require_head: yes
|
||||||
|
after_n_builds: 2
|
||||||
|
|
54
coverage-local.nu
Executable file
54
coverage-local.nu
Executable file
@ -0,0 +1,54 @@
|
|||||||
|
#!/usr/bin/env nu
|
||||||
|
|
||||||
|
let start = (date now)
|
||||||
|
# Script to generate coverage locally
|
||||||
|
#
|
||||||
|
# Output: `lcov.info` file
|
||||||
|
#
|
||||||
|
# Relies on `cargo-llvm-cov`. Install via `cargo install cargo-llvm-cov`
|
||||||
|
# https://github.com/taiki-e/cargo-llvm-cov
|
||||||
|
|
||||||
|
# You probably have to run `cargo llvm-cov clean` once manually,
|
||||||
|
# as you have to confirm to install additional tooling for your rustup toolchain.
|
||||||
|
# Else the script might stall waiting for your `y<ENTER>`
|
||||||
|
|
||||||
|
# Some of the internal tests rely on the exact cargo profile
|
||||||
|
# (This is somewhat criminal itself)
|
||||||
|
# but we have to signal to the tests that we use the `ci` `--profile`
|
||||||
|
let-env NUSHELL_CARGO_TARGET = "ci"
|
||||||
|
|
||||||
|
# Manual gathering of coverage to catch invocation of the `nu` binary.
|
||||||
|
# This is relevant for tests using the `nu!` macro from `nu-test-support`
|
||||||
|
# see: https://github.com/taiki-e/cargo-llvm-cov#get-coverage-of-external-tests
|
||||||
|
|
||||||
|
print "Setting up environment variables for coverage"
|
||||||
|
# Enable LLVM coverage tracking through environment variables
|
||||||
|
# show env outputs .ini/.toml style description of the variables
|
||||||
|
# In order to use from toml, we need to make sure our string literals are single quoted
|
||||||
|
# This is especially important when running on Windows since "C:\blah" is treated as an escape
|
||||||
|
cargo llvm-cov show-env | str replace (char dq) (char sq) -a | from toml | load-env
|
||||||
|
|
||||||
|
print "Cleaning up coverage data"
|
||||||
|
cargo llvm-cov clean --workspace
|
||||||
|
|
||||||
|
print "Building with workspace and profile=ci"
|
||||||
|
# Apparently we need to explicitly build the necessary parts
|
||||||
|
# using the `--profile=ci` is basically `debug` build with unnecessary symbols stripped
|
||||||
|
# leads to smaller binaries and potential savings when compiling and running
|
||||||
|
cargo build --workspace --profile=ci
|
||||||
|
|
||||||
|
print "Running tests with --workspace and profile=ci"
|
||||||
|
cargo test --workspace --profile=ci
|
||||||
|
|
||||||
|
# You need to provide the used profile to find the raw data
|
||||||
|
print "Generating coverage report as lcov.info"
|
||||||
|
cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
|
||||||
|
|
||||||
|
let end = (date now)
|
||||||
|
$"Coverage generation took ($end - $start)."
|
||||||
|
|
||||||
|
# To display the coverage in your editor see:
|
||||||
|
#
|
||||||
|
# - https://marketplace.visualstudio.com/items?itemName=ryanluker.vscode-coverage-gutters
|
||||||
|
# - https://github.com/umaumax/vim-lcov
|
||||||
|
# - https://github.com/andythigpen/nvim-coverage (probably needs some additional config)
|
38
coverage-local.sh
Executable file
38
coverage-local.sh
Executable file
@ -0,0 +1,38 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Script to generate coverage locally
|
||||||
|
#
|
||||||
|
# Output: `lcov.info` file
|
||||||
|
#
|
||||||
|
# Relies on `cargo-llvm-cov`. Install via `cargo install cargo-llvm-cov`
|
||||||
|
# https://github.com/taiki-e/cargo-llvm-cov
|
||||||
|
|
||||||
|
# You probably have to run `cargo llvm-cov clean` once manually,
|
||||||
|
# as you have to confirm to install additional tooling for your rustup toolchain.
|
||||||
|
# Else the script might stall waiting for your `y<ENTER>`
|
||||||
|
|
||||||
|
# Some of the internal tests rely on the exact cargo profile
|
||||||
|
# (This is somewhat criminal itself)
|
||||||
|
# but we have to signal to the tests that we use the `ci` `--profile`
|
||||||
|
export NUSHELL_CARGO_TARGET=ci
|
||||||
|
|
||||||
|
# Manual gathering of coverage to catch invocation of the `nu` binary.
|
||||||
|
# This is relevant for tests using the `nu!` macro from `nu-test-support`
|
||||||
|
# see: https://github.com/taiki-e/cargo-llvm-cov#get-coverage-of-external-tests
|
||||||
|
|
||||||
|
# Enable LLVM coverage tracking through environment variables
|
||||||
|
source <(cargo llvm-cov show-env --export-prefix)
|
||||||
|
cargo llvm-cov clean --workspace
|
||||||
|
# Apparently we need to explicitly build the necessary parts
|
||||||
|
# using the `--profile=ci` is basically `debug` build with unnecessary symbols stripped
|
||||||
|
# leads to smaller binaries and potential savings when compiling and running
|
||||||
|
cargo build --workspace --profile=ci
|
||||||
|
cargo test --workspace --profile=ci
|
||||||
|
# You need to provide the used profile to find the raw data
|
||||||
|
cargo llvm-cov report --lcov --output-path lcov.info --profile=ci
|
||||||
|
|
||||||
|
# To display the coverage in your editor see:
|
||||||
|
#
|
||||||
|
# - https://marketplace.visualstudio.com/items?itemName=ryanluker.vscode-coverage-gutters
|
||||||
|
# - https://github.com/umaumax/vim-lcov
|
||||||
|
# - https://github.com/andythigpen/nvim-coverage (probably needs some additional config)
|
@ -5,34 +5,38 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-cli"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "nu-cli"
|
name = "nu-cli"
|
||||||
version = "0.73.0"
|
version = "0.76.0"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
bench = false
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
nu-test-support = { path="../nu-test-support", version = "0.73.0" }
|
nu-test-support = { path = "../nu-test-support", version = "0.76.0" }
|
||||||
nu-command = { path = "../nu-command", version = "0.73.0" }
|
nu-command = { path = "../nu-command", version = "0.76.0" }
|
||||||
rstest = {version = "0.15.0", default-features = false}
|
rstest = { version = "0.16.0", default-features = false }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
nu-engine = { path = "../nu-engine", version = "0.73.0" }
|
nu-engine = { path = "../nu-engine", version = "0.76.0" }
|
||||||
nu-path = { path = "../nu-path", version = "0.73.0" }
|
nu-path = { path = "../nu-path", version = "0.76.0" }
|
||||||
nu-parser = { path = "../nu-parser", version = "0.73.0" }
|
nu-parser = { path = "../nu-parser", version = "0.76.0" }
|
||||||
nu-protocol = { path = "../nu-protocol", version = "0.73.0" }
|
nu-protocol = { path = "../nu-protocol", version = "0.76.0" }
|
||||||
nu-utils = { path = "../nu-utils", version = "0.73.0" }
|
nu-utils = { path = "../nu-utils", version = "0.76.0" }
|
||||||
nu-ansi-term = "0.46.0"
|
nu-ansi-term = "0.46.0"
|
||||||
nu-color-config = { path = "../nu-color-config", version = "0.73.0" }
|
nu-color-config = { path = "../nu-color-config", version = "0.76.0" }
|
||||||
reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
|
|
||||||
|
reedline = { version = "0.16.0", features = ["bashisms", "sqlite"] }
|
||||||
|
|
||||||
atty = "0.2.14"
|
atty = "0.2.14"
|
||||||
chrono = { default-features = false, features = ["std"], version = "0.4.23" }
|
chrono = { default-features = false, features = ["std"], version = "0.4.23" }
|
||||||
crossterm = "0.24.0"
|
crossterm = "0.24.0"
|
||||||
fancy-regex = "0.10.0"
|
fancy-regex = "0.11.0"
|
||||||
fuzzy-matcher = "0.3.7"
|
fuzzy-matcher = "0.3.7"
|
||||||
is_executable = "1.0.1"
|
is_executable = "1.0.1"
|
||||||
once_cell = "1.16.0"
|
once_cell = "1.17.0"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
miette = { version = "5.1.0", features = ["fancy-no-backtrace"] }
|
miette = { version = "5.5.0", features = ["fancy-no-backtrace"] }
|
||||||
percent-encoding = "2"
|
percent-encoding = "2"
|
||||||
sysinfo = "0.26.2"
|
sysinfo = "0.28.0"
|
||||||
thiserror = "1.0.31"
|
thiserror = "1.0.31"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
@ -37,7 +37,8 @@ impl CommandCompletion {
|
|||||||
) -> Vec<String> {
|
) -> Vec<String> {
|
||||||
let mut executables = vec![];
|
let mut executables = vec![];
|
||||||
|
|
||||||
let paths = self.engine_state.get_env_var("PATH");
|
// os agnostic way to get the PATH env var
|
||||||
|
let paths = self.engine_state.get_path_env_var();
|
||||||
|
|
||||||
if let Some(paths) = paths {
|
if let Some(paths) = paths {
|
||||||
if let Ok(paths) = paths.as_list() {
|
if let Ok(paths) = paths.as_list() {
|
||||||
|
@ -104,7 +104,7 @@ impl NuCompleter {
|
|||||||
return Some(result);
|
return Some(result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(err) => println!("failed to eval completer block: {}", err),
|
Err(err) => println!("failed to eval completer block: {err}"),
|
||||||
}
|
}
|
||||||
|
|
||||||
None
|
None
|
||||||
@ -128,7 +128,8 @@ impl NuCompleter {
|
|||||||
PipelineElement::Expression(_, expr)
|
PipelineElement::Expression(_, expr)
|
||||||
| PipelineElement::Redirection(_, _, expr)
|
| PipelineElement::Redirection(_, _, expr)
|
||||||
| PipelineElement::And(_, expr)
|
| PipelineElement::And(_, expr)
|
||||||
| PipelineElement::Or(_, expr) => {
|
| PipelineElement::Or(_, expr)
|
||||||
|
| PipelineElement::SeparateRedirection { out: (_, expr), .. } => {
|
||||||
let flattened: Vec<_> = flatten_expression(&working_set, &expr);
|
let flattened: Vec<_> = flatten_expression(&working_set, &expr);
|
||||||
let span_offset: usize = alias_offset.iter().sum();
|
let span_offset: usize = alias_offset.iter().sum();
|
||||||
let mut spans: Vec<String> = vec![];
|
let mut spans: Vec<String> = vec![];
|
||||||
|
@ -66,6 +66,7 @@ impl Completer for CustomCompletion {
|
|||||||
],
|
],
|
||||||
redirect_stdout: true,
|
redirect_stdout: true,
|
||||||
redirect_stderr: true,
|
redirect_stderr: true,
|
||||||
|
parser_info: vec![],
|
||||||
},
|
},
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
);
|
);
|
||||||
@ -73,8 +74,8 @@ impl Completer for CustomCompletion {
|
|||||||
let mut custom_completion_options = None;
|
let mut custom_completion_options = None;
|
||||||
|
|
||||||
// Parse result
|
// Parse result
|
||||||
let suggestions = match result {
|
let suggestions = result
|
||||||
Ok(pd) => {
|
.map(|pd| {
|
||||||
let value = pd.into_value(span);
|
let value = pd.into_value(span);
|
||||||
match &value {
|
match &value {
|
||||||
Value::Record { .. } => {
|
Value::Record { .. } => {
|
||||||
@ -131,9 +132,8 @@ impl Completer for CustomCompletion {
|
|||||||
Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
|
Value::List { vals, .. } => map_value_completions(vals.iter(), span, offset),
|
||||||
_ => vec![],
|
_ => vec![],
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
_ => vec![],
|
.unwrap_or_default();
|
||||||
};
|
|
||||||
|
|
||||||
if let Some(custom_completion_options) = custom_completion_options {
|
if let Some(custom_completion_options) = custom_completion_options {
|
||||||
filter(&prefix, suggestions, &custom_completion_options)
|
filter(&prefix, suggestions, &custom_completion_options)
|
||||||
|
@ -33,14 +33,7 @@ impl Completer for DirectoryCompletion {
|
|||||||
_: usize,
|
_: usize,
|
||||||
options: &CompletionOptions,
|
options: &CompletionOptions,
|
||||||
) -> Vec<Suggestion> {
|
) -> Vec<Suggestion> {
|
||||||
let cwd = if let Some(d) = self.engine_state.get_env_var("PWD") {
|
let cwd = self.engine_state.current_work_dir();
|
||||||
match d.as_string() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(_) => "".to_string(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"".to_string()
|
|
||||||
};
|
|
||||||
let partial = String::from_utf8_lossy(&prefix).to_string();
|
let partial = String::from_utf8_lossy(&prefix).to_string();
|
||||||
|
|
||||||
// Filter only the folders
|
// Filter only the folders
|
||||||
@ -126,7 +119,7 @@ pub fn directory_completion(
|
|||||||
let mut file_name = entry.file_name().to_string_lossy().into_owned();
|
let mut file_name = entry.file_name().to_string_lossy().into_owned();
|
||||||
if matches(&partial, &file_name, options) {
|
if matches(&partial, &file_name, options) {
|
||||||
let mut path = if prepend_base_dir(original_input, &base_dir_name) {
|
let mut path = if prepend_base_dir(original_input, &base_dir_name) {
|
||||||
format!("{}{}", base_dir_name, file_name)
|
format!("{base_dir_name}{file_name}")
|
||||||
} else {
|
} else {
|
||||||
file_name.to_string()
|
file_name.to_string()
|
||||||
};
|
};
|
||||||
@ -142,7 +135,7 @@ pub fn directory_completion(
|
|||||||
|| path.contains(' ')
|
|| path.contains(' ')
|
||||||
|| path.contains('#')
|
|| path.contains('#')
|
||||||
{
|
{
|
||||||
path = format!("`{}`", path);
|
path = format!("`{path}`");
|
||||||
}
|
}
|
||||||
|
|
||||||
Some((span, path))
|
Some((span, path))
|
||||||
|
@ -58,7 +58,7 @@ impl Completer for DotNuCompletion {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// Check if the base_dir is a folder
|
// Check if the base_dir is a folder
|
||||||
if base_dir != format!(".{}", SEP) {
|
if base_dir != format!(".{SEP}") {
|
||||||
// Add the base dir into the directories to be searched
|
// Add the base dir into the directories to be searched
|
||||||
search_dirs.push(base_dir.clone());
|
search_dirs.push(base_dir.clone());
|
||||||
|
|
||||||
@ -70,14 +70,7 @@ impl Completer for DotNuCompletion {
|
|||||||
partial = base_dir_partial;
|
partial = base_dir_partial;
|
||||||
} else {
|
} else {
|
||||||
// Fetch the current folder
|
// Fetch the current folder
|
||||||
let current_folder = if let Some(d) = self.engine_state.get_env_var("PWD") {
|
let current_folder = self.engine_state.current_work_dir();
|
||||||
match d.as_string() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(_) => "".to_string(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"".to_string()
|
|
||||||
};
|
|
||||||
is_current_folder = true;
|
is_current_folder = true;
|
||||||
|
|
||||||
// Add the current folder and the lib dirs into the
|
// Add the current folder and the lib dirs into the
|
||||||
|
@ -30,14 +30,7 @@ impl Completer for FileCompletion {
|
|||||||
_: usize,
|
_: usize,
|
||||||
options: &CompletionOptions,
|
options: &CompletionOptions,
|
||||||
) -> Vec<Suggestion> {
|
) -> Vec<Suggestion> {
|
||||||
let cwd = if let Some(d) = self.engine_state.get_env_var("PWD") {
|
let cwd = self.engine_state.current_work_dir();
|
||||||
match d.as_string() {
|
|
||||||
Ok(s) => s,
|
|
||||||
Err(_) => "".to_string(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
"".to_string()
|
|
||||||
};
|
|
||||||
let prefix = String::from_utf8_lossy(&prefix).to_string();
|
let prefix = String::from_utf8_lossy(&prefix).to_string();
|
||||||
let output: Vec<_> = file_path_completion(span, &prefix, &cwd, options)
|
let output: Vec<_> = file_path_completion(span, &prefix, &cwd, options)
|
||||||
.into_iter()
|
.into_iter()
|
||||||
@ -131,7 +124,7 @@ pub fn file_path_completion(
|
|||||||
let mut file_name = entry.file_name().to_string_lossy().into_owned();
|
let mut file_name = entry.file_name().to_string_lossy().into_owned();
|
||||||
if matches(&partial, &file_name, options) {
|
if matches(&partial, &file_name, options) {
|
||||||
let mut path = if prepend_base_dir(original_input, &base_dir_name) {
|
let mut path = if prepend_base_dir(original_input, &base_dir_name) {
|
||||||
format!("{}{}", base_dir_name, file_name)
|
format!("{base_dir_name}{file_name}")
|
||||||
} else {
|
} else {
|
||||||
file_name.to_string()
|
file_name.to_string()
|
||||||
};
|
};
|
||||||
@ -146,8 +139,20 @@ pub fn file_path_completion(
|
|||||||
|| path.contains('"')
|
|| path.contains('"')
|
||||||
|| path.contains(' ')
|
|| path.contains(' ')
|
||||||
|| path.contains('#')
|
|| path.contains('#')
|
||||||
|
|| path.contains('(')
|
||||||
|
|| path.contains(')')
|
||||||
|
|| path.starts_with('0')
|
||||||
|
|| path.starts_with('1')
|
||||||
|
|| path.starts_with('2')
|
||||||
|
|| path.starts_with('3')
|
||||||
|
|| path.starts_with('4')
|
||||||
|
|| path.starts_with('5')
|
||||||
|
|| path.starts_with('6')
|
||||||
|
|| path.starts_with('7')
|
||||||
|
|| path.starts_with('8')
|
||||||
|
|| path.starts_with('9')
|
||||||
{
|
{
|
||||||
path = format!("`{}`", path);
|
path = format!("`{path}`");
|
||||||
}
|
}
|
||||||
|
|
||||||
Some((span, path))
|
Some((span, path))
|
||||||
@ -175,7 +180,7 @@ pub fn matches(partial: &str, from: &str, options: &CompletionOptions) -> bool {
|
|||||||
|
|
||||||
/// Returns whether the base_dir should be prepended to the file path
|
/// Returns whether the base_dir should be prepended to the file path
|
||||||
pub fn prepend_base_dir(input: &str, base_dir: &str) -> bool {
|
pub fn prepend_base_dir(input: &str, base_dir: &str) -> bool {
|
||||||
if base_dir == format!(".{}", SEP) {
|
if base_dir == format!(".{SEP}") {
|
||||||
// if the current base_dir path is the local folder we only add a "./" prefix if the user
|
// if the current base_dir path is the local folder we only add a "./" prefix if the user
|
||||||
// input already includes a local folder prefix.
|
// input already includes a local folder prefix.
|
||||||
let manually_entered = {
|
let manually_entered = {
|
||||||
|
@ -9,6 +9,8 @@ use reedline::Suggestion;
|
|||||||
use std::str;
|
use std::str;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
use super::MatchAlgorithm;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct VariableCompletion {
|
pub struct VariableCompletion {
|
||||||
engine_state: Arc<EngineState>, // TODO: Is engine state necessary? It's already a part of working set in fetch()
|
engine_state: Arc<EngineState>, // TODO: Is engine state necessary? It's already a part of working set in fetch()
|
||||||
@ -73,10 +75,11 @@ impl Completer for VariableCompletion {
|
|||||||
for suggestion in
|
for suggestion in
|
||||||
nested_suggestions(val.clone(), nested_levels, current_span)
|
nested_suggestions(val.clone(), nested_levels, current_span)
|
||||||
{
|
{
|
||||||
if options
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
.match_algorithm
|
options.case_sensitive,
|
||||||
.matches_u8(suggestion.value.as_bytes(), &prefix)
|
suggestion.value.as_bytes(),
|
||||||
{
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(suggestion);
|
output.push(suggestion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -86,10 +89,11 @@ impl Completer for VariableCompletion {
|
|||||||
} else {
|
} else {
|
||||||
// No nesting provided, return all env vars
|
// No nesting provided, return all env vars
|
||||||
for env_var in env_vars {
|
for env_var in env_vars {
|
||||||
if options
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
.match_algorithm
|
options.case_sensitive,
|
||||||
.matches_u8(env_var.0.as_bytes(), &prefix)
|
env_var.0.as_bytes(),
|
||||||
{
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(Suggestion {
|
output.push(Suggestion {
|
||||||
value: env_var.0,
|
value: env_var.0,
|
||||||
description: None,
|
description: None,
|
||||||
@ -116,10 +120,11 @@ impl Completer for VariableCompletion {
|
|||||||
for suggestion in
|
for suggestion in
|
||||||
nested_suggestions(nuval, self.var_context.1.clone(), current_span)
|
nested_suggestions(nuval, self.var_context.1.clone(), current_span)
|
||||||
{
|
{
|
||||||
if options
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
.match_algorithm
|
options.case_sensitive,
|
||||||
.matches_u8(suggestion.value.as_bytes(), &prefix)
|
suggestion.value.as_bytes(),
|
||||||
{
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(suggestion);
|
output.push(suggestion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -138,10 +143,11 @@ impl Completer for VariableCompletion {
|
|||||||
for suggestion in
|
for suggestion in
|
||||||
nested_suggestions(value, self.var_context.1.clone(), current_span)
|
nested_suggestions(value, self.var_context.1.clone(), current_span)
|
||||||
{
|
{
|
||||||
if options
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
.match_algorithm
|
options.case_sensitive,
|
||||||
.matches_u8(suggestion.value.as_bytes(), &prefix)
|
suggestion.value.as_bytes(),
|
||||||
{
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(suggestion);
|
output.push(suggestion);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,10 +159,11 @@ impl Completer for VariableCompletion {
|
|||||||
|
|
||||||
// Variable completion (e.g: $en<tab> to complete $env)
|
// Variable completion (e.g: $en<tab> to complete $env)
|
||||||
for builtin in builtins {
|
for builtin in builtins {
|
||||||
if options
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
.match_algorithm
|
options.case_sensitive,
|
||||||
.matches_u8(builtin.as_bytes(), &prefix)
|
builtin.as_bytes(),
|
||||||
{
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(Suggestion {
|
output.push(Suggestion {
|
||||||
value: builtin.to_string(),
|
value: builtin.to_string(),
|
||||||
description: None,
|
description: None,
|
||||||
@ -178,7 +185,11 @@ impl Completer for VariableCompletion {
|
|||||||
.rev()
|
.rev()
|
||||||
{
|
{
|
||||||
for v in &overlay_frame.vars {
|
for v in &overlay_frame.vars {
|
||||||
if options.match_algorithm.matches_u8(v.0, &prefix) {
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
|
options.case_sensitive,
|
||||||
|
v.0,
|
||||||
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(Suggestion {
|
output.push(Suggestion {
|
||||||
value: String::from_utf8_lossy(v.0).to_string(),
|
value: String::from_utf8_lossy(v.0).to_string(),
|
||||||
description: None,
|
description: None,
|
||||||
@ -200,7 +211,11 @@ impl Completer for VariableCompletion {
|
|||||||
.rev()
|
.rev()
|
||||||
{
|
{
|
||||||
for v in &overlay_frame.vars {
|
for v in &overlay_frame.vars {
|
||||||
if options.match_algorithm.matches_u8(v.0, &prefix) {
|
if options.match_algorithm.matches_u8_insensitive(
|
||||||
|
options.case_sensitive,
|
||||||
|
v.0,
|
||||||
|
&prefix,
|
||||||
|
) {
|
||||||
output.push(Suggestion {
|
output.push(Suggestion {
|
||||||
value: String::from_utf8_lossy(v.0).to_string(),
|
value: String::from_utf8_lossy(v.0).to_string(),
|
||||||
description: None,
|
description: None,
|
||||||
@ -247,6 +262,20 @@ fn nested_suggestions(
|
|||||||
|
|
||||||
output
|
output
|
||||||
}
|
}
|
||||||
|
Value::LazyRecord { val, .. } => {
|
||||||
|
// Add all the columns as completion
|
||||||
|
for column_name in val.column_names() {
|
||||||
|
output.push(Suggestion {
|
||||||
|
value: column_name.to_string(),
|
||||||
|
description: None,
|
||||||
|
extra: None,
|
||||||
|
span: current_span,
|
||||||
|
append_whitespace: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
output
|
||||||
|
}
|
||||||
|
|
||||||
_ => output,
|
_ => output,
|
||||||
}
|
}
|
||||||
@ -281,3 +310,13 @@ fn recursive_value(val: Value, sublevels: Vec<Vec<u8>>) -> Value {
|
|||||||
|
|
||||||
val
|
val
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl MatchAlgorithm {
|
||||||
|
pub fn matches_u8_insensitive(&self, sensitive: bool, haystack: &[u8], needle: &[u8]) -> bool {
|
||||||
|
if sensitive {
|
||||||
|
self.matches_u8(haystack, needle)
|
||||||
|
} else {
|
||||||
|
self.matches_u8(&haystack.to_ascii_lowercase(), &needle.to_ascii_lowercase())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
use crate::util::{eval_source, report_error};
|
use crate::util::{eval_source, report_error};
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
use log::info;
|
|
||||||
#[cfg(feature = "plugin")]
|
|
||||||
use nu_parser::ParseError;
|
use nu_parser::ParseError;
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
use nu_path::canonicalize_with;
|
use nu_path::canonicalize_with;
|
||||||
@ -9,6 +7,8 @@ use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
|
|||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
use nu_protocol::Spanned;
|
use nu_protocol::Spanned;
|
||||||
use nu_protocol::{HistoryFileFormat, PipelineData};
|
use nu_protocol::{HistoryFileFormat, PipelineData};
|
||||||
|
#[cfg(feature = "plugin")]
|
||||||
|
use nu_utils::utils::perf;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
@ -24,6 +24,8 @@ pub fn read_plugin_file(
|
|||||||
plugin_file: Option<Spanned<String>>,
|
plugin_file: Option<Spanned<String>>,
|
||||||
storage_path: &str,
|
storage_path: &str,
|
||||||
) {
|
) {
|
||||||
|
let start_time = std::time::Instant::now();
|
||||||
|
let mut plug_path = String::new();
|
||||||
// Reading signatures from signature file
|
// Reading signatures from signature file
|
||||||
// The plugin.nu file stores the parsed signature collected from each registered plugin
|
// The plugin.nu file stores the parsed signature collected from each registered plugin
|
||||||
add_plugin_file(engine_state, plugin_file, storage_path);
|
add_plugin_file(engine_state, plugin_file, storage_path);
|
||||||
@ -31,7 +33,7 @@ pub fn read_plugin_file(
|
|||||||
let plugin_path = engine_state.plugin_signatures.clone();
|
let plugin_path = engine_state.plugin_signatures.clone();
|
||||||
if let Some(plugin_path) = plugin_path {
|
if let Some(plugin_path) = plugin_path {
|
||||||
let plugin_filename = plugin_path.to_string_lossy();
|
let plugin_filename = plugin_path.to_string_lossy();
|
||||||
|
plug_path = plugin_filename.to_string();
|
||||||
if let Ok(contents) = std::fs::read(&plugin_path) {
|
if let Ok(contents) = std::fs::read(&plugin_path) {
|
||||||
eval_source(
|
eval_source(
|
||||||
engine_state,
|
engine_state,
|
||||||
@ -39,11 +41,19 @@ pub fn read_plugin_file(
|
|||||||
&contents,
|
&contents,
|
||||||
&plugin_filename,
|
&plugin_filename,
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
info!("read_plugin_file {}:{}:{}", file!(), line!(), column!());
|
perf(
|
||||||
|
&format!("read_plugin_file {}", &plug_path),
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
engine_state.get_config().use_ansi_coloring,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "plugin")]
|
#[cfg(feature = "plugin")]
|
||||||
@ -56,12 +66,11 @@ pub fn add_plugin_file(
|
|||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
let cwd = working_set.get_cwd();
|
let cwd = working_set.get_cwd();
|
||||||
|
|
||||||
match canonicalize_with(&plugin_file.item, cwd) {
|
if let Ok(path) = canonicalize_with(&plugin_file.item, cwd) {
|
||||||
Ok(path) => engine_state.plugin_signatures = Some(path),
|
engine_state.plugin_signatures = Some(path)
|
||||||
Err(_) => {
|
} else {
|
||||||
let e = ParseError::FileNotFound(plugin_file.item, plugin_file.span);
|
let e = ParseError::FileNotFound(plugin_file.item, plugin_file.span);
|
||||||
report_error(&working_set, &e);
|
report_error(&working_set, &e);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if let Some(mut plugin_path) = nu_path::config_dir() {
|
} else if let Some(mut plugin_path) = nu_path::config_dir() {
|
||||||
// Path to store plugins signatures
|
// Path to store plugins signatures
|
||||||
@ -86,6 +95,7 @@ pub fn eval_config_contents(
|
|||||||
&contents,
|
&contents,
|
||||||
&config_filename,
|
&config_filename,
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Merge the environment in case env vars changed in the config
|
// Merge the environment in case env vars changed in the config
|
||||||
|
@ -29,44 +29,36 @@ pub fn evaluate_file(
|
|||||||
|
|
||||||
let cwd = current_dir(engine_state, stack)?;
|
let cwd = current_dir(engine_state, stack)?;
|
||||||
|
|
||||||
let file_path = {
|
let file_path = canonicalize_with(&path, cwd).unwrap_or_else(|e| {
|
||||||
match canonicalize_with(&path, &cwd) {
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
Ok(p) => p,
|
report_error(
|
||||||
Err(e) => {
|
&working_set,
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
&ShellError::FileNotFoundCustom(
|
||||||
report_error(
|
format!("Could not access file '{}': {:?}", path, e.to_string()),
|
||||||
&working_set,
|
Span::unknown(),
|
||||||
&ShellError::FileNotFoundCustom(
|
),
|
||||||
format!("Could not access file '{}': {:?}", path, e.to_string()),
|
);
|
||||||
Span::unknown(),
|
std::process::exit(1);
|
||||||
),
|
});
|
||||||
);
|
|
||||||
std::process::exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let file_path_str = match file_path.to_str() {
|
let file_path_str = file_path.to_str().unwrap_or_else(|| {
|
||||||
Some(s) => s,
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
None => {
|
report_error(
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
&working_set,
|
||||||
report_error(
|
&ShellError::NonUtf8Custom(
|
||||||
&working_set,
|
format!(
|
||||||
&ShellError::NonUtf8Custom(
|
"Input file name '{}' is not valid UTF8",
|
||||||
format!(
|
file_path.to_string_lossy()
|
||||||
"Input file name '{}' is not valid UTF8",
|
|
||||||
file_path.to_string_lossy()
|
|
||||||
),
|
|
||||||
Span::unknown(),
|
|
||||||
),
|
),
|
||||||
);
|
Span::unknown(),
|
||||||
std::process::exit(1);
|
),
|
||||||
}
|
);
|
||||||
};
|
std::process::exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
let file = match std::fs::read(&file_path).into_diagnostic() {
|
let file = std::fs::read(&file_path)
|
||||||
Ok(p) => p,
|
.into_diagnostic()
|
||||||
Err(e) => {
|
.unwrap_or_else(|e| {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(
|
report_error(
|
||||||
&working_set,
|
&working_set,
|
||||||
@ -80,13 +72,21 @@ pub fn evaluate_file(
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
});
|
||||||
};
|
|
||||||
|
|
||||||
engine_state.start_in_file(Some(file_path_str));
|
engine_state.start_in_file(Some(file_path_str));
|
||||||
|
|
||||||
let mut parent = file_path.clone();
|
let parent = file_path.parent().unwrap_or_else(|| {
|
||||||
parent.pop();
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
report_error(
|
||||||
|
&working_set,
|
||||||
|
&ShellError::FileNotFoundCustom(
|
||||||
|
format!("The file path '{file_path_str}' does not have a parent"),
|
||||||
|
Span::unknown(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
std::process::exit(1);
|
||||||
|
});
|
||||||
|
|
||||||
stack.add_env_var(
|
stack.add_env_var(
|
||||||
"FILE_PWD".to_string(),
|
"FILE_PWD".to_string(),
|
||||||
@ -106,13 +106,21 @@ pub fn evaluate_file(
|
|||||||
&file,
|
&file,
|
||||||
file_path_str,
|
file_path_str,
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
|
true,
|
||||||
) {
|
) {
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
if !eval_source(engine_state, stack, args.as_bytes(), "<commandline>", input) {
|
if !eval_source(
|
||||||
|
engine_state,
|
||||||
|
stack,
|
||||||
|
args.as_bytes(),
|
||||||
|
"<commandline>",
|
||||||
|
input,
|
||||||
|
true,
|
||||||
|
) {
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
} else if !eval_source(engine_state, stack, &file, file_path_str, input) {
|
} else if !eval_source(engine_state, stack, &file, file_path_str, input, true) {
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,7 +129,7 @@ pub fn evaluate_file(
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn print_table_or_error(
|
pub(crate) fn print_table_or_error(
|
||||||
engine_state: &mut EngineState,
|
engine_state: &mut EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
mut pipeline_data: PipelineData,
|
mut pipeline_data: PipelineData,
|
||||||
@ -137,43 +145,36 @@ pub fn print_table_or_error(
|
|||||||
|
|
||||||
if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data {
|
if let PipelineData::Value(Value::Error { error }, ..) = &pipeline_data {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
|
||||||
report_error(&working_set, error);
|
report_error(&working_set, error);
|
||||||
|
|
||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
match engine_state.find_decl("table".as_bytes(), &[]) {
|
if let Some(decl_id) = engine_state.find_decl("table".as_bytes(), &[]) {
|
||||||
Some(decl_id) => {
|
let command = engine_state.get_decl(decl_id);
|
||||||
let command = engine_state.get_decl(decl_id);
|
if command.get_block_id().is_some() {
|
||||||
if command.get_block_id().is_some() {
|
print_or_exit(pipeline_data, engine_state, config);
|
||||||
print_or_exit(pipeline_data, engine_state, config);
|
} else {
|
||||||
} else {
|
let table = command.run(
|
||||||
let table = command.run(
|
engine_state,
|
||||||
engine_state,
|
stack,
|
||||||
stack,
|
&Call::new(Span::new(0, 0)),
|
||||||
&Call::new(Span::new(0, 0)),
|
pipeline_data,
|
||||||
pipeline_data,
|
);
|
||||||
);
|
|
||||||
|
|
||||||
match table {
|
match table {
|
||||||
Ok(table) => {
|
Ok(table) => {
|
||||||
print_or_exit(table, engine_state, config);
|
print_or_exit(table, engine_state, config);
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
|
report_error(&working_set, &error);
|
||||||
report_error(&working_set, &error);
|
std::process::exit(1);
|
||||||
|
|
||||||
std::process::exit(1);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => {
|
} else {
|
||||||
print_or_exit(pipeline_data, engine_state, config);
|
print_or_exit(pipeline_data, engine_state, config);
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
// Make sure everything has finished
|
// Make sure everything has finished
|
||||||
if let Some(exit_code) = exit_code {
|
if let Some(exit_code) = exit_code {
|
||||||
@ -199,9 +200,7 @@ fn print_or_exit(pipeline_data: PipelineData, engine_state: &mut EngineState, co
|
|||||||
std::process::exit(1);
|
std::process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut out = item.into_string("\n", config);
|
let out = item.into_string("\n", config) + "\n";
|
||||||
out.push('\n');
|
let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{err}"));
|
||||||
|
|
||||||
let _ = stdout_write_all_and_flush(out).map_err(|err| eprintln!("{}", err));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -411,10 +411,10 @@ impl DescriptionMenu {
|
|||||||
RESET
|
RESET
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
format!(" {}\r\n", example)
|
format!(" {example}\r\n")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
format!(" {}\r\n", example)
|
format!(" {example}\r\n")
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect();
|
.collect();
|
||||||
@ -429,7 +429,7 @@ impl DescriptionMenu {
|
|||||||
examples,
|
examples,
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
format!("\r\n\r\nExamples:\r\n{}", examples,)
|
format!("\r\n\r\nExamples:\r\n{examples}",)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -81,13 +81,10 @@ fn convert_to_suggestions(
|
|||||||
) -> Vec<Suggestion> {
|
) -> Vec<Suggestion> {
|
||||||
match value {
|
match value {
|
||||||
Value::Record { .. } => {
|
Value::Record { .. } => {
|
||||||
let text = match value
|
let text = value
|
||||||
.get_data_by_key("value")
|
.get_data_by_key("value")
|
||||||
.and_then(|val| val.as_string().ok())
|
.and_then(|val| val.as_string().ok())
|
||||||
{
|
.unwrap_or_else(|| "No value key".to_string());
|
||||||
Some(val) => val,
|
|
||||||
None => "No value key".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let description = value
|
let description = value
|
||||||
.get_data_by_key("description")
|
.get_data_by_key("description")
|
||||||
@ -157,7 +154,7 @@ fn convert_to_suggestions(
|
|||||||
.flat_map(|val| convert_to_suggestions(val, line, pos, only_buffer_difference))
|
.flat_map(|val| convert_to_suggestions(val, line, pos, only_buffer_difference))
|
||||||
.collect(),
|
.collect(),
|
||||||
_ => vec![Suggestion {
|
_ => vec![Suggestion {
|
||||||
value: format!("Not a record: {:?}", value),
|
value: format!("Not a record: {value:?}"),
|
||||||
description: None,
|
description: None,
|
||||||
extra: None,
|
extra: None,
|
||||||
span: reedline::Span {
|
span: reedline::Span {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Value};
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Type, Value};
|
||||||
use reedline::Highlighter;
|
use reedline::Highlighter;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -12,7 +12,9 @@ impl Command for NuHighlight {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("nu-highlight").category(Category::Strings)
|
Signature::build("nu-highlight")
|
||||||
|
.category(Category::Strings)
|
||||||
|
.input_output_types(vec![(Type::String, Type::String)])
|
||||||
}
|
}
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
fn usage(&self) -> &str {
|
||||||
@ -33,7 +35,7 @@ impl Command for NuHighlight {
|
|||||||
let head = call.head;
|
let head = call.head;
|
||||||
|
|
||||||
let ctrlc = engine_state.ctrlc.clone();
|
let ctrlc = engine_state.ctrlc.clone();
|
||||||
let engine_state = engine_state.clone();
|
let engine_state = std::sync::Arc::new(engine_state.clone());
|
||||||
let config = engine_state.get_config().clone();
|
let config = engine_state.get_config().clone();
|
||||||
|
|
||||||
let highlighter = crate::NuHighlighter {
|
let highlighter = crate::NuHighlighter {
|
||||||
|
@ -2,7 +2,8 @@ use nu_engine::CallExt;
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Value,
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type,
|
||||||
|
Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -15,6 +16,7 @@ impl Command for Print {
|
|||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("print")
|
Signature::build("print")
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
||||||
.rest("rest", SyntaxShape::Any, "the values to print")
|
.rest("rest", SyntaxShape::Any, "the values to print")
|
||||||
.switch(
|
.switch(
|
||||||
"no-newline",
|
"no-newline",
|
||||||
|
@ -91,7 +91,7 @@ impl NushellPrompt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn default_wrapped_custom_string(&self, str: String) -> String {
|
fn default_wrapped_custom_string(&self, str: String) -> String {
|
||||||
format!("({})", str)
|
format!("({str})")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ impl Prompt for NushellPrompt {
|
|||||||
if let Some(prompt_string) = &self.left_prompt_string {
|
if let Some(prompt_string) = &self.left_prompt_string {
|
||||||
prompt_string.replace('\n', "\r\n").into()
|
prompt_string.replace('\n', "\r\n").into()
|
||||||
} else {
|
} else {
|
||||||
let default = DefaultPrompt::new();
|
let default = DefaultPrompt::default();
|
||||||
default
|
default
|
||||||
.render_prompt_left()
|
.render_prompt_left()
|
||||||
.to_string()
|
.to_string()
|
||||||
@ -118,7 +118,7 @@ impl Prompt for NushellPrompt {
|
|||||||
if let Some(prompt_string) = &self.right_prompt_string {
|
if let Some(prompt_string) = &self.right_prompt_string {
|
||||||
prompt_string.replace('\n', "\r\n").into()
|
prompt_string.replace('\n', "\r\n").into()
|
||||||
} else {
|
} else {
|
||||||
let default = DefaultPrompt::new();
|
let default = DefaultPrompt::default();
|
||||||
default
|
default
|
||||||
.render_prompt_right()
|
.render_prompt_right()
|
||||||
.to_string()
|
.to_string()
|
||||||
@ -130,32 +130,36 @@ impl Prompt for NushellPrompt {
|
|||||||
fn render_prompt_indicator(&self, edit_mode: PromptEditMode) -> Cow<str> {
|
fn render_prompt_indicator(&self, edit_mode: PromptEditMode) -> Cow<str> {
|
||||||
match edit_mode {
|
match edit_mode {
|
||||||
PromptEditMode::Default => match &self.default_prompt_indicator {
|
PromptEditMode::Default => match &self.default_prompt_indicator {
|
||||||
Some(indicator) => indicator.as_str().into(),
|
Some(indicator) => indicator,
|
||||||
None => "〉".into(),
|
None => "〉",
|
||||||
},
|
}
|
||||||
|
.into(),
|
||||||
PromptEditMode::Emacs => match &self.default_prompt_indicator {
|
PromptEditMode::Emacs => match &self.default_prompt_indicator {
|
||||||
Some(indicator) => indicator.as_str().into(),
|
Some(indicator) => indicator,
|
||||||
None => "〉".into(),
|
None => "〉",
|
||||||
},
|
}
|
||||||
|
.into(),
|
||||||
PromptEditMode::Vi(vi_mode) => match vi_mode {
|
PromptEditMode::Vi(vi_mode) => match vi_mode {
|
||||||
PromptViMode::Normal => match &self.default_vi_normal_prompt_indicator {
|
PromptViMode::Normal => match &self.default_vi_normal_prompt_indicator {
|
||||||
Some(indicator) => indicator.as_str().into(),
|
Some(indicator) => indicator,
|
||||||
None => ": ".into(),
|
None => ": ",
|
||||||
},
|
},
|
||||||
PromptViMode::Insert => match &self.default_vi_insert_prompt_indicator {
|
PromptViMode::Insert => match &self.default_vi_insert_prompt_indicator {
|
||||||
Some(indicator) => indicator.as_str().into(),
|
Some(indicator) => indicator,
|
||||||
None => "〉".into(),
|
None => "〉",
|
||||||
},
|
},
|
||||||
},
|
}
|
||||||
|
.into(),
|
||||||
PromptEditMode::Custom(str) => self.default_wrapped_custom_string(str).into(),
|
PromptEditMode::Custom(str) => self.default_wrapped_custom_string(str).into(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_prompt_multiline_indicator(&self) -> Cow<str> {
|
fn render_prompt_multiline_indicator(&self) -> Cow<str> {
|
||||||
match &self.default_multiline_indicator {
|
match &self.default_multiline_indicator {
|
||||||
Some(indicator) => indicator.as_str().into(),
|
Some(indicator) => indicator,
|
||||||
None => "::: ".into(),
|
None => "::: ",
|
||||||
}
|
}
|
||||||
|
.into()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn render_prompt_history_search_indicator(
|
fn render_prompt_history_search_indicator(
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use crate::util::report_error;
|
use crate::util::report_error;
|
||||||
use crate::NushellPrompt;
|
use crate::NushellPrompt;
|
||||||
use log::info;
|
use log::trace;
|
||||||
use nu_engine::eval_subexpression;
|
use nu_engine::eval_subexpression;
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
engine::{EngineState, Stack, StateWorkingSet},
|
engine::{EngineState, Stack, StateWorkingSet},
|
||||||
@ -39,41 +39,37 @@ fn get_prompt_string(
|
|||||||
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
||||||
let ret_val =
|
let ret_val =
|
||||||
eval_subexpression(engine_state, &mut stack, block, PipelineData::empty());
|
eval_subexpression(engine_state, &mut stack, block, PipelineData::empty());
|
||||||
info!(
|
trace!(
|
||||||
"get_prompt_string (block) {}:{}:{}",
|
"get_prompt_string (block) {}:{}:{}",
|
||||||
file!(),
|
file!(),
|
||||||
line!(),
|
line!(),
|
||||||
column!()
|
column!()
|
||||||
);
|
);
|
||||||
|
|
||||||
match ret_val {
|
ret_val
|
||||||
Ok(ret_val) => Some(ret_val),
|
.map_err(|err| {
|
||||||
Err(err) => {
|
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(&working_set, &err);
|
report_error(&working_set, &err);
|
||||||
None
|
})
|
||||||
}
|
.ok()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Value::Block { val: block_id, .. } => {
|
Value::Block { val: block_id, .. } => {
|
||||||
let block = engine_state.get_block(block_id);
|
let block = engine_state.get_block(block_id);
|
||||||
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
||||||
let ret_val = eval_subexpression(engine_state, stack, block, PipelineData::empty());
|
let ret_val = eval_subexpression(engine_state, stack, block, PipelineData::empty());
|
||||||
info!(
|
trace!(
|
||||||
"get_prompt_string (block) {}:{}:{}",
|
"get_prompt_string (block) {}:{}:{}",
|
||||||
file!(),
|
file!(),
|
||||||
line!(),
|
line!(),
|
||||||
column!()
|
column!()
|
||||||
);
|
);
|
||||||
|
|
||||||
match ret_val {
|
ret_val
|
||||||
Ok(ret_val) => Some(ret_val),
|
.map_err(|err| {
|
||||||
Err(err) => {
|
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(&working_set, &err);
|
report_error(&working_set, &err);
|
||||||
None
|
})
|
||||||
}
|
.ok()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
|
Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
|
||||||
_ => None,
|
_ => None,
|
||||||
@ -81,20 +77,17 @@ fn get_prompt_string(
|
|||||||
.and_then(|pipeline_data| {
|
.and_then(|pipeline_data| {
|
||||||
let output = pipeline_data.collect_string("", config).ok();
|
let output = pipeline_data.collect_string("", config).ok();
|
||||||
|
|
||||||
match output {
|
output.map(|mut x| {
|
||||||
Some(mut x) => {
|
// Just remove the very last newline.
|
||||||
// Just remove the very last newline.
|
if x.ends_with('\n') {
|
||||||
if x.ends_with('\n') {
|
x.pop();
|
||||||
x.pop();
|
|
||||||
}
|
|
||||||
|
|
||||||
if x.ends_with('\r') {
|
|
||||||
x.pop();
|
|
||||||
}
|
|
||||||
Some(x)
|
|
||||||
}
|
}
|
||||||
None => None,
|
|
||||||
}
|
if x.ends_with('\r') {
|
||||||
|
x.pop();
|
||||||
|
}
|
||||||
|
x
|
||||||
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,12 +104,12 @@ pub(crate) fn update_prompt<'prompt>(
|
|||||||
// Now that we have the prompt string lets ansify it.
|
// Now that we have the prompt string lets ansify it.
|
||||||
// <133 A><prompt><133 B><command><133 C><command output>
|
// <133 A><prompt><133 B><command><133 C><command output>
|
||||||
let left_prompt_string = if config.shell_integration {
|
let left_prompt_string = if config.shell_integration {
|
||||||
match left_prompt_string {
|
if let Some(prompt_string) = left_prompt_string {
|
||||||
Some(prompt_string) => Some(format!(
|
Some(format!(
|
||||||
"{}{}{}",
|
"{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
|
||||||
PRE_PROMPT_MARKER, prompt_string, POST_PROMPT_MARKER
|
))
|
||||||
)),
|
} else {
|
||||||
None => left_prompt_string,
|
left_prompt_string
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
left_prompt_string
|
left_prompt_string
|
||||||
@ -148,7 +141,7 @@ pub(crate) fn update_prompt<'prompt>(
|
|||||||
);
|
);
|
||||||
|
|
||||||
let ret_val = nu_prompt as &dyn Prompt;
|
let ret_val = nu_prompt as &dyn Prompt;
|
||||||
info!("update_prompt {}:{}:{}", file!(), line!(), column!());
|
trace!("update_prompt {}:{}:{}", file!(), line!(), column!());
|
||||||
|
|
||||||
ret_val
|
ret_val
|
||||||
}
|
}
|
||||||
|
@ -7,8 +7,7 @@ use nu_parser::parse;
|
|||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
create_menus,
|
create_menus,
|
||||||
engine::{EngineState, Stack, StateWorkingSet},
|
engine::{EngineState, Stack, StateWorkingSet},
|
||||||
extract_value, Config, IntoPipelineData, ParsedKeybinding, ParsedMenu, PipelineData,
|
extract_value, Config, ParsedKeybinding, ParsedMenu, PipelineData, ShellError, Span, Value,
|
||||||
ShellError, Span, Value,
|
|
||||||
};
|
};
|
||||||
use reedline::{
|
use reedline::{
|
||||||
default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
|
default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
|
||||||
@ -110,7 +109,7 @@ pub(crate) fn add_menus(
|
|||||||
};
|
};
|
||||||
|
|
||||||
let mut temp_stack = Stack::new();
|
let mut temp_stack = Stack::new();
|
||||||
let input = Value::nothing(Span::test_data()).into_pipeline_data();
|
let input = PipelineData::Empty;
|
||||||
let res = eval_block(&engine_state, &mut temp_stack, &block, input, false, false)?;
|
let res = eval_block(&engine_state, &mut temp_stack, &block, input, false, false)?;
|
||||||
|
|
||||||
if let PipelineData::Value(value, None) = res {
|
if let PipelineData::Value(value, None) = res {
|
||||||
@ -652,14 +651,15 @@ fn add_parsed_keybinding(
|
|||||||
let pos1 = char_iter.next();
|
let pos1 = char_iter.next();
|
||||||
let pos2 = char_iter.next();
|
let pos2 = char_iter.next();
|
||||||
|
|
||||||
let char = match (pos1, pos2) {
|
let char = if let (Some(char), None) = (pos1, pos2) {
|
||||||
(Some(char), None) => Ok(char),
|
char
|
||||||
_ => Err(ShellError::UnsupportedConfigValue(
|
} else {
|
||||||
|
return Err(ShellError::UnsupportedConfigValue(
|
||||||
"char_<CHAR: unicode codepoint>".to_string(),
|
"char_<CHAR: unicode codepoint>".to_string(),
|
||||||
c.to_string(),
|
c.to_string(),
|
||||||
keybinding.keycode.span()?,
|
keybinding.keycode.span()?,
|
||||||
)),
|
));
|
||||||
}?;
|
};
|
||||||
|
|
||||||
KeyCode::Char(char)
|
KeyCode::Char(char)
|
||||||
}
|
}
|
||||||
@ -680,10 +680,10 @@ fn add_parsed_keybinding(
|
|||||||
let fn_num: u8 = c[1..]
|
let fn_num: u8 = c[1..]
|
||||||
.parse()
|
.parse()
|
||||||
.ok()
|
.ok()
|
||||||
.filter(|num| matches!(num, 1..=12))
|
.filter(|num| matches!(num, 1..=20))
|
||||||
.ok_or(ShellError::UnsupportedConfigValue(
|
.ok_or(ShellError::UnsupportedConfigValue(
|
||||||
"(f1|f2|...|f12)".to_string(),
|
"(f1|f2|...|f20)".to_string(),
|
||||||
format!("unknown function key: {}", c),
|
format!("unknown function key: {c}"),
|
||||||
keybinding.keycode.span()?,
|
keybinding.keycode.span()?,
|
||||||
))?;
|
))?;
|
||||||
KeyCode::F(fn_num)
|
KeyCode::F(fn_num)
|
||||||
@ -990,7 +990,7 @@ mod test {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_send_event() {
|
fn test_send_event() {
|
||||||
let cols = vec!["send".to_string()];
|
let cols = vec!["send".to_string()];
|
||||||
let vals = vec![Value::string("Enter", Span::test_data())];
|
let vals = vec![Value::test_string("Enter")];
|
||||||
|
|
||||||
let span = Span::test_data();
|
let span = Span::test_data();
|
||||||
let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
|
let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
|
||||||
@ -1010,7 +1010,7 @@ mod test {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_edit_event() {
|
fn test_edit_event() {
|
||||||
let cols = vec!["edit".to_string()];
|
let cols = vec!["edit".to_string()];
|
||||||
let vals = vec![Value::string("Clear", Span::test_data())];
|
let vals = vec![Value::test_string("Clear")];
|
||||||
|
|
||||||
let span = Span::test_data();
|
let span = Span::test_data();
|
||||||
let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
|
let b = EventType::try_from_columns(&cols, &vals, &span).unwrap();
|
||||||
@ -1034,8 +1034,8 @@ mod test {
|
|||||||
fn test_send_menu() {
|
fn test_send_menu() {
|
||||||
let cols = vec!["send".to_string(), "name".to_string()];
|
let cols = vec!["send".to_string(), "name".to_string()];
|
||||||
let vals = vec![
|
let vals = vec![
|
||||||
Value::string("Menu", Span::test_data()),
|
Value::test_string("Menu"),
|
||||||
Value::string("history_menu", Span::test_data()),
|
Value::test_string("history_menu"),
|
||||||
];
|
];
|
||||||
|
|
||||||
let span = Span::test_data();
|
let span = Span::test_data();
|
||||||
@ -1061,8 +1061,8 @@ mod test {
|
|||||||
// Menu event
|
// Menu event
|
||||||
let cols = vec!["send".to_string(), "name".to_string()];
|
let cols = vec!["send".to_string(), "name".to_string()];
|
||||||
let vals = vec![
|
let vals = vec![
|
||||||
Value::string("Menu", Span::test_data()),
|
Value::test_string("Menu"),
|
||||||
Value::string("history_menu", Span::test_data()),
|
Value::test_string("history_menu"),
|
||||||
];
|
];
|
||||||
|
|
||||||
let menu_event = Value::Record {
|
let menu_event = Value::Record {
|
||||||
@ -1073,7 +1073,7 @@ mod test {
|
|||||||
|
|
||||||
// Enter event
|
// Enter event
|
||||||
let cols = vec!["send".to_string()];
|
let cols = vec!["send".to_string()];
|
||||||
let vals = vec![Value::string("Enter", Span::test_data())];
|
let vals = vec![Value::test_string("Enter")];
|
||||||
|
|
||||||
let enter_event = Value::Record {
|
let enter_event = Value::Record {
|
||||||
cols,
|
cols,
|
||||||
@ -1114,8 +1114,8 @@ mod test {
|
|||||||
// Menu event
|
// Menu event
|
||||||
let cols = vec!["send".to_string(), "name".to_string()];
|
let cols = vec!["send".to_string(), "name".to_string()];
|
||||||
let vals = vec![
|
let vals = vec![
|
||||||
Value::string("Menu", Span::test_data()),
|
Value::test_string("Menu"),
|
||||||
Value::string("history_menu", Span::test_data()),
|
Value::test_string("history_menu"),
|
||||||
];
|
];
|
||||||
|
|
||||||
let menu_event = Value::Record {
|
let menu_event = Value::Record {
|
||||||
@ -1126,7 +1126,7 @@ mod test {
|
|||||||
|
|
||||||
// Enter event
|
// Enter event
|
||||||
let cols = vec!["send".to_string()];
|
let cols = vec!["send".to_string()];
|
||||||
let vals = vec![Value::string("Enter", Span::test_data())];
|
let vals = vec![Value::test_string("Enter")];
|
||||||
|
|
||||||
let enter_event = Value::Record {
|
let enter_event = Value::Record {
|
||||||
cols,
|
cols,
|
||||||
@ -1154,7 +1154,7 @@ mod test {
|
|||||||
#[test]
|
#[test]
|
||||||
fn test_error() {
|
fn test_error() {
|
||||||
let cols = vec!["not_exist".to_string()];
|
let cols = vec!["not_exist".to_string()];
|
||||||
let vals = vec![Value::string("Enter", Span::test_data())];
|
let vals = vec![Value::test_string("Enter")];
|
||||||
|
|
||||||
let span = Span::test_data();
|
let span = Span::test_data();
|
||||||
let b = EventType::try_from_columns(&cols, &vals, &span);
|
let b = EventType::try_from_columns(&cols, &vals, &span);
|
||||||
|
@ -5,18 +5,21 @@ use crate::{
|
|||||||
util::{eval_source, get_guaranteed_cwd, report_error, report_error_new},
|
util::{eval_source, get_guaranteed_cwd, report_error, report_error_new},
|
||||||
NuHighlighter, NuValidator, NushellPrompt,
|
NuHighlighter, NuValidator, NushellPrompt,
|
||||||
};
|
};
|
||||||
use log::{info, trace, warn};
|
use crossterm::cursor::CursorShape;
|
||||||
|
use log::{trace, warn};
|
||||||
use miette::{IntoDiagnostic, Result};
|
use miette::{IntoDiagnostic, Result};
|
||||||
use nu_color_config::StyleComputer;
|
use nu_color_config::StyleComputer;
|
||||||
use nu_engine::{convert_env_values, eval_block, eval_block_with_early_return};
|
use nu_engine::{convert_env_values, eval_block, eval_block_with_early_return};
|
||||||
use nu_parser::{lex, parse, trim_quotes_str};
|
use nu_parser::{lex, parse, trim_quotes_str};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
ast::PathMember,
|
ast::PathMember,
|
||||||
|
config::NuCursorShape,
|
||||||
engine::{EngineState, ReplOperation, Stack, StateWorkingSet},
|
engine::{EngineState, ReplOperation, Stack, StateWorkingSet},
|
||||||
format_duration, BlockId, HistoryFileFormat, PipelineData, PositionalArg, ShellError, Span,
|
format_duration, BlockId, HistoryFileFormat, PipelineData, PositionalArg, ShellError, Span,
|
||||||
Spanned, Type, Value, VarId,
|
Spanned, Type, Value, VarId,
|
||||||
};
|
};
|
||||||
use reedline::{DefaultHinter, EditCommand, Emacs, SqliteBackedHistory, Vi};
|
use nu_utils::utils::perf;
|
||||||
|
use reedline::{CursorConfig, DefaultHinter, EditCommand, Emacs, SqliteBackedHistory, Vi};
|
||||||
use std::{
|
use std::{
|
||||||
io::{self, Write},
|
io::{self, Write},
|
||||||
sync::atomic::Ordering,
|
sync::atomic::Ordering,
|
||||||
@ -39,8 +42,10 @@ pub fn evaluate_repl(
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
nushell_path: &str,
|
nushell_path: &str,
|
||||||
prerun_command: Option<Spanned<String>>,
|
prerun_command: Option<Spanned<String>>,
|
||||||
|
entire_start_time: Instant,
|
||||||
) -> Result<()> {
|
) -> Result<()> {
|
||||||
use reedline::{FileBackedHistory, Reedline, Signal};
|
use reedline::{FileBackedHistory, Reedline, Signal};
|
||||||
|
let use_color = engine_state.get_config().use_ansi_coloring;
|
||||||
|
|
||||||
// Guard against invocation without a connected terminal.
|
// Guard against invocation without a connected terminal.
|
||||||
// reedline / crossterm event polling will fail without a connected tty
|
// reedline / crossterm event polling will fail without a connected tty
|
||||||
@ -56,18 +61,20 @@ pub fn evaluate_repl(
|
|||||||
|
|
||||||
let mut nu_prompt = NushellPrompt::new();
|
let mut nu_prompt = NushellPrompt::new();
|
||||||
|
|
||||||
info!(
|
let start_time = std::time::Instant::now();
|
||||||
"translate environment vars {}:{}:{}",
|
|
||||||
file!(),
|
|
||||||
line!(),
|
|
||||||
column!()
|
|
||||||
);
|
|
||||||
|
|
||||||
// Translate environment variables from Strings to Values
|
// Translate environment variables from Strings to Values
|
||||||
if let Some(e) = convert_env_values(engine_state, stack) {
|
if let Some(e) = convert_env_values(engine_state, stack) {
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
report_error(&working_set, &e);
|
report_error(&working_set, &e);
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"translate env vars",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
// seed env vars
|
// seed env vars
|
||||||
stack.add_env_var(
|
stack.add_env_var(
|
||||||
@ -77,33 +84,32 @@ pub fn evaluate_repl(
|
|||||||
|
|
||||||
stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
|
stack.add_env_var("LAST_EXIT_CODE".into(), Value::int(0, Span::unknown()));
|
||||||
|
|
||||||
info!(
|
let mut start_time = std::time::Instant::now();
|
||||||
"load config initially {}:{}:{}",
|
|
||||||
file!(),
|
|
||||||
line!(),
|
|
||||||
column!()
|
|
||||||
);
|
|
||||||
|
|
||||||
info!("setup reedline {}:{}:{}", file!(), line!(), column!());
|
|
||||||
|
|
||||||
let mut line_editor = Reedline::create();
|
let mut line_editor = Reedline::create();
|
||||||
|
|
||||||
// Now that reedline is created, get the history session id and store it in engine_state
|
// Now that reedline is created, get the history session id and store it in engine_state
|
||||||
let hist_sesh = match line_editor.get_history_session_id() {
|
let hist_sesh = line_editor
|
||||||
Some(id) => i64::from(id),
|
.get_history_session_id()
|
||||||
None => 0,
|
.map(i64::from)
|
||||||
};
|
.unwrap_or(0);
|
||||||
engine_state.history_session_id = hist_sesh;
|
engine_state.history_session_id = hist_sesh;
|
||||||
|
perf(
|
||||||
|
"setup reedline",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
let config = engine_state.get_config();
|
let config = engine_state.get_config();
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let history_path = crate::config_files::get_history_path(
|
let history_path = crate::config_files::get_history_path(
|
||||||
nushell_path,
|
nushell_path,
|
||||||
engine_state.config.history_file_format,
|
engine_state.config.history_file_format,
|
||||||
);
|
);
|
||||||
if let Some(history_path) = history_path.as_deref() {
|
if let Some(history_path) = history_path.as_deref() {
|
||||||
info!("setup history {}:{}:{}", file!(), line!(), column!());
|
|
||||||
|
|
||||||
let history: Box<dyn reedline::History> = match engine_state.config.history_file_format {
|
let history: Box<dyn reedline::History> = match engine_state.config.history_file_format {
|
||||||
HistoryFileFormat::PlainText => Box::new(
|
HistoryFileFormat::PlainText => Box::new(
|
||||||
FileBackedHistory::with_file(
|
FileBackedHistory::with_file(
|
||||||
@ -118,7 +124,16 @@ pub fn evaluate_repl(
|
|||||||
};
|
};
|
||||||
line_editor = line_editor.with_history(history);
|
line_editor = line_editor.with_history(history);
|
||||||
};
|
};
|
||||||
|
perf(
|
||||||
|
"setup history",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let sys = sysinfo::System::new();
|
let sys = sysinfo::System::new();
|
||||||
|
|
||||||
let show_banner = config.show_banner;
|
let show_banner = config.show_banner;
|
||||||
@ -126,61 +141,113 @@ pub fn evaluate_repl(
|
|||||||
if show_banner {
|
if show_banner {
|
||||||
let banner = get_banner(engine_state, stack);
|
let banner = get_banner(engine_state, stack);
|
||||||
if use_ansi {
|
if use_ansi {
|
||||||
println!("{}", banner);
|
println!("{banner}");
|
||||||
} else {
|
} else {
|
||||||
println!("{}", nu_utils::strip_ansi_string_likely(banner));
|
println!("{}", nu_utils::strip_ansi_string_likely(banner));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"get sysinfo/show banner",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
if let Some(s) = prerun_command {
|
if let Some(s) = prerun_command {
|
||||||
eval_source(
|
eval_source(
|
||||||
engine_state,
|
engine_state,
|
||||||
stack,
|
stack,
|
||||||
s.item.as_bytes(),
|
s.item.as_bytes(),
|
||||||
&format!("entry #{}", entry_num),
|
&format!("entry #{entry_num}"),
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
engine_state.merge_env(stack, get_guaranteed_cwd(engine_state, stack))?;
|
engine_state.merge_env(stack, get_guaranteed_cwd(engine_state, stack))?;
|
||||||
}
|
}
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
info!(
|
let loop_start_time = std::time::Instant::now();
|
||||||
"load config each loop {}:{}:{}",
|
|
||||||
file!(),
|
|
||||||
line!(),
|
|
||||||
column!()
|
|
||||||
);
|
|
||||||
|
|
||||||
let cwd = get_guaranteed_cwd(engine_state, stack);
|
let cwd = get_guaranteed_cwd(engine_state, stack);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
// Before doing anything, merge the environment from the previous REPL iteration into the
|
// Before doing anything, merge the environment from the previous REPL iteration into the
|
||||||
// permanent state.
|
// permanent state.
|
||||||
if let Err(err) = engine_state.merge_env(stack, cwd) {
|
if let Err(err) = engine_state.merge_env(stack, cwd) {
|
||||||
report_error_new(engine_state, &err);
|
report_error_new(engine_state, &err);
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"merge env",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
//Reset the ctrl-c handler
|
//Reset the ctrl-c handler
|
||||||
if let Some(ctrlc) = &mut engine_state.ctrlc {
|
if let Some(ctrlc) = &mut engine_state.ctrlc {
|
||||||
ctrlc.store(false, Ordering::SeqCst);
|
ctrlc.store(false, Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"reset ctrlc",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
// Reset the SIGQUIT handler
|
// Reset the SIGQUIT handler
|
||||||
if let Some(sig_quit) = engine_state.get_sig_quit() {
|
if let Some(sig_quit) = engine_state.get_sig_quit() {
|
||||||
sig_quit.store(false, Ordering::SeqCst);
|
sig_quit.store(false, Ordering::SeqCst);
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"reset sig_quit",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let config = engine_state.get_config();
|
let config = engine_state.get_config();
|
||||||
|
|
||||||
info!("setup colors {}:{}:{}", file!(), line!(), column!());
|
|
||||||
|
|
||||||
info!("update reedline {}:{}:{}", file!(), line!(), column!());
|
|
||||||
let engine_reference = std::sync::Arc::new(engine_state.clone());
|
let engine_reference = std::sync::Arc::new(engine_state.clone());
|
||||||
|
|
||||||
|
// Find the configured cursor shapes for each mode
|
||||||
|
let cursor_config = CursorConfig {
|
||||||
|
vi_insert: Some(map_nucursorshape_to_cursorshape(
|
||||||
|
config.cursor_shape_vi_insert,
|
||||||
|
)),
|
||||||
|
vi_normal: Some(map_nucursorshape_to_cursorshape(
|
||||||
|
config.cursor_shape_vi_normal,
|
||||||
|
)),
|
||||||
|
emacs: Some(map_nucursorshape_to_cursorshape(config.cursor_shape_emacs)),
|
||||||
|
};
|
||||||
|
perf(
|
||||||
|
"get config/cursor config",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
|
|
||||||
line_editor = line_editor
|
line_editor = line_editor
|
||||||
.with_highlighter(Box::new(NuHighlighter {
|
.with_highlighter(Box::new(NuHighlighter {
|
||||||
engine_state: engine_state.clone(),
|
engine_state: engine_reference.clone(),
|
||||||
config: config.clone(),
|
config: config.clone(),
|
||||||
}))
|
}))
|
||||||
.with_validator(Box::new(NuValidator {
|
.with_validator(Box::new(NuValidator {
|
||||||
engine_state: engine_state.clone(),
|
engine_state: engine_reference.clone(),
|
||||||
}))
|
}))
|
||||||
.with_completer(Box::new(NuCompleter::new(
|
.with_completer(Box::new(NuCompleter::new(
|
||||||
engine_reference.clone(),
|
engine_reference.clone(),
|
||||||
@ -188,10 +255,20 @@ pub fn evaluate_repl(
|
|||||||
)))
|
)))
|
||||||
.with_quick_completions(config.quick_completions)
|
.with_quick_completions(config.quick_completions)
|
||||||
.with_partial_completions(config.partial_completions)
|
.with_partial_completions(config.partial_completions)
|
||||||
.with_ansi_colors(config.use_ansi_coloring);
|
.with_ansi_colors(config.use_ansi_coloring)
|
||||||
|
.with_cursor_config(cursor_config);
|
||||||
|
perf(
|
||||||
|
"reedline builder",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
let style_computer = StyleComputer::from_config(engine_state, stack);
|
let style_computer = StyleComputer::from_config(engine_state, stack);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
line_editor = if config.use_ansi_coloring {
|
line_editor = if config.use_ansi_coloring {
|
||||||
line_editor.with_hinter(Box::new({
|
line_editor.with_hinter(Box::new({
|
||||||
// As of Nov 2022, "hints" color_config closures only get `null` passed in.
|
// As of Nov 2022, "hints" color_config closures only get `null` passed in.
|
||||||
@ -201,16 +278,31 @@ pub fn evaluate_repl(
|
|||||||
} else {
|
} else {
|
||||||
line_editor.disable_hints()
|
line_editor.disable_hints()
|
||||||
};
|
};
|
||||||
|
perf(
|
||||||
|
"reedline coloring/style_computer",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
line_editor = match add_menus(line_editor, engine_reference, stack, config) {
|
start_time = std::time::Instant::now();
|
||||||
Ok(line_editor) => line_editor,
|
line_editor = add_menus(line_editor, engine_reference, stack, config).unwrap_or_else(|e| {
|
||||||
Err(e) => {
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
report_error(&working_set, &e);
|
||||||
report_error(&working_set, &e);
|
Reedline::create()
|
||||||
Reedline::create()
|
});
|
||||||
}
|
perf(
|
||||||
};
|
"reedline menus",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let buffer_editor = if !config.buffer_editor.is_empty() {
|
let buffer_editor = if !config.buffer_editor.is_empty() {
|
||||||
Some(config.buffer_editor.clone())
|
Some(config.buffer_editor.clone())
|
||||||
} else {
|
} else {
|
||||||
@ -231,17 +323,31 @@ pub fn evaluate_repl(
|
|||||||
} else {
|
} else {
|
||||||
line_editor
|
line_editor
|
||||||
};
|
};
|
||||||
|
perf(
|
||||||
|
"reedline buffer_editor",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
if config.sync_history_on_enter {
|
if config.sync_history_on_enter {
|
||||||
info!("sync history {}:{}:{}", file!(), line!(), column!());
|
|
||||||
|
|
||||||
if let Err(e) = line_editor.sync_history() {
|
if let Err(e) = line_editor.sync_history() {
|
||||||
warn!("Failed to sync history: {}", e);
|
warn!("Failed to sync history: {}", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"sync_history",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
info!("setup keybindings {}:{}:{}", file!(), line!(), column!());
|
start_time = std::time::Instant::now();
|
||||||
|
|
||||||
// Changing the line editor based on the found keybindings
|
// Changing the line editor based on the found keybindings
|
||||||
line_editor = match create_keybindings(config) {
|
line_editor = match create_keybindings(config) {
|
||||||
Ok(keybindings) => match keybindings {
|
Ok(keybindings) => match keybindings {
|
||||||
@ -263,9 +369,16 @@ pub fn evaluate_repl(
|
|||||||
line_editor
|
line_editor
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
perf(
|
||||||
|
"keybindings",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
info!("prompt_update {}:{}:{}", file!(), line!(), column!());
|
start_time = std::time::Instant::now();
|
||||||
|
|
||||||
// Right before we start our prompt and take input from the user,
|
// Right before we start our prompt and take input from the user,
|
||||||
// fire the "pre_prompt" hook
|
// fire the "pre_prompt" hook
|
||||||
if let Some(hook) = config.hooks.pre_prompt.clone() {
|
if let Some(hook) = config.hooks.pre_prompt.clone() {
|
||||||
@ -273,7 +386,16 @@ pub fn evaluate_repl(
|
|||||||
report_error_new(engine_state, &err);
|
report_error_new(engine_state, &err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"pre-prompt hook",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
// Next, check all the environment variables they ask for
|
// Next, check all the environment variables they ask for
|
||||||
// fire the "env_change" hook
|
// fire the "env_change" hook
|
||||||
let config = engine_state.get_config();
|
let config = engine_state.get_config();
|
||||||
@ -282,19 +404,37 @@ pub fn evaluate_repl(
|
|||||||
{
|
{
|
||||||
report_error_new(engine_state, &error)
|
report_error_new(engine_state, &error)
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"env-change hook",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let config = engine_state.get_config();
|
let config = engine_state.get_config();
|
||||||
let prompt = prompt_update::update_prompt(config, engine_state, stack, &mut nu_prompt);
|
let prompt = prompt_update::update_prompt(config, engine_state, stack, &mut nu_prompt);
|
||||||
|
perf(
|
||||||
|
"update_prompt",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
entry_num += 1;
|
entry_num += 1;
|
||||||
|
|
||||||
info!(
|
if entry_num == 1 && show_banner {
|
||||||
"finished setup, starting repl {}:{}:{}",
|
println!(
|
||||||
file!(),
|
"Startup Time: {}",
|
||||||
line!(),
|
format_duration(entire_start_time.elapsed().as_nanos() as i64)
|
||||||
column!()
|
);
|
||||||
);
|
}
|
||||||
|
|
||||||
|
start_time = std::time::Instant::now();
|
||||||
let input = line_editor.read_line(prompt);
|
let input = line_editor.read_line(prompt);
|
||||||
let shell_integration = config.shell_integration;
|
let shell_integration = config.shell_integration;
|
||||||
|
|
||||||
@ -421,8 +561,9 @@ pub fn evaluate_repl(
|
|||||||
engine_state,
|
engine_state,
|
||||||
stack,
|
stack,
|
||||||
s.as_bytes(),
|
s.as_bytes(),
|
||||||
&format!("entry #{}", entry_num),
|
&format!("entry #{entry_num}"),
|
||||||
PipelineData::empty(),
|
PipelineData::empty(),
|
||||||
|
false,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let cmd_duration = start_time.elapsed();
|
let cmd_duration = start_time.elapsed();
|
||||||
@ -479,7 +620,7 @@ pub fn evaluate_repl(
|
|||||||
// ESC]0;stringBEL -- Set icon name and window title to string
|
// ESC]0;stringBEL -- Set icon name and window title to string
|
||||||
// ESC]1;stringBEL -- Set icon name to string
|
// ESC]1;stringBEL -- Set icon name to string
|
||||||
// ESC]2;stringBEL -- Set window title to string
|
// ESC]2;stringBEL -- Set window title to string
|
||||||
run_ansi_sequence(&format!("\x1b]2;{}\x07", maybe_abbrev_path))?;
|
run_ansi_sequence(&format!("\x1b]2;{maybe_abbrev_path}\x07"))?;
|
||||||
}
|
}
|
||||||
run_ansi_sequence(RESET_APPLICATION_MODE)?;
|
run_ansi_sequence(RESET_APPLICATION_MODE)?;
|
||||||
}
|
}
|
||||||
@ -519,7 +660,7 @@ pub fn evaluate_repl(
|
|||||||
Err(err) => {
|
Err(err) => {
|
||||||
let message = err.to_string();
|
let message = err.to_string();
|
||||||
if !message.contains("duration") {
|
if !message.contains("duration") {
|
||||||
eprintln!("Error: {:?}", err);
|
eprintln!("Error: {err:?}");
|
||||||
// TODO: Identify possible error cases where a hard failure is preferable
|
// TODO: Identify possible error cases where a hard failure is preferable
|
||||||
// Ignoring and reporting could hide bigger problems
|
// Ignoring and reporting could hide bigger problems
|
||||||
// e.g. https://github.com/nushell/nushell/issues/6452
|
// e.g. https://github.com/nushell/nushell/issues/6452
|
||||||
@ -530,11 +671,36 @@ pub fn evaluate_repl(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
"processing line editor input",
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
|
|
||||||
|
perf(
|
||||||
|
"finished repl loop",
|
||||||
|
loop_start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
use_color,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn map_nucursorshape_to_cursorshape(shape: NuCursorShape) -> CursorShape {
|
||||||
|
match shape {
|
||||||
|
NuCursorShape::Block => CursorShape::Block,
|
||||||
|
NuCursorShape::UnderScore => CursorShape::UnderScore,
|
||||||
|
NuCursorShape::Line => CursorShape::Line,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn get_banner(engine_state: &mut EngineState, stack: &mut Stack) -> String {
|
fn get_banner(engine_state: &mut EngineState, stack: &mut Stack) -> String {
|
||||||
let age = match eval_string_with_input(
|
let age = match eval_string_with_input(
|
||||||
engine_state,
|
engine_state,
|
||||||
@ -558,15 +724,7 @@ Our {}Documentation{} is located at {}http://nushell.sh{}
|
|||||||
{}Tweet{} us at {}@nu_shell{}
|
{}Tweet{} us at {}@nu_shell{}
|
||||||
|
|
||||||
It's been this long since {}Nushell{}'s first commit:
|
It's been this long since {}Nushell{}'s first commit:
|
||||||
{}
|
{}{}
|
||||||
|
|
||||||
{}You can disable this banner using the {}config nu{}{} command
|
|
||||||
to modify the config.nu file and setting show_banner to false.
|
|
||||||
|
|
||||||
let-env config = {{
|
|
||||||
show_banner: false
|
|
||||||
...
|
|
||||||
}}{}
|
|
||||||
"#,
|
"#,
|
||||||
"\x1b[32m", //start line 1 green
|
"\x1b[32m", //start line 1 green
|
||||||
"\x1b[32m", //start line 2
|
"\x1b[32m", //start line 2
|
||||||
@ -598,11 +756,7 @@ let-env config = {{
|
|||||||
"\x1b[32m", //before Nushell
|
"\x1b[32m", //before Nushell
|
||||||
"\x1b[0m", //after Nushell
|
"\x1b[0m", //after Nushell
|
||||||
age,
|
age,
|
||||||
"\x1b[2;37m", //before banner disable dim white
|
"\x1b[0m", //after banner disable
|
||||||
"\x1b[2;36m", //before config nu dim cyan
|
|
||||||
"\x1b[0m", //after config nu
|
|
||||||
"\x1b[2;37m", //after config nu dim white
|
|
||||||
"\x1b[0m", //after banner disable
|
|
||||||
);
|
);
|
||||||
|
|
||||||
banner
|
banner
|
||||||
@ -639,7 +793,7 @@ pub fn eval_string_with_input(
|
|||||||
false,
|
false,
|
||||||
true,
|
true,
|
||||||
)
|
)
|
||||||
.map(|x| x.into_value(Span::test_data()))
|
.map(|x| x.into_value(Span::unknown()))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_command_finished_marker(stack: &Stack, engine_state: &EngineState) -> String {
|
pub fn get_command_finished_marker(stack: &Stack, engine_state: &EngineState) -> String {
|
||||||
@ -734,60 +888,63 @@ pub fn eval_hook(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Value::Record { .. } => {
|
Value::Record { .. } => {
|
||||||
let do_run_hook =
|
let do_run_hook = if let Ok(condition) =
|
||||||
if let Ok(condition) = value.clone().follow_cell_path(&[condition_path], false) {
|
value
|
||||||
match condition {
|
.clone()
|
||||||
Value::Block {
|
.follow_cell_path(&[condition_path], false, false)
|
||||||
val: block_id,
|
{
|
||||||
span: block_span,
|
match condition {
|
||||||
..
|
Value::Block {
|
||||||
}
|
val: block_id,
|
||||||
| Value::Closure {
|
span: block_span,
|
||||||
val: block_id,
|
..
|
||||||
span: block_span,
|
}
|
||||||
..
|
| Value::Closure {
|
||||||
} => {
|
val: block_id,
|
||||||
match run_hook_block(
|
span: block_span,
|
||||||
engine_state,
|
..
|
||||||
stack,
|
} => {
|
||||||
block_id,
|
match run_hook_block(
|
||||||
None,
|
engine_state,
|
||||||
arguments.clone(),
|
stack,
|
||||||
block_span,
|
block_id,
|
||||||
) {
|
None,
|
||||||
Ok(pipeline_data) => {
|
arguments.clone(),
|
||||||
if let PipelineData::Value(Value::Bool { val, .. }, ..) =
|
block_span,
|
||||||
pipeline_data
|
) {
|
||||||
{
|
Ok(pipeline_data) => {
|
||||||
val
|
if let PipelineData::Value(Value::Bool { val, .. }, ..) =
|
||||||
} else {
|
pipeline_data
|
||||||
return Err(ShellError::UnsupportedConfigValue(
|
{
|
||||||
"boolean output".to_string(),
|
val
|
||||||
"other PipelineData variant".to_string(),
|
} else {
|
||||||
block_span,
|
return Err(ShellError::UnsupportedConfigValue(
|
||||||
));
|
"boolean output".to_string(),
|
||||||
}
|
"other PipelineData variant".to_string(),
|
||||||
}
|
block_span,
|
||||||
Err(err) => {
|
));
|
||||||
return Err(err);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
Err(err) => {
|
||||||
other => {
|
return Err(err);
|
||||||
return Err(ShellError::UnsupportedConfigValue(
|
}
|
||||||
"block".to_string(),
|
|
||||||
format!("{}", other.get_type()),
|
|
||||||
other.span()?,
|
|
||||||
));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
other => {
|
||||||
// always run the hook
|
return Err(ShellError::UnsupportedConfigValue(
|
||||||
true
|
"block".to_string(),
|
||||||
};
|
format!("{}", other.get_type()),
|
||||||
|
other.span()?,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// always run the hook
|
||||||
|
true
|
||||||
|
};
|
||||||
|
|
||||||
if do_run_hook {
|
if do_run_hook {
|
||||||
match value.clone().follow_cell_path(&[code_path], false)? {
|
match value.clone().follow_cell_path(&[code_path], false, false)? {
|
||||||
Value::String {
|
Value::String {
|
||||||
val,
|
val,
|
||||||
span: source_span,
|
span: source_span,
|
||||||
@ -957,47 +1114,41 @@ fn run_hook_block(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
match eval_block_with_early_return(engine_state, &mut callee_stack, block, input, false, false)
|
let pipeline_data =
|
||||||
{
|
eval_block_with_early_return(engine_state, &mut callee_stack, block, input, false, false)?;
|
||||||
Ok(pipeline_data) => {
|
|
||||||
if let PipelineData::Value(Value::Error { error }, _) = pipeline_data {
|
|
||||||
return Err(error);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If all went fine, preserve the environment of the called block
|
if let PipelineData::Value(Value::Error { error }, _) = pipeline_data {
|
||||||
let caller_env_vars = stack.get_env_var_names(engine_state);
|
return Err(error);
|
||||||
|
|
||||||
// remove env vars that are present in the caller but not in the callee
|
|
||||||
// (the callee hid them)
|
|
||||||
for var in caller_env_vars.iter() {
|
|
||||||
if !callee_stack.has_env_var(engine_state, var) {
|
|
||||||
stack.remove_env_var(engine_state, var);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// add new env vars from callee to caller
|
|
||||||
for (var, value) in callee_stack.get_stack_env_vars() {
|
|
||||||
stack.add_env_var(var, value);
|
|
||||||
}
|
|
||||||
Ok(pipeline_data)
|
|
||||||
}
|
|
||||||
Err(err) => Err(err),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If all went fine, preserve the environment of the called block
|
||||||
|
let caller_env_vars = stack.get_env_var_names(engine_state);
|
||||||
|
|
||||||
|
// remove env vars that are present in the caller but not in the callee
|
||||||
|
// (the callee hid them)
|
||||||
|
for var in caller_env_vars.iter() {
|
||||||
|
if !callee_stack.has_env_var(engine_state, var) {
|
||||||
|
stack.remove_env_var(engine_state, var);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// add new env vars from callee to caller
|
||||||
|
for (var, value) in callee_stack.get_stack_env_vars() {
|
||||||
|
stack.add_env_var(var, value);
|
||||||
|
}
|
||||||
|
Ok(pipeline_data)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_ansi_sequence(seq: &str) -> Result<(), ShellError> {
|
fn run_ansi_sequence(seq: &str) -> Result<(), ShellError> {
|
||||||
match io::stdout().write_all(seq.as_bytes()) {
|
io::stdout().write_all(seq.as_bytes()).map_err(|e| {
|
||||||
Ok(it) => it,
|
ShellError::GenericError(
|
||||||
Err(err) => {
|
"Error writing ansi sequence".into(),
|
||||||
return Err(ShellError::GenericError(
|
e.to_string(),
|
||||||
"Error writing ansi sequence".into(),
|
Some(Span::unknown()),
|
||||||
err.to_string(),
|
None,
|
||||||
Some(Span::unknown()),
|
Vec::new(),
|
||||||
None,
|
)
|
||||||
Vec::new(),
|
})?;
|
||||||
));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
io::stdout().flush().map_err(|e| {
|
io::stdout().flush().map_err(|e| {
|
||||||
ShellError::GenericError(
|
ShellError::GenericError(
|
||||||
"Error flushing stdio".into(),
|
"Error flushing stdio".into(),
|
||||||
|
@ -6,9 +6,10 @@ use nu_protocol::ast::{Argument, Block, Expr, Expression, PipelineElement};
|
|||||||
use nu_protocol::engine::{EngineState, StateWorkingSet};
|
use nu_protocol::engine::{EngineState, StateWorkingSet};
|
||||||
use nu_protocol::{Config, Span};
|
use nu_protocol::{Config, Span};
|
||||||
use reedline::{Highlighter, StyledText};
|
use reedline::{Highlighter, StyledText};
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
pub struct NuHighlighter {
|
pub struct NuHighlighter {
|
||||||
pub engine_state: EngineState,
|
pub engine_state: Arc<EngineState>,
|
||||||
pub config: Config,
|
pub config: Config,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -233,7 +234,8 @@ fn find_matching_block_end_in_block(
|
|||||||
PipelineElement::Expression(_, e)
|
PipelineElement::Expression(_, e)
|
||||||
| PipelineElement::Redirection(_, _, e)
|
| PipelineElement::Redirection(_, _, e)
|
||||||
| PipelineElement::And(_, e)
|
| PipelineElement::And(_, e)
|
||||||
| PipelineElement::Or(_, e) => {
|
| PipelineElement::Or(_, e)
|
||||||
|
| PipelineElement::SeparateRedirection { out: (_, e), .. } => {
|
||||||
if e.span.contains(global_cursor_offset) {
|
if e.span.contains(global_cursor_offset) {
|
||||||
if let Some(pos) = find_matching_block_end_in_expr(
|
if let Some(pos) = find_matching_block_end_in_expr(
|
||||||
line,
|
line,
|
||||||
@ -352,6 +354,7 @@ fn find_matching_block_end_in_expr(
|
|||||||
let opt_expr = match arg {
|
let opt_expr = match arg {
|
||||||
Argument::Named((_, _, opt_expr)) => opt_expr.as_ref(),
|
Argument::Named((_, _, opt_expr)) => opt_expr.as_ref(),
|
||||||
Argument::Positional(inner_expr) => Some(inner_expr),
|
Argument::Positional(inner_expr) => Some(inner_expr),
|
||||||
|
Argument::Unknown(inner_expr) => Some(inner_expr),
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Some(inner_expr) = opt_expr {
|
if let Some(inner_expr) = opt_expr {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use crate::repl::eval_hook;
|
use crate::repl::eval_hook;
|
||||||
use nu_engine::eval_block;
|
use nu_engine::{eval_block, eval_block_with_early_return};
|
||||||
use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
|
use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
|
||||||
use nu_protocol::engine::StateWorkingSet;
|
use nu_protocol::engine::StateWorkingSet;
|
||||||
use nu_protocol::CliError;
|
use nu_protocol::CliError;
|
||||||
@ -9,6 +9,7 @@ use nu_protocol::{
|
|||||||
};
|
};
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
use nu_utils::enable_vt_processing;
|
use nu_utils::enable_vt_processing;
|
||||||
|
use nu_utils::utils::perf;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
// This will collect environment variables from std::env and adds them to a stack.
|
// This will collect environment variables from std::env and adds them to a stack.
|
||||||
@ -43,7 +44,7 @@ fn gather_env_vars(
|
|||||||
report_error(
|
report_error(
|
||||||
&working_set,
|
&working_set,
|
||||||
&ShellError::GenericError(
|
&ShellError::GenericError(
|
||||||
format!("Environment variable was not captured: {}", env_str),
|
format!("Environment variable was not captured: {env_str}"),
|
||||||
"".to_string(),
|
"".to_string(),
|
||||||
None,
|
None,
|
||||||
Some(msg.into()),
|
Some(msg.into()),
|
||||||
@ -79,8 +80,7 @@ fn gather_env_vars(
|
|||||||
"".to_string(),
|
"".to_string(),
|
||||||
None,
|
None,
|
||||||
Some(format!(
|
Some(format!(
|
||||||
"Retrieving current directory failed: {:?} not a valid utf-8 path",
|
"Retrieving current directory failed: {init_cwd:?} not a valid utf-8 path"
|
||||||
init_cwd
|
|
||||||
)),
|
)),
|
||||||
Vec::new(),
|
Vec::new(),
|
||||||
),
|
),
|
||||||
@ -203,7 +203,10 @@ pub fn eval_source(
|
|||||||
source: &[u8],
|
source: &[u8],
|
||||||
fname: &str,
|
fname: &str,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
|
allow_return: bool,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
|
let start_time = std::time::Instant::now();
|
||||||
|
|
||||||
let (block, delta) = {
|
let (block, delta) = {
|
||||||
let mut working_set = StateWorkingSet::new(engine_state);
|
let mut working_set = StateWorkingSet::new(engine_state);
|
||||||
let (output, err) = parse(
|
let (output, err) = parse(
|
||||||
@ -228,7 +231,13 @@ pub fn eval_source(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
match eval_block(engine_state, stack, &block, input, false, false) {
|
let b = if allow_return {
|
||||||
|
eval_block_with_early_return(engine_state, stack, &block, input, false, false)
|
||||||
|
} else {
|
||||||
|
eval_block(engine_state, stack, &block, input, false, false)
|
||||||
|
};
|
||||||
|
|
||||||
|
match b {
|
||||||
Ok(pipeline_data) => {
|
Ok(pipeline_data) => {
|
||||||
let config = engine_state.get_config();
|
let config = engine_state.get_config();
|
||||||
let result;
|
let result;
|
||||||
@ -282,6 +291,14 @@ pub fn eval_source(
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
perf(
|
||||||
|
&format!("eval_source {}", &fname),
|
||||||
|
start_time,
|
||||||
|
file!(),
|
||||||
|
line!(),
|
||||||
|
column!(),
|
||||||
|
engine_state.get_config().use_ansi_coloring,
|
||||||
|
);
|
||||||
|
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
@ -315,27 +332,19 @@ pub fn report_error_new(
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_init_cwd() -> PathBuf {
|
pub fn get_init_cwd() -> PathBuf {
|
||||||
match std::env::current_dir() {
|
std::env::current_dir().unwrap_or_else(|_| {
|
||||||
Ok(cwd) => cwd,
|
std::env::var("PWD")
|
||||||
Err(_) => match std::env::var("PWD") {
|
.map(Into::into)
|
||||||
Ok(cwd) => PathBuf::from(cwd),
|
.unwrap_or_else(|_| nu_path::home_dir().unwrap_or_default())
|
||||||
Err(_) => match nu_path::home_dir() {
|
})
|
||||||
Some(cwd) => cwd,
|
|
||||||
None => PathBuf::new(),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
|
pub fn get_guaranteed_cwd(engine_state: &EngineState, stack: &Stack) -> PathBuf {
|
||||||
match nu_engine::env::current_dir(engine_state, stack) {
|
nu_engine::env::current_dir(engine_state, stack).unwrap_or_else(|e| {
|
||||||
Ok(p) => p,
|
let working_set = StateWorkingSet::new(engine_state);
|
||||||
Err(e) => {
|
report_error(&working_set, &e);
|
||||||
let working_set = StateWorkingSet::new(engine_state);
|
get_init_cwd()
|
||||||
report_error(&working_set, &e);
|
})
|
||||||
get_init_cwd()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
use nu_parser::{parse, ParseError};
|
use nu_parser::{parse, ParseError};
|
||||||
use nu_protocol::engine::{EngineState, StateWorkingSet};
|
use nu_protocol::engine::{EngineState, StateWorkingSet};
|
||||||
use reedline::{ValidationResult, Validator};
|
use reedline::{ValidationResult, Validator};
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
pub struct NuValidator {
|
pub struct NuValidator {
|
||||||
pub engine_state: EngineState,
|
pub engine_state: Arc<EngineState>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Validator for NuValidator {
|
impl Validator for NuValidator {
|
||||||
|
@ -34,6 +34,26 @@ fn completer_strings() -> NuCompleter {
|
|||||||
NuCompleter::new(std::sync::Arc::new(engine), stack)
|
NuCompleter::new(std::sync::Arc::new(engine), stack)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[fixture]
|
||||||
|
fn extern_completer() -> NuCompleter {
|
||||||
|
// Create a new engine
|
||||||
|
let (dir, _, mut engine, mut stack) = new_engine();
|
||||||
|
|
||||||
|
// Add record value as example
|
||||||
|
let record = r#"
|
||||||
|
def animals [] { [ "cat", "dog", "eel" ] }
|
||||||
|
extern spam [
|
||||||
|
animal: string@animals
|
||||||
|
--foo (-f): string@animals
|
||||||
|
-b: string@animals
|
||||||
|
]
|
||||||
|
"#;
|
||||||
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
||||||
|
|
||||||
|
// Instantiate a new completer
|
||||||
|
NuCompleter::new(std::sync::Arc::new(engine), stack)
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn variables_dollar_sign_with_varialblecompletion() {
|
fn variables_dollar_sign_with_varialblecompletion() {
|
||||||
let (_, _, engine, stack) = new_engine();
|
let (_, _, engine, stack) = new_engine();
|
||||||
@ -89,7 +109,7 @@ fn dotnu_completions() {
|
|||||||
// Create a new engine
|
// Create a new engine
|
||||||
let (_, _, engine, stack) = new_engine();
|
let (_, _, engine, stack) = new_engine();
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
// Test source completion
|
// Test source completion
|
||||||
@ -149,11 +169,11 @@ fn file_completions() {
|
|||||||
// Create a new engine
|
// Create a new engine
|
||||||
let (dir, dir_str, engine, stack) = new_engine();
|
let (dir, dir_str, engine, stack) = new_engine();
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
// Test completions for the current folder
|
// Test completions for the current folder
|
||||||
let target_dir = format!("cp {}", dir_str);
|
let target_dir = format!("cp {dir_str}");
|
||||||
let suggestions = completer.complete(&target_dir, target_dir.len());
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
||||||
|
|
||||||
// Create the expected values
|
// Create the expected values
|
||||||
@ -424,6 +444,7 @@ fn file_completion_quoted() {
|
|||||||
"`te st.txt`".to_string(),
|
"`te st.txt`".to_string(),
|
||||||
"`te#st.txt`".to_string(),
|
"`te#st.txt`".to_string(),
|
||||||
"`te'st.txt`".to_string(),
|
"`te'st.txt`".to_string(),
|
||||||
|
"`te(st).txt`".to_string(),
|
||||||
];
|
];
|
||||||
|
|
||||||
match_suggestions(expected_paths, suggestions)
|
match_suggestions(expected_paths, suggestions)
|
||||||
@ -434,12 +455,12 @@ fn flag_completions() {
|
|||||||
// Create a new engine
|
// Create a new engine
|
||||||
let (_, _, engine, stack) = new_engine();
|
let (_, _, engine, stack) = new_engine();
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
// Test completions for the 'ls' flags
|
// Test completions for the 'ls' flags
|
||||||
let suggestions = completer.complete("ls -", 4);
|
let suggestions = completer.complete("ls -", 4);
|
||||||
|
|
||||||
assert_eq!(14, suggestions.len());
|
assert_eq!(16, suggestions.len());
|
||||||
|
|
||||||
let expected: Vec<String> = vec![
|
let expected: Vec<String> = vec![
|
||||||
"--all".into(),
|
"--all".into(),
|
||||||
@ -448,6 +469,7 @@ fn flag_completions() {
|
|||||||
"--full-paths".into(),
|
"--full-paths".into(),
|
||||||
"--help".into(),
|
"--help".into(),
|
||||||
"--long".into(),
|
"--long".into(),
|
||||||
|
"--mime-type".into(),
|
||||||
"--short-names".into(),
|
"--short-names".into(),
|
||||||
"-D".into(),
|
"-D".into(),
|
||||||
"-a".into(),
|
"-a".into(),
|
||||||
@ -455,6 +477,7 @@ fn flag_completions() {
|
|||||||
"-f".into(),
|
"-f".into(),
|
||||||
"-h".into(),
|
"-h".into(),
|
||||||
"-l".into(),
|
"-l".into(),
|
||||||
|
"-m".into(),
|
||||||
"-s".into(),
|
"-s".into(),
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -467,11 +490,11 @@ fn folder_with_directorycompletions() {
|
|||||||
// Create a new engine
|
// Create a new engine
|
||||||
let (dir, dir_str, engine, stack) = new_engine();
|
let (dir, dir_str, engine, stack) = new_engine();
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
// Test completions for the current folder
|
// Test completions for the current folder
|
||||||
let target_dir = format!("cd {}", dir_str);
|
let target_dir = format!("cd {dir_str}");
|
||||||
let suggestions = completer.complete(&target_dir, target_dir.len());
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
||||||
|
|
||||||
// Create the expected values
|
// Create the expected values
|
||||||
@ -495,7 +518,7 @@ fn variables_completions() {
|
|||||||
let record = "let actor = { name: 'Tom Hardy', age: 44 }";
|
let record = "let actor = { name: 'Tom Hardy', age: 44 }";
|
||||||
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
// Test completions for $nu
|
// Test completions for $nu
|
||||||
@ -551,9 +574,12 @@ fn variables_completions() {
|
|||||||
// Test completions for $env
|
// Test completions for $env
|
||||||
let suggestions = completer.complete("$env.", 5);
|
let suggestions = completer.complete("$env.", 5);
|
||||||
|
|
||||||
assert_eq!(2, suggestions.len());
|
assert_eq!(3, suggestions.len());
|
||||||
|
|
||||||
let expected: Vec<String> = vec!["PWD".into(), "TEST".into()];
|
#[cfg(windows)]
|
||||||
|
let expected: Vec<String> = vec!["PWD".into(), "Path".into(), "TEST".into()];
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
|
||||||
|
|
||||||
// Match results
|
// Match results
|
||||||
match_suggestions(expected, suggestions);
|
match_suggestions(expected, suggestions);
|
||||||
@ -652,7 +678,7 @@ fn run_external_completion(block: &str, input: &str) -> Vec<Suggestion> {
|
|||||||
config.external_completer = Some(latest_block_id);
|
config.external_completer = Some(latest_block_id);
|
||||||
engine_state.set_config(&config);
|
engine_state.set_config(&config);
|
||||||
|
|
||||||
// Instatiate a new completer
|
// Instantiate a new completer
|
||||||
let mut completer = NuCompleter::new(std::sync::Arc::new(engine_state), stack);
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine_state), stack);
|
||||||
|
|
||||||
completer.complete(input, input.len())
|
completer.complete(input, input.len())
|
||||||
@ -750,3 +776,92 @@ fn filecompletions_triggers_after_cursor() {
|
|||||||
|
|
||||||
match_suggestions(expected_paths, suggestions);
|
match_suggestions(expected_paths, suggestions);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_custom_completion_positional(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam ", 5);
|
||||||
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_custom_completion_long_flag_1(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam --foo=", 11);
|
||||||
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_custom_completion_long_flag_2(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam --foo ", 11);
|
||||||
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_custom_completion_long_flag_short(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam -f ", 8);
|
||||||
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_custom_completion_short_flag(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam -b ", 8);
|
||||||
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
fn extern_complete_flags(mut extern_completer: NuCompleter) {
|
||||||
|
let suggestions = extern_completer.complete("spam -", 6);
|
||||||
|
let expected: Vec<String> = vec!["--foo".into(), "-b".into(), "-f".into()];
|
||||||
|
match_suggestions(expected, suggestions);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[ignore = "was reverted, still needs fixing"]
|
||||||
|
#[rstest]
|
||||||
|
fn alias_offset_bug_7648() {
|
||||||
|
let (dir, _, mut engine, mut stack) = new_engine();
|
||||||
|
|
||||||
|
// Create an alias
|
||||||
|
let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
|
||||||
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
||||||
|
|
||||||
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
|
// Issue #7648
|
||||||
|
// Nushell crashes when an alias name is shorter than the alias command
|
||||||
|
// and the alias command is a external command
|
||||||
|
// This happens because of offset is not correct.
|
||||||
|
// This crashes before PR #7779
|
||||||
|
let _suggestions = completer.complete("e", 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[ignore = "was reverted, still needs fixing"]
|
||||||
|
#[rstest]
|
||||||
|
fn alias_offset_bug_7754() {
|
||||||
|
let (dir, _, mut engine, mut stack) = new_engine();
|
||||||
|
|
||||||
|
// Create an alias
|
||||||
|
let alias = r#"alias ll = ls -l"#;
|
||||||
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
||||||
|
|
||||||
|
let mut completer = NuCompleter::new(std::sync::Arc::new(engine), stack);
|
||||||
|
|
||||||
|
// Issue #7754
|
||||||
|
// Nushell crashes when an alias name is shorter than the alias command
|
||||||
|
// and the alias command contains pipes.
|
||||||
|
// This crashes before PR #7756
|
||||||
|
let _suggestions = completer.complete("ll -a | c", 9);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn get_path_env_var_8003() {
|
||||||
|
// Create a new engine
|
||||||
|
let (_, _, engine, _) = new_engine();
|
||||||
|
// Get the path env var in a platform agnostic way
|
||||||
|
let the_path = engine.get_path_env_var();
|
||||||
|
// Make sure it's not empty
|
||||||
|
assert!(the_path.is_some());
|
||||||
|
}
|
||||||
|
@ -43,6 +43,22 @@ pub fn new_engine() -> (PathBuf, String, EngineState, Stack) {
|
|||||||
span: nu_protocol::Span::new(0, dir_str.len()),
|
span: nu_protocol::Span::new(0, dir_str.len()),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
#[cfg(windows)]
|
||||||
|
stack.add_env_var(
|
||||||
|
"Path".to_string(),
|
||||||
|
Value::String {
|
||||||
|
val: "c:\\some\\path;c:\\some\\other\\path".to_string(),
|
||||||
|
span: nu_protocol::Span::new(0, dir_str.len()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
#[cfg(not(windows))]
|
||||||
|
stack.add_env_var(
|
||||||
|
"PATH".to_string(),
|
||||||
|
Value::String {
|
||||||
|
val: "/some/path:/some/other/path".to_string(),
|
||||||
|
span: nu_protocol::Span::new(0, dir_str.len()),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// Merge environment into the permanent state
|
// Merge environment into the permanent state
|
||||||
let merge_result = engine_state.merge_env(&mut stack, &dir);
|
let merge_result = engine_state.merge_env(&mut stack, &dir);
|
||||||
|
@ -5,18 +5,21 @@ repository = "https://github.com/nushell/nushell/tree/main/crates/nu-color-confi
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "nu-color-config"
|
name = "nu-color-config"
|
||||||
version = "0.73.0"
|
version = "0.76.0"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
bench = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { version="1.0.123", features=["derive"] }
|
serde = { version="1.0.123", features=["derive"] }
|
||||||
# used only for text_style Alignments
|
# used only for text_style Alignments
|
||||||
tabled = { version = "0.10.0", features = ["color"], default-features = false }
|
tabled = { version = "0.10.0", features = ["color"], default-features = false }
|
||||||
|
|
||||||
nu-protocol = { path = "../nu-protocol", version = "0.73.0" }
|
nu-protocol = { path = "../nu-protocol", version = "0.76.0" }
|
||||||
nu-ansi-term = "0.46.0"
|
nu-ansi-term = "0.46.0"
|
||||||
nu-utils = { path = "../nu-utils", version = "0.73.0" }
|
nu-utils = { path = "../nu-utils", version = "0.76.0" }
|
||||||
nu-engine = { path = "../nu-engine", version = "0.73.0" }
|
nu-engine = { path = "../nu-engine", version = "0.76.0" }
|
||||||
nu-json = { path="../nu-json", version = "0.73.0" }
|
nu-json = { path="../nu-json", version = "0.76.0" }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
nu-test-support = { path="../nu-test-support", version = "0.73.0" }
|
nu-test-support = { path="../nu-test-support", version = "0.76.0" }
|
||||||
|
@ -65,7 +65,7 @@ fn color_to_string(color: Color) -> Option<String> {
|
|||||||
Color::White => Some(String::from("white")),
|
Color::White => Some(String::from("white")),
|
||||||
Color::LightGray => Some(String::from("light_gray")),
|
Color::LightGray => Some(String::from("light_gray")),
|
||||||
Color::Default => Some(String::from("default")),
|
Color::Default => Some(String::from("default")),
|
||||||
Color::Rgb(r, g, b) => Some(format!("#{:X}{:X}{:X}", r, g, b)),
|
Color::Rgb(r, g, b) => Some(format!("#{r:X}{g:X}{b:X}")),
|
||||||
Color::Fixed(_) => None,
|
Color::Fixed(_) => None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,45 +1,56 @@
|
|||||||
use crate::color_config::lookup_ansi_color_style;
|
use crate::{color_config::lookup_ansi_color_style, color_record_to_nustyle};
|
||||||
use nu_ansi_term::{Color, Style};
|
use nu_ansi_term::{Color, Style};
|
||||||
use nu_protocol::Config;
|
use nu_protocol::{Config, Value};
|
||||||
|
|
||||||
|
// The default colors for shapes, used when there is no config for them.
|
||||||
|
pub fn default_shape_color(shape: String) -> Style {
|
||||||
|
match shape.as_ref() {
|
||||||
|
"shape_and" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_binary" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_block" => Style::new().fg(Color::Blue).bold(),
|
||||||
|
"shape_bool" => Style::new().fg(Color::LightCyan),
|
||||||
|
"shape_custom" => Style::new().fg(Color::Green),
|
||||||
|
"shape_datetime" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_directory" => Style::new().fg(Color::Cyan),
|
||||||
|
"shape_external" => Style::new().fg(Color::Cyan),
|
||||||
|
"shape_externalarg" => Style::new().fg(Color::Green).bold(),
|
||||||
|
"shape_filepath" => Style::new().fg(Color::Cyan),
|
||||||
|
"shape_flag" => Style::new().fg(Color::Blue).bold(),
|
||||||
|
"shape_float" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(),
|
||||||
|
"shape_globpattern" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_int" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_internalcall" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_list" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_literal" => Style::new().fg(Color::Blue),
|
||||||
|
"shape_nothing" => Style::new().fg(Color::LightCyan),
|
||||||
|
"shape_operator" => Style::new().fg(Color::Yellow),
|
||||||
|
"shape_or" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_pipe" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_range" => Style::new().fg(Color::Yellow).bold(),
|
||||||
|
"shape_record" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_redirection" => Style::new().fg(Color::Purple).bold(),
|
||||||
|
"shape_signature" => Style::new().fg(Color::Green).bold(),
|
||||||
|
"shape_string" => Style::new().fg(Color::Green),
|
||||||
|
"shape_string_interpolation" => Style::new().fg(Color::Cyan).bold(),
|
||||||
|
"shape_table" => Style::new().fg(Color::Blue).bold(),
|
||||||
|
"shape_variable" => Style::new().fg(Color::Purple),
|
||||||
|
_ => Style::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_shape_color(shape: String, conf: &Config) -> Style {
|
pub fn get_shape_color(shape: String, conf: &Config) -> Style {
|
||||||
match conf.color_config.get(shape.as_str()) {
|
match conf.color_config.get(shape.as_str()) {
|
||||||
Some(int_color) => match int_color.as_string() {
|
Some(int_color) => {
|
||||||
Ok(int_color) => lookup_ansi_color_style(&int_color),
|
// Shapes do not use color_config closures, currently.
|
||||||
Err(_) => Style::default(),
|
match int_color {
|
||||||
},
|
Value::Record { .. } => color_record_to_nustyle(int_color),
|
||||||
None => match shape.as_ref() {
|
Value::String { val, .. } => lookup_ansi_color_style(val),
|
||||||
"shape_and" => Style::new().fg(Color::Purple).bold(),
|
// Defer to the default in the event of incorrect types being given
|
||||||
"shape_binary" => Style::new().fg(Color::Purple).bold(),
|
// (i.e. treat null, etc. as the value being unset)
|
||||||
"shape_block" => Style::new().fg(Color::Blue).bold(),
|
_ => default_shape_color(shape),
|
||||||
"shape_bool" => Style::new().fg(Color::LightCyan),
|
}
|
||||||
"shape_custom" => Style::new().fg(Color::Green),
|
}
|
||||||
"shape_datetime" => Style::new().fg(Color::Cyan).bold(),
|
None => default_shape_color(shape),
|
||||||
"shape_directory" => Style::new().fg(Color::Cyan),
|
|
||||||
"shape_external" => Style::new().fg(Color::Cyan),
|
|
||||||
"shape_externalarg" => Style::new().fg(Color::Green).bold(),
|
|
||||||
"shape_filepath" => Style::new().fg(Color::Cyan),
|
|
||||||
"shape_flag" => Style::new().fg(Color::Blue).bold(),
|
|
||||||
"shape_float" => Style::new().fg(Color::Purple).bold(),
|
|
||||||
"shape_garbage" => Style::new().fg(Color::White).on(Color::Red).bold(),
|
|
||||||
"shape_globpattern" => Style::new().fg(Color::Cyan).bold(),
|
|
||||||
"shape_int" => Style::new().fg(Color::Purple).bold(),
|
|
||||||
"shape_internalcall" => Style::new().fg(Color::Cyan).bold(),
|
|
||||||
"shape_list" => Style::new().fg(Color::Cyan).bold(),
|
|
||||||
"shape_literal" => Style::new().fg(Color::Blue),
|
|
||||||
"shape_nothing" => Style::new().fg(Color::LightCyan),
|
|
||||||
"shape_operator" => Style::new().fg(Color::Yellow),
|
|
||||||
"shape_or" => Style::new().fg(Color::Purple).bold(),
|
|
||||||
"shape_pipe" => Style::new().fg(Color::Purple).bold(),
|
|
||||||
"shape_range" => Style::new().fg(Color::Yellow).bold(),
|
|
||||||
"shape_record" => Style::new().fg(Color::Cyan).bold(),
|
|
||||||
"shape_redirection" => Style::new().fg(Color::Purple).bold(),
|
|
||||||
"shape_signature" => Style::new().fg(Color::Green).bold(),
|
|
||||||
"shape_string" => Style::new().fg(Color::Green),
|
|
||||||
"shape_string_interpolation" => Style::new().fg(Color::Cyan).bold(),
|
|
||||||
"shape_table" => Style::new().fg(Color::Blue).bold(),
|
|
||||||
"shape_variable" => Style::new().fg(Color::Purple),
|
|
||||||
_ => Style::default(),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -126,7 +126,7 @@ impl<'a> StyleComputer<'a> {
|
|||||||
|
|
||||||
Value::Filesize { .. } => TextStyle::with_style(AlignmentHorizontal::Right, s),
|
Value::Filesize { .. } => TextStyle::with_style(AlignmentHorizontal::Right, s),
|
||||||
|
|
||||||
Value::Duration { .. } => TextStyle::with_style(AlignmentHorizontal::Left, s),
|
Value::Duration { .. } => TextStyle::with_style(AlignmentHorizontal::Right, s),
|
||||||
|
|
||||||
Value::Date { .. } => TextStyle::with_style(AlignmentHorizontal::Left, s),
|
Value::Date { .. } => TextStyle::with_style(AlignmentHorizontal::Left, s),
|
||||||
|
|
||||||
@ -226,10 +226,10 @@ fn test_computable_style_static() {
|
|||||||
let style2 = Style::default().underline();
|
let style2 = Style::default().underline();
|
||||||
// Create a "dummy" style_computer for this test.
|
// Create a "dummy" style_computer for this test.
|
||||||
let dummy_engine_state = EngineState::new();
|
let dummy_engine_state = EngineState::new();
|
||||||
let mut dummy_stack = Stack::new();
|
let dummy_stack = Stack::new();
|
||||||
let style_computer = StyleComputer::new(
|
let style_computer = StyleComputer::new(
|
||||||
&dummy_engine_state,
|
&dummy_engine_state,
|
||||||
&mut dummy_stack,
|
&dummy_stack,
|
||||||
HashMap::from([
|
HashMap::from([
|
||||||
("string".into(), ComputableStyle::Static(style1)),
|
("string".into(), ComputableStyle::Static(style1)),
|
||||||
("row_index".into(), ComputableStyle::Static(style2)),
|
("row_index".into(), ComputableStyle::Static(style2)),
|
||||||
|
@ -1,114 +1,118 @@
|
|||||||
[package]
|
[package]
|
||||||
authors = ["The Nushell Project Developers"]
|
authors = ["The Nushell Project Developers"]
|
||||||
|
build = "build.rs"
|
||||||
description = "Nushell's built-in commands"
|
description = "Nushell's built-in commands"
|
||||||
repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
|
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
name = "nu-command"
|
name = "nu-command"
|
||||||
version = "0.73.0"
|
repository = "https://github.com/nushell/nushell/tree/main/crates/nu-command"
|
||||||
build = "build.rs"
|
version = "0.76.0"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
bench = false
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
nu-color-config = { path = "../nu-color-config", version = "0.73.0" }
|
|
||||||
nu-engine = { path = "../nu-engine", version = "0.73.0" }
|
|
||||||
nu-glob = { path = "../nu-glob", version = "0.73.0" }
|
|
||||||
nu-json = { path = "../nu-json", version = "0.73.0" }
|
|
||||||
nu-parser = { path = "../nu-parser", version = "0.73.0" }
|
|
||||||
nu-path = { path = "../nu-path", version = "0.73.0" }
|
|
||||||
nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.73.0" }
|
|
||||||
nu-protocol = { path = "../nu-protocol", version = "0.73.0" }
|
|
||||||
nu-system = { path = "../nu-system", version = "0.73.0" }
|
|
||||||
nu-table = { path = "../nu-table", version = "0.73.0" }
|
|
||||||
nu-term-grid = { path = "../nu-term-grid", version = "0.73.0" }
|
|
||||||
nu-utils = { path = "../nu-utils", version = "0.73.0" }
|
|
||||||
nu-explore = { path = "../nu-explore", version = "0.73.0" }
|
|
||||||
nu-ansi-term = "0.46.0"
|
nu-ansi-term = "0.46.0"
|
||||||
|
nu-color-config = { path = "../nu-color-config", version = "0.76.0" }
|
||||||
|
nu-engine = { path = "../nu-engine", version = "0.76.0" }
|
||||||
|
nu-explore = { path = "../nu-explore", version = "0.76.0" }
|
||||||
|
nu-glob = { path = "../nu-glob", version = "0.76.0" }
|
||||||
|
nu-json = { path = "../nu-json", version = "0.76.0" }
|
||||||
|
nu-parser = { path = "../nu-parser", version = "0.76.0" }
|
||||||
|
nu-path = { path = "../nu-path", version = "0.76.0" }
|
||||||
|
nu-pretty-hex = { path = "../nu-pretty-hex", version = "0.76.0" }
|
||||||
|
nu-protocol = { path = "../nu-protocol", version = "0.76.0" }
|
||||||
|
nu-system = { path = "../nu-system", version = "0.76.0" }
|
||||||
|
nu-table = { path = "../nu-table", version = "0.76.0" }
|
||||||
|
nu-term-grid = { path = "../nu-term-grid", version = "0.76.0" }
|
||||||
|
nu-utils = { path = "../nu-utils", version = "0.76.0" }
|
||||||
num-format = { version = "0.4.3" }
|
num-format = { version = "0.4.3" }
|
||||||
|
|
||||||
# Potential dependencies for extras
|
# Potential dependencies for extras
|
||||||
|
Inflector = "0.11"
|
||||||
alphanumeric-sort = "1.4.4"
|
alphanumeric-sort = "1.4.4"
|
||||||
atty = "0.2.14"
|
atty = "0.2.14"
|
||||||
base64 = "0.13.0"
|
base64 = "0.21.0"
|
||||||
byteorder = "1.4.3"
|
byteorder = "1.4.3"
|
||||||
bytesize = "1.1.0"
|
bytesize = "1.1.0"
|
||||||
calamine = "0.19.1"
|
calamine = "0.19.1"
|
||||||
chrono = { version = "0.4.23", features = ["unstable-locales", "std"], default-features = false }
|
chrono = { version = "0.4.23", features = ["std", "unstable-locales"], default-features = false }
|
||||||
chrono-humanize = "0.2.1"
|
chrono-humanize = "0.2.1"
|
||||||
chrono-tz = "0.6.3"
|
chrono-tz = "0.8.1"
|
||||||
crossterm = "0.24.0"
|
crossterm = "0.24.0"
|
||||||
csv = "1.1.6"
|
csv = "1.1.6"
|
||||||
dialoguer = { default-features = false, version = "0.9.0" }
|
dialoguer = { default-features = false, version = "0.10.3" }
|
||||||
digest = { default-features = false, version = "0.10.0" }
|
digest = { default-features = false, version = "0.10.0" }
|
||||||
dtparse = "1.2.0"
|
dtparse = "1.2.0"
|
||||||
eml-parser = "0.1.0"
|
|
||||||
encoding_rs = "0.8.30"
|
encoding_rs = "0.8.30"
|
||||||
fancy-regex = "0.10.0"
|
fancy-regex = "0.11.0"
|
||||||
filesize = "0.2.0"
|
filesize = "0.2.0"
|
||||||
filetime = "0.2.15"
|
filetime = "0.2.15"
|
||||||
fs_extra = "1.2.0"
|
fs_extra = "1.3.0"
|
||||||
htmlescape = "0.3.1"
|
htmlescape = "0.3.1"
|
||||||
ical = "0.7.0"
|
indexmap = { version = "1.7", features = ["serde-1"] }
|
||||||
indexmap = { version="1.7", features=["serde-1"] }
|
indicatif = "0.17.2"
|
||||||
Inflector = "0.11"
|
|
||||||
is-root = "0.1.2"
|
is-root = "0.1.2"
|
||||||
itertools = "0.10.0"
|
itertools = "0.10.0"
|
||||||
log = "0.4.14"
|
log = "0.4.14"
|
||||||
lscolors = { version = "0.12.0", features = ["crossterm"], default-features = false }
|
lscolors = { version = "0.12.0", features = ["crossterm"], default-features = false }
|
||||||
md5 = { package = "md-5", version = "0.10.0" }
|
md5 = { package = "md-5", version = "0.10.0" }
|
||||||
meval = "0.2.0"
|
|
||||||
mime = "0.3.16"
|
mime = "0.3.16"
|
||||||
|
mime_guess = "2.0.4"
|
||||||
notify = "4.0.17"
|
notify = "4.0.17"
|
||||||
num = { version = "0.4.0", optional = true }
|
num = { version = "0.4.0", optional = true }
|
||||||
num-traits = "0.2.14"
|
num-traits = "0.2.14"
|
||||||
once_cell = "1.0"
|
once_cell = "1.17"
|
||||||
|
open = "3.2.0"
|
||||||
pathdiff = "0.2.1"
|
pathdiff = "0.2.1"
|
||||||
powierza-coefficient = "1.0.1"
|
powierza-coefficient = "1.0.2"
|
||||||
quick-xml = "0.25"
|
quick-xml = "0.27"
|
||||||
rand = "0.8"
|
rand = "0.8"
|
||||||
rayon = "1.5.1"
|
rayon = "1.6.1"
|
||||||
regex = "1.6.0"
|
regex = "1.7.1"
|
||||||
reqwest = {version = "0.11", features = ["blocking", "json"] }
|
reqwest = { version = "0.11", features = ["blocking", "json"] }
|
||||||
roxmltree = "0.16.0"
|
roxmltree = "0.18.0"
|
||||||
rust-embed = "6.3.0"
|
rust-embed = "6.3.0"
|
||||||
same-file = "1.0.6"
|
same-file = "1.0.6"
|
||||||
serde = { version="1.0.123", features=["derive"] }
|
serde = { version = "1.0.123", features = ["derive"] }
|
||||||
serde_ini = "0.2.0"
|
|
||||||
serde_urlencoded = "0.7.0"
|
serde_urlencoded = "0.7.0"
|
||||||
serde_yaml = "0.9.4"
|
serde_yaml = "0.9.4"
|
||||||
sha2 = "0.10.0"
|
sha2 = "0.10.0"
|
||||||
# Disable default features b/c the default features build Git (very slow to compile)
|
# Disable default features b/c the default features build Git (very slow to compile)
|
||||||
shadow-rs = { version = "0.16.1", default-features = false }
|
percent-encoding = "2.2.0"
|
||||||
sysinfo = "0.26.2"
|
reedline = { version = "0.16.0", features = ["bashisms", "sqlite"] }
|
||||||
|
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
|
||||||
|
shadow-rs = { version = "0.20.0", default-features = false }
|
||||||
|
sqlparser = { version = "0.30.0", features = ["serde"], optional = true }
|
||||||
|
sysinfo = "0.28.0"
|
||||||
|
tabled = "0.10.0"
|
||||||
terminal_size = "0.2.1"
|
terminal_size = "0.2.1"
|
||||||
thiserror = "1.0.31"
|
thiserror = "1.0.31"
|
||||||
titlecase = "2.0.0"
|
titlecase = "2.0.0"
|
||||||
toml = "0.5.8"
|
toml = "0.7.1"
|
||||||
unicode-segmentation = "1.8.0"
|
unicode-segmentation = "1.10.0"
|
||||||
|
unicode-width = "0.1.10"
|
||||||
url = "2.2.1"
|
url = "2.2.1"
|
||||||
uuid = { version = "1.1.2", features = ["v4"] }
|
uuid = { version = "1.2.2", features = ["v4"] }
|
||||||
which = { version = "4.3.0", optional = true }
|
wax = { version = "0.5.0" }
|
||||||
reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
|
which = { version = "4.4.0", optional = true }
|
||||||
wax = { version = "0.5.0" }
|
print-positions = "0.6.1"
|
||||||
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
|
|
||||||
sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
|
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies]
|
[target.'cfg(windows)'.dependencies]
|
||||||
winreg = "0.10.1"
|
winreg = "0.11.0"
|
||||||
|
|
||||||
[target.'cfg(unix)'.dependencies]
|
[target.'cfg(unix)'.dependencies]
|
||||||
|
libc = "0.2"
|
||||||
umask = "2.0.0"
|
umask = "2.0.0"
|
||||||
users = "0.11.0"
|
users = "0.11.0"
|
||||||
libc = "0.2"
|
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies.trash]
|
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies.trash]
|
||||||
version = "3.0.0"
|
|
||||||
optional = true
|
optional = true
|
||||||
|
version = "3.0.1"
|
||||||
|
|
||||||
[dependencies.polars]
|
[dependencies.polars]
|
||||||
version = "0.25.0"
|
|
||||||
optional = true
|
|
||||||
features = [
|
features = [
|
||||||
"arg_where",
|
"arg_where",
|
||||||
"checked_arithmetic",
|
"checked_arithmetic",
|
||||||
@ -117,9 +121,9 @@ features = [
|
|||||||
"csv-file",
|
"csv-file",
|
||||||
"cum_agg",
|
"cum_agg",
|
||||||
"default",
|
"default",
|
||||||
|
"dtype-categorical",
|
||||||
"dtype-datetime",
|
"dtype-datetime",
|
||||||
"dtype-struct",
|
"dtype-struct",
|
||||||
"dtype-categorical",
|
|
||||||
"dynamic_groupby",
|
"dynamic_groupby",
|
||||||
"ipc",
|
"ipc",
|
||||||
"is_in",
|
"is_in",
|
||||||
@ -136,31 +140,29 @@ features = [
|
|||||||
"strings",
|
"strings",
|
||||||
"to_dummies",
|
"to_dummies",
|
||||||
]
|
]
|
||||||
|
optional = true
|
||||||
|
version = "0.26.1"
|
||||||
|
|
||||||
[target.'cfg(windows)'.dependencies.windows]
|
[target.'cfg(windows)'.dependencies.windows]
|
||||||
version = "0.43.0"
|
features = ["Win32_Foundation", "Win32_Storage_FileSystem", "Win32_System_SystemServices"]
|
||||||
features = [
|
version = "0.44.0"
|
||||||
"Win32_Foundation",
|
|
||||||
"Win32_Storage_FileSystem",
|
|
||||||
"Win32_System_SystemServices",
|
|
||||||
]
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
|
dataframe = ["num", "polars", "sqlparser"]
|
||||||
|
plugin = ["nu-parser/plugin"]
|
||||||
|
sqlite = ["rusqlite"] # TODO: given that rusqlite is included in reedline, should we just always include it?
|
||||||
trash-support = ["trash"]
|
trash-support = ["trash"]
|
||||||
which-support = ["which"]
|
which-support = ["which"]
|
||||||
plugin = ["nu-parser/plugin"]
|
|
||||||
dataframe = ["polars", "num", "sqlparser"]
|
|
||||||
sqlite = ["rusqlite"] # TODO: given that rusqlite is included in reedline, should we just always include it?
|
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
shadow-rs = { version = "0.16.1", default-features = false }
|
shadow-rs = { version = "0.20.0", default-features = false }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
nu-test-support = { path = "../nu-test-support", version = "0.73.0" }
|
nu-test-support = { path = "../nu-test-support", version = "0.76.0" }
|
||||||
|
|
||||||
hamcrest2 = "0.3.0"
|
|
||||||
dirs-next = "2.0.0"
|
dirs-next = "2.0.0"
|
||||||
proptest = "1.0.0"
|
hamcrest2 = "0.3.0"
|
||||||
|
proptest = "1.1.0"
|
||||||
quickcheck = "1.0.3"
|
quickcheck = "1.0.3"
|
||||||
quickcheck_macros = "1.0.0"
|
quickcheck_macros = "1.0.0"
|
||||||
rstest = {version = "0.15.0", default-features = false}
|
rstest = { version = "0.16.0", default-features = false }
|
||||||
|
@ -4,7 +4,7 @@ fn main() -> shadow_rs::SdResult<()> {
|
|||||||
// Look up the current Git commit ourselves instead of relying on shadow_rs,
|
// Look up the current Git commit ourselves instead of relying on shadow_rs,
|
||||||
// because shadow_rs does it in a really slow-to-compile way (it builds libgit2)
|
// because shadow_rs does it in a really slow-to-compile way (it builds libgit2)
|
||||||
let hash = get_git_hash().unwrap_or_default();
|
let hash = get_git_hash().unwrap_or_default();
|
||||||
println!("cargo:rustc-env=NU_COMMIT_HASH={}", hash);
|
println!("cargo:rustc-env=NU_COMMIT_HASH={hash}");
|
||||||
|
|
||||||
shadow_rs::new()
|
shadow_rs::new()
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,14 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let target: i64 = call.req(engine_state, stack, 0)?;
|
let target: i64 = call.req(engine_state, stack, 0)?;
|
||||||
|
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, target, head),
|
move |value| operate(value, target, head),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -54,7 +58,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Apply bits and to two numbers",
|
description: "Apply bits and to two numbers",
|
||||||
example: "2 | bits and 2",
|
example: "2 | bits and 2",
|
||||||
result: Some(Value::int(2, Span::test_data())),
|
result: Some(Value::test_int(2)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Apply logical and to a list of numbers",
|
description: "Apply logical and to a list of numbers",
|
||||||
@ -74,13 +78,15 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
|
|||||||
val: val & target,
|
val: val & target,
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::get_full_help;
|
|||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
ast::Call,
|
ast::Call,
|
||||||
engine::{Command, EngineState, Stack},
|
engine::{Command, EngineState, Stack},
|
||||||
Category, IntoPipelineData, PipelineData, Signature, Value,
|
Category, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -14,20 +14,26 @@ impl Command for Bits {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("bits").category(Category::Bits)
|
Signature::build("bits")
|
||||||
|
.category(Category::Bits)
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::String)])
|
||||||
}
|
}
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
fn usage(&self) -> &str {
|
||||||
"Various commands for working with bits"
|
"Various commands for working with bits"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn extra_usage(&self) -> &str {
|
||||||
|
"You must use one of the following subcommands. Using this command as-is will only produce this help message."
|
||||||
|
}
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(Value::String {
|
Ok(Value::String {
|
||||||
val: get_full_help(
|
val: get_full_help(
|
||||||
&Bits.signature(),
|
&Bits.signature(),
|
||||||
@ -41,15 +47,3 @@ impl Command for Bits {
|
|||||||
.into_pipeline_data())
|
.into_pipeline_data())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use crate::Bits;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_examples() {
|
|
||||||
use crate::test_examples;
|
|
||||||
|
|
||||||
test_examples(Bits {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -46,7 +46,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
let number_bytes: Option<Spanned<String>> =
|
let number_bytes: Option<Spanned<String>> =
|
||||||
@ -56,11 +56,17 @@ impl Command for SubCommand {
|
|||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
val.span,
|
val.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, head, signed, bytes_len),
|
move |value| operate(value, head, signed, bytes_len),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -140,14 +146,17 @@ fn operate(value: Value, head: Span, signed: bool, number_size: NumberBytes) ->
|
|||||||
Value::Int { val: out_val, span }
|
Value::Int { val: out_val, span }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
other => Value::Error {
|
other => match other {
|
||||||
error: ShellError::UnsupportedInput(
|
// Propagate errors inside the value
|
||||||
format!(
|
Value::Error { .. } => other,
|
||||||
"Only numerical values are supported, input type: {:?}",
|
_ => Value::Error {
|
||||||
other.get_type()
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"numeric".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
|
head,
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
other.span().unwrap_or(head),
|
},
|
||||||
),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,14 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let target: i64 = call.req(engine_state, stack, 0)?;
|
let target: i64 = call.req(engine_state, stack, 0)?;
|
||||||
|
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, target, head),
|
move |value| operate(value, target, head),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -54,7 +58,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Apply bits or to two numbers",
|
description: "Apply bits or to two numbers",
|
||||||
example: "2 | bits or 6",
|
example: "2 | bits or 6",
|
||||||
result: Some(Value::int(6, Span::test_data())),
|
result: Some(Value::test_int(6)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Apply logical or to a list of numbers",
|
description: "Apply logical or to a list of numbers",
|
||||||
@ -74,13 +78,15 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
|
|||||||
val: val | target,
|
val: val | target,
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let bits: usize = call.req(engine_state, stack, 0)?;
|
let bits: usize = call.req(engine_state, stack, 0)?;
|
||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
@ -60,11 +60,16 @@ impl Command for SubCommand {
|
|||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
val.span,
|
val.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, bits, head, signed, bytes_len),
|
move |value| operate(value, bits, head, signed, bytes_len),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -76,7 +81,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Rotate left a number with 2 bits",
|
description: "Rotate left a number with 2 bits",
|
||||||
example: "17 | bits rol 2",
|
example: "17 | bits rol 2",
|
||||||
result: Some(Value::int(68, Span::test_data())),
|
result: Some(Value::test_int(68)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Rotate left a list of numbers with 2 bits",
|
description: "Rotate left a list of numbers with 2 bits",
|
||||||
@ -101,8 +106,7 @@ where
|
|||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Rotate left result beyond the range of 64 bit signed number".to_string(),
|
"Rotate left result beyond the range of 64 bit signed number".to_string(),
|
||||||
format!(
|
format!(
|
||||||
"{} of the specified number of bytes rotate left {} bits exceed limit",
|
"{val} of the specified number of bytes rotate left {bits} bits exceed limit"
|
||||||
val, bits
|
|
||||||
),
|
),
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
@ -127,16 +131,18 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
|
|||||||
SignedOne => get_rotate_left(val as i8, bits, span),
|
SignedOne => get_rotate_left(val as i8, bits, span),
|
||||||
SignedTwo => get_rotate_left(val as i16, bits, span),
|
SignedTwo => get_rotate_left(val as i16, bits, span),
|
||||||
SignedFour => get_rotate_left(val as i32, bits, span),
|
SignedFour => get_rotate_left(val as i32, bits, span),
|
||||||
SignedEight => get_rotate_left(val as i64, bits, span),
|
SignedEight => get_rotate_left(val, bits, span),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let bits: usize = call.req(engine_state, stack, 0)?;
|
let bits: usize = call.req(engine_state, stack, 0)?;
|
||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
@ -60,11 +60,16 @@ impl Command for SubCommand {
|
|||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
val.span,
|
val.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, bits, head, signed, bytes_len),
|
move |value| operate(value, bits, head, signed, bytes_len),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -76,7 +81,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Rotate right a number with 60 bits",
|
description: "Rotate right a number with 60 bits",
|
||||||
example: "17 | bits ror 60",
|
example: "17 | bits ror 60",
|
||||||
result: Some(Value::int(272, Span::test_data())),
|
result: Some(Value::test_int(272)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Rotate right a list of numbers of one byte",
|
description: "Rotate right a list of numbers of one byte",
|
||||||
@ -105,8 +110,7 @@ where
|
|||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Rotate right result beyond the range of 64 bit signed number".to_string(),
|
"Rotate right result beyond the range of 64 bit signed number".to_string(),
|
||||||
format!(
|
format!(
|
||||||
"{} of the specified number of bytes rotate right {} bits exceed limit",
|
"{val} of the specified number of bytes rotate right {bits} bits exceed limit"
|
||||||
val, bits
|
|
||||||
),
|
),
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
@ -131,16 +135,18 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
|
|||||||
SignedOne => get_rotate_right(val as i8, bits, span),
|
SignedOne => get_rotate_right(val as i8, bits, span),
|
||||||
SignedTwo => get_rotate_right(val as i16, bits, span),
|
SignedTwo => get_rotate_right(val as i16, bits, span),
|
||||||
SignedFour => get_rotate_right(val as i32, bits, span),
|
SignedFour => get_rotate_right(val as i32, bits, span),
|
||||||
SignedEight => get_rotate_right(val as i64, bits, span),
|
SignedEight => get_rotate_right(val, bits, span),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let bits: usize = call.req(engine_state, stack, 0)?;
|
let bits: usize = call.req(engine_state, stack, 0)?;
|
||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
@ -60,11 +60,16 @@ impl Command for SubCommand {
|
|||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
val.span,
|
val.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, bits, head, signed, bytes_len),
|
move |value| operate(value, bits, head, signed, bytes_len),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -76,17 +81,17 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Shift left a number by 7 bits",
|
description: "Shift left a number by 7 bits",
|
||||||
example: "2 | bits shl 7",
|
example: "2 | bits shl 7",
|
||||||
result: Some(Value::int(256, Span::test_data())),
|
result: Some(Value::test_int(256)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Shift left a number with 1 byte by 7 bits",
|
description: "Shift left a number with 1 byte by 7 bits",
|
||||||
example: "2 | bits shl 7 -n 1",
|
example: "2 | bits shl 7 -n 1",
|
||||||
result: Some(Value::int(0, Span::test_data())),
|
result: Some(Value::test_int(0)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Shift left a signed number by 1 bit",
|
description: "Shift left a signed number by 1 bit",
|
||||||
example: "0x7F | bits shl 1 -s",
|
example: "0x7F | bits shl 1 -s",
|
||||||
result: Some(Value::int(254, Span::test_data())),
|
result: Some(Value::test_int(254)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Shift left a list of numbers",
|
description: "Shift left a list of numbers",
|
||||||
@ -113,8 +118,7 @@ where
|
|||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Shift left result beyond the range of 64 bit signed number".to_string(),
|
"Shift left result beyond the range of 64 bit signed number".to_string(),
|
||||||
format!(
|
format!(
|
||||||
"{} of the specified number of bytes shift left {} bits exceed limit",
|
"{val} of the specified number of bytes shift left {bits} bits exceed limit"
|
||||||
val, bits
|
|
||||||
),
|
),
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
@ -126,10 +130,7 @@ where
|
|||||||
None => Value::Error {
|
None => Value::Error {
|
||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Shift left failed".to_string(),
|
"Shift left failed".to_string(),
|
||||||
format!(
|
format!("{val} shift left {bits} bits failed, you may shift too many bits"),
|
||||||
"{} shift left {} bits failed, you may shift too many bits",
|
|
||||||
val, bits
|
|
||||||
),
|
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
Vec::new(),
|
Vec::new(),
|
||||||
@ -153,16 +154,18 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
|
|||||||
SignedOne => get_shift_left(val as i8, bits, span),
|
SignedOne => get_shift_left(val as i8, bits, span),
|
||||||
SignedTwo => get_shift_left(val as i16, bits, span),
|
SignedTwo => get_shift_left(val as i16, bits, span),
|
||||||
SignedFour => get_shift_left(val as i32, bits, span),
|
SignedFour => get_shift_left(val as i32, bits, span),
|
||||||
SignedEight => get_shift_left(val as i64, bits, span),
|
SignedEight => get_shift_left(val, bits, span),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let bits: usize = call.req(engine_state, stack, 0)?;
|
let bits: usize = call.req(engine_state, stack, 0)?;
|
||||||
let signed = call.has_flag("signed");
|
let signed = call.has_flag("signed");
|
||||||
@ -60,11 +60,16 @@ impl Command for SubCommand {
|
|||||||
if let Some(val) = number_bytes {
|
if let Some(val) = number_bytes {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
"Only 1, 2, 4, 8, or 'auto' bytes are supported as word sizes".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
val.span,
|
val.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, bits, head, signed, bytes_len),
|
move |value| operate(value, bits, head, signed, bytes_len),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -76,7 +81,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Shift right a number with 2 bits",
|
description: "Shift right a number with 2 bits",
|
||||||
example: "8 | bits shr 2",
|
example: "8 | bits shr 2",
|
||||||
result: Some(Value::int(2, Span::test_data())),
|
result: Some(Value::test_int(2)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Shift right a list of numbers",
|
description: "Shift right a list of numbers",
|
||||||
@ -103,8 +108,7 @@ where
|
|||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Shift right result beyond the range of 64 bit signed number".to_string(),
|
"Shift right result beyond the range of 64 bit signed number".to_string(),
|
||||||
format!(
|
format!(
|
||||||
"{} of the specified number of bytes shift right {} bits exceed limit",
|
"{val} of the specified number of bytes shift right {bits} bits exceed limit"
|
||||||
val, bits
|
|
||||||
),
|
),
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
@ -116,10 +120,7 @@ where
|
|||||||
None => Value::Error {
|
None => Value::Error {
|
||||||
error: ShellError::GenericError(
|
error: ShellError::GenericError(
|
||||||
"Shift right failed".to_string(),
|
"Shift right failed".to_string(),
|
||||||
format!(
|
format!("{val} shift right {bits} bits failed, you may shift too many bits"),
|
||||||
"{} shift right {} bits failed, you may shift too many bits",
|
|
||||||
val, bits
|
|
||||||
),
|
|
||||||
Some(span),
|
Some(span),
|
||||||
None,
|
None,
|
||||||
Vec::new(),
|
Vec::new(),
|
||||||
@ -143,16 +144,18 @@ fn operate(value: Value, bits: usize, head: Span, signed: bool, number_size: Num
|
|||||||
SignedOne => get_shift_right(val as i8, bits, span),
|
SignedOne => get_shift_right(val as i8, bits, span),
|
||||||
SignedTwo => get_shift_right(val as i16, bits, span),
|
SignedTwo => get_shift_right(val as i16, bits, span),
|
||||||
SignedFour => get_shift_right(val as i32, bits, span),
|
SignedFour => get_shift_right(val as i32, bits, span),
|
||||||
SignedEight => get_shift_right(val as i64, bits, span),
|
SignedEight => get_shift_right(val, bits, span),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -39,10 +39,13 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let target: i64 = call.req(engine_state, stack, 0)?;
|
let target: i64 = call.req(engine_state, stack, 0)?;
|
||||||
|
// This doesn't match explicit nulls
|
||||||
|
if matches!(input, PipelineData::Empty) {
|
||||||
|
return Err(ShellError::PipelineEmpty(head));
|
||||||
|
}
|
||||||
input.map(
|
input.map(
|
||||||
move |value| operate(value, target, head),
|
move |value| operate(value, target, head),
|
||||||
engine_state.ctrlc.clone(),
|
engine_state.ctrlc.clone(),
|
||||||
@ -54,7 +57,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Apply bits xor to two numbers",
|
description: "Apply bits xor to two numbers",
|
||||||
example: "2 | bits xor 2",
|
example: "2 | bits xor 2",
|
||||||
result: Some(Value::int(0, Span::test_data())),
|
result: Some(Value::test_int(0)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Apply logical xor to a list of numbers",
|
description: "Apply logical xor to a list of numbers",
|
||||||
@ -74,13 +77,15 @@ fn operate(value: Value, target: i64, head: Span) -> Value {
|
|||||||
val: val ^ target,
|
val: val ^ target,
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => value,
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Only integer values are supported, input type: {:?}",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(head),
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -122,13 +122,15 @@ fn add(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => add_impl(val, args, *val_span),
|
} => add_impl(val, args, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -30,7 +30,9 @@ fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellEr
|
|||||||
Value::List { mut vals, span } => {
|
Value::List { mut vals, span } => {
|
||||||
if vals.len() != 2 {
|
if vals.len() != 2 {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"More than two indices given".to_string(),
|
"More than two indices in range".to_string(),
|
||||||
|
"value originates from here".to_string(),
|
||||||
|
head,
|
||||||
span,
|
span,
|
||||||
));
|
));
|
||||||
} else {
|
} else {
|
||||||
@ -38,10 +40,14 @@ fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellEr
|
|||||||
let end = match end {
|
let end = match end {
|
||||||
Value::Int { val, .. } => val.to_string(),
|
Value::Int { val, .. } => val.to_string(),
|
||||||
Value::String { val, .. } => val,
|
Value::String { val, .. } => val,
|
||||||
|
// Explicitly propagate errors instead of dropping them.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"could not perform subbytes. Expecting a string or int".to_string(),
|
"Only string or list<int> ranges are supported".into(),
|
||||||
other.span().unwrap_or(head),
|
format!("input type: {:?}", other.get_type()),
|
||||||
|
head,
|
||||||
|
other.expect_span(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -49,10 +55,14 @@ fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellEr
|
|||||||
let start = match start {
|
let start = match start {
|
||||||
Value::Int { val, .. } => val.to_string(),
|
Value::Int { val, .. } => val.to_string(),
|
||||||
Value::String { val, .. } => val,
|
Value::String { val, .. } => val,
|
||||||
|
// Explicitly propagate errors instead of dropping them.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"could not perform subbytes. Expecting a string or int".to_string(),
|
"Only string or list<int> ranges are supported".into(),
|
||||||
other.span().unwrap_or(head),
|
format!("input type: {:?}", other.get_type()),
|
||||||
|
head,
|
||||||
|
other.expect_span(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -60,21 +70,27 @@ fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellEr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Value::String { val, span } => {
|
Value::String { val, span } => {
|
||||||
let splitted_result = val.split_once(',');
|
let split_result = val.split_once(',');
|
||||||
match splitted_result {
|
match split_result {
|
||||||
Some((start, end)) => (start.to_string(), end.to_string(), span),
|
Some((start, end)) => (start.to_string(), end.to_string(), span),
|
||||||
None => {
|
None => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"could not perform subbytes".to_string(),
|
"could not perform subbytes".to_string(),
|
||||||
|
"with this range".to_string(),
|
||||||
|
head,
|
||||||
span,
|
span,
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Explicitly propagate errors instead of dropping them.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::UnsupportedInput(
|
||||||
"could not perform subbytes".to_string(),
|
"could not perform subbytes".to_string(),
|
||||||
other.span().unwrap_or(head),
|
"with this range".to_string(),
|
||||||
|
head,
|
||||||
|
other.expect_span(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -82,28 +98,26 @@ fn parse_range(range: Value, head: Span) -> Result<(isize, isize, Span), ShellEr
|
|||||||
let start: isize = if start.is_empty() || start == "_" {
|
let start: isize = if start.is_empty() || start == "_" {
|
||||||
0
|
0
|
||||||
} else {
|
} else {
|
||||||
match start.trim().parse() {
|
start.trim().parse().map_err(|_| {
|
||||||
Ok(s) => s,
|
ShellError::UnsupportedInput(
|
||||||
Err(_) => {
|
"could not perform subbytes".to_string(),
|
||||||
return Err(ShellError::UnsupportedInput(
|
"with this range".to_string(),
|
||||||
"could not perform subbytes".to_string(),
|
head,
|
||||||
span,
|
span,
|
||||||
))
|
)
|
||||||
}
|
})?
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let end: isize = if end.is_empty() || end == "_" {
|
let end: isize = if end.is_empty() || end == "_" {
|
||||||
isize::max_value()
|
isize::max_value()
|
||||||
} else {
|
} else {
|
||||||
match end.trim().parse() {
|
end.trim().parse().map_err(|_| {
|
||||||
Ok(s) => s,
|
ShellError::UnsupportedInput(
|
||||||
Err(_) => {
|
"could not perform subbytes".to_string(),
|
||||||
return Err(ShellError::UnsupportedInput(
|
"with this range".to_string(),
|
||||||
"could not perform subbytes".to_string(),
|
head,
|
||||||
span,
|
span,
|
||||||
))
|
)
|
||||||
}
|
})?
|
||||||
}
|
|
||||||
};
|
};
|
||||||
Ok((start, end, span))
|
Ok((start, end, span))
|
||||||
}
|
}
|
||||||
@ -232,13 +246,15 @@ fn at(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => at_impl(val, args, *val_span),
|
} => at_impl(val, args, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -262,7 +278,7 @@ fn at_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
|||||||
match start.cmp(&end) {
|
match start.cmp(&end) {
|
||||||
Ordering::Equal => Value::Binary { val: vec![], span },
|
Ordering::Equal => Value::Binary { val: vec![], span },
|
||||||
Ordering::Greater => Value::Error {
|
Ordering::Greater => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::TypeMismatch(
|
||||||
"End must be greater than or equal to Start".to_string(),
|
"End must be greater than or equal to Start".to_string(),
|
||||||
arg.arg_span,
|
arg.arg_span,
|
||||||
),
|
),
|
||||||
|
@ -46,16 +46,18 @@ impl Command for BytesBuild {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let mut output = vec![];
|
let mut output = vec![];
|
||||||
for expr in call.positional_iter() {
|
for expr in call.positional_iter() {
|
||||||
let val = eval_expression(engine_state, stack, expr)?;
|
let val = eval_expression(engine_state, stack, expr)?;
|
||||||
match val {
|
match val {
|
||||||
Value::Binary { mut val, .. } => output.append(&mut val),
|
Value::Binary { mut val, .. } => output.append(&mut val),
|
||||||
|
// Explicitly propagate errors instead of dropping them.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"only support expression which yields to binary data".to_string(),
|
"only binary data arguments are supported".to_string(),
|
||||||
other.span().unwrap_or(call.head),
|
other.expect_span(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::get_full_help;
|
|||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
ast::Call,
|
ast::Call,
|
||||||
engine::{Command, EngineState, Stack},
|
engine::{Command, EngineState, Stack},
|
||||||
Category, IntoPipelineData, PipelineData, Signature, Value,
|
Category, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -14,20 +14,26 @@ impl Command for Bytes {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("bytes").category(Category::Bytes)
|
Signature::build("bytes")
|
||||||
|
.category(Category::Bytes)
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::String)])
|
||||||
}
|
}
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
fn usage(&self) -> &str {
|
||||||
"Various commands for working with byte data"
|
"Various commands for working with byte data"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn extra_usage(&self) -> &str {
|
||||||
|
"You must use one of the following subcommands. Using this command as-is will only produce this help message."
|
||||||
|
}
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(Value::String {
|
Ok(Value::String {
|
||||||
val: get_full_help(
|
val: get_full_help(
|
||||||
&Bytes.signature(),
|
&Bytes.signature(),
|
||||||
@ -41,15 +47,3 @@ impl Command for Bytes {
|
|||||||
.into_pipeline_data())
|
.into_pipeline_data())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use crate::Bytes;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_examples() {
|
|
||||||
use crate::test_examples;
|
|
||||||
|
|
||||||
test_examples(Bytes {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -54,14 +54,16 @@ impl Command for BytesCollect {
|
|||||||
output_binary.append(&mut work_sep)
|
output_binary.append(&mut work_sep)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Explicitly propagate errors instead of dropping them.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"integer".into(),
|
||||||
"The element type is {}, this command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
call.head,
|
||||||
),
|
// This line requires the Value::Error match above.
|
||||||
other.span().unwrap_or(call.head),
|
other.expect_span(),
|
||||||
))
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -68,17 +68,17 @@ impl Command for BytesEndsWith {
|
|||||||
Example {
|
Example {
|
||||||
description: "Checks if binary ends with `0x[AA]`",
|
description: "Checks if binary ends with `0x[AA]`",
|
||||||
example: "0x[1F FF AA AA] | bytes ends-with 0x[AA]",
|
example: "0x[1F FF AA AA] | bytes ends-with 0x[AA]",
|
||||||
result: Some(Value::boolean(true, Span::test_data())),
|
result: Some(Value::test_bool(true)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Checks if binary ends with `0x[FF AA AA]`",
|
description: "Checks if binary ends with `0x[FF AA AA]`",
|
||||||
example: "0x[1F FF AA AA] | bytes ends-with 0x[FF AA AA]",
|
example: "0x[1F FF AA AA] | bytes ends-with 0x[FF AA AA]",
|
||||||
result: Some(Value::boolean(true, Span::test_data())),
|
result: Some(Value::test_bool(true)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Checks if binary ends with `0x[11]`",
|
description: "Checks if binary ends with `0x[11]`",
|
||||||
example: "0x[1F FF AA AA] | bytes ends-with 0x[11]",
|
example: "0x[1F FF AA AA] | bytes ends-with 0x[11]",
|
||||||
result: Some(Value::boolean(false, Span::test_data())),
|
result: Some(Value::test_bool(false)),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -90,13 +90,15 @@ fn ends_with(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => Value::boolean(val.ends_with(&args.pattern), *val_span),
|
} => Value::boolean(val.ends_with(&args.pattern), *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -132,13 +132,15 @@ fn index_of(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => index_of_impl(val, args, *val_span),
|
} => index_of_impl(val, args, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -71,13 +71,15 @@ fn length(val: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => Value::int(val.len() as i64, *val_span),
|
} => Value::int(val.len() as i64, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -61,7 +61,7 @@ impl Command for BytesRemove {
|
|||||||
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
||||||
let pattern_to_remove = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
|
let pattern_to_remove = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
|
||||||
if pattern_to_remove.item.is_empty() {
|
if pattern_to_remove.item.is_empty() {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"the pattern to remove cannot be empty".to_string(),
|
"the pattern to remove cannot be empty".to_string(),
|
||||||
pattern_to_remove.span,
|
pattern_to_remove.span,
|
||||||
));
|
));
|
||||||
@ -139,13 +139,15 @@ fn remove(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => remove_impl(val, args, *val_span),
|
} => remove_impl(val, args, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -159,7 +161,7 @@ fn remove_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
|||||||
|
|
||||||
// Note:
|
// Note:
|
||||||
// remove_all from start and end will generate the same result.
|
// remove_all from start and end will generate the same result.
|
||||||
// so we'll put `remove_all` relative logic into else clouse.
|
// so we'll put `remove_all` relative logic into else clause.
|
||||||
if arg.end && !remove_all {
|
if arg.end && !remove_all {
|
||||||
let (mut left, mut right) = (
|
let (mut left, mut right) = (
|
||||||
input.len() as isize - arg.pattern.len() as isize,
|
input.len() as isize - arg.pattern.len() as isize,
|
||||||
@ -170,7 +172,7 @@ fn remove_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
|||||||
left -= 1;
|
left -= 1;
|
||||||
right -= 1;
|
right -= 1;
|
||||||
}
|
}
|
||||||
// append the remaining thing to result, this can be happeneed when
|
// append the remaining thing to result, this can be happening when
|
||||||
// we have something to remove and remove_all is False.
|
// we have something to remove and remove_all is False.
|
||||||
let mut remain = input[..left as usize].iter().copied().rev().collect();
|
let mut remain = input[..left as usize].iter().copied().rev().collect();
|
||||||
result.append(&mut remain);
|
result.append(&mut remain);
|
||||||
@ -191,7 +193,7 @@ fn remove_impl(input: &[u8], arg: &Arguments, span: Span) -> Value {
|
|||||||
right += 1;
|
right += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// append the remaing thing to result, this can happened when
|
// append the remaining thing to result, this can happened when
|
||||||
// we have something to remove and remove_all is False.
|
// we have something to remove and remove_all is False.
|
||||||
let mut remain = input[left..].to_vec();
|
let mut remain = input[left..].to_vec();
|
||||||
result.append(&mut remain);
|
result.append(&mut remain);
|
||||||
|
@ -61,7 +61,7 @@ impl Command for BytesReplace {
|
|||||||
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
||||||
let find = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
|
let find = call.req::<Spanned<Vec<u8>>>(engine_state, stack, 0)?;
|
||||||
if find.item.is_empty() {
|
if find.item.is_empty() {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"the pattern to find cannot be empty".to_string(),
|
"the pattern to find cannot be empty".to_string(),
|
||||||
find.span,
|
find.span,
|
||||||
));
|
));
|
||||||
@ -130,13 +130,15 @@ fn replace(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => replace_impl(val, args, *val_span),
|
} => replace_impl(val, args, *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -81,13 +81,15 @@ fn reverse(val: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
span: *val_span,
|
span: *val_span,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -74,17 +74,17 @@ impl Command for BytesStartsWith {
|
|||||||
Example {
|
Example {
|
||||||
description: "Checks if binary starts with `0x[1F FF AA]`",
|
description: "Checks if binary starts with `0x[1F FF AA]`",
|
||||||
example: "0x[1F FF AA AA] | bytes starts-with 0x[1F FF AA]",
|
example: "0x[1F FF AA AA] | bytes starts-with 0x[1F FF AA]",
|
||||||
result: Some(Value::boolean(true, Span::test_data())),
|
result: Some(Value::test_bool(true)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Checks if binary starts with `0x[1F]`",
|
description: "Checks if binary starts with `0x[1F]`",
|
||||||
example: "0x[1F FF AA AA] | bytes starts-with 0x[1F]",
|
example: "0x[1F FF AA AA] | bytes starts-with 0x[1F]",
|
||||||
result: Some(Value::boolean(true, Span::test_data())),
|
result: Some(Value::test_bool(true)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Checks if binary starts with `0x[1F]`",
|
description: "Checks if binary starts with `0x[1F]`",
|
||||||
example: "0x[1F FF AA AA] | bytes starts-with 0x[11]",
|
example: "0x[1F FF AA AA] | bytes starts-with 0x[11]",
|
||||||
result: Some(Value::boolean(false, Span::test_data())),
|
result: Some(Value::test_bool(false)),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@ -96,13 +96,15 @@ fn starts_with(val: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val,
|
val,
|
||||||
span: val_span,
|
span: val_span,
|
||||||
} => Value::boolean(val.starts_with(&args.pattern), *val_span),
|
} => Value::boolean(val.starts_with(&args.pattern), *val_span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => val.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!(
|
"binary".into(),
|
||||||
"Input's type is {}. This command only works with bytes.",
|
other.get_type().to_string(),
|
||||||
other.get_type()
|
|
||||||
),
|
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -78,13 +78,14 @@ impl HashableValue {
|
|||||||
Value::String { val, span } => Ok(HashableValue::String { val, span }),
|
Value::String { val, span } => Ok(HashableValue::String { val, span }),
|
||||||
Value::Binary { val, span } => Ok(HashableValue::Binary { val, span }),
|
Value::Binary { val, span } => Ok(HashableValue::Binary { val, span }),
|
||||||
|
|
||||||
_ => {
|
// Explicitly propagate errors instead of dropping them.
|
||||||
let input_span = value.span().unwrap_or(span);
|
Value::Error { error } => Err(error),
|
||||||
Err(ShellError::UnsupportedInput(
|
_ => Err(ShellError::UnsupportedInput(
|
||||||
format!("input value {value:?} is not hashable"),
|
"input value is not hashable".into(),
|
||||||
input_span,
|
format!("input type: {:?}", value.get_type()),
|
||||||
))
|
span,
|
||||||
}
|
value.expect_span(),
|
||||||
|
)),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,12 +98,11 @@ impl Command for Histogram {
|
|||||||
let frequency_name_arg = call.opt::<Spanned<String>>(engine_state, stack, 1)?;
|
let frequency_name_arg = call.opt::<Spanned<String>>(engine_state, stack, 1)?;
|
||||||
let frequency_column_name = match frequency_name_arg {
|
let frequency_column_name = match frequency_name_arg {
|
||||||
Some(inner) => {
|
Some(inner) => {
|
||||||
let span = inner.span;
|
|
||||||
if ["value", "count", "quantile", "percentage"].contains(&inner.item.as_str()) {
|
if ["value", "count", "quantile", "percentage"].contains(&inner.item.as_str()) {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"frequency-column-name can't be 'value', 'count' or 'percentage'"
|
"frequency-column-name can't be 'value', 'count' or 'percentage'"
|
||||||
.to_string(),
|
.to_string(),
|
||||||
span,
|
inner.span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
inner.item
|
inner.item
|
||||||
@ -119,7 +118,7 @@ impl Command for Histogram {
|
|||||||
"normalize" => PercentageCalcMethod::Normalize,
|
"normalize" => PercentageCalcMethod::Normalize,
|
||||||
"relative" => PercentageCalcMethod::Relative,
|
"relative" => PercentageCalcMethod::Relative,
|
||||||
_ => {
|
_ => {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"calc method can only be 'normalize' or 'relative'".to_string(),
|
"calc method can only be 'normalize' or 'relative'".to_string(),
|
||||||
inner.span,
|
inner.span,
|
||||||
))
|
))
|
||||||
@ -130,16 +129,15 @@ impl Command for Histogram {
|
|||||||
let span = call.head;
|
let span = call.head;
|
||||||
let data_as_value = input.into_value(span);
|
let data_as_value = input.into_value(span);
|
||||||
// `input` is not a list, here we can return an error.
|
// `input` is not a list, here we can return an error.
|
||||||
match data_as_value.as_list() {
|
run_histogram(
|
||||||
Ok(list_value) => run_histogram(
|
data_as_value.as_list()?.to_vec(),
|
||||||
list_value.to_vec(),
|
column_name,
|
||||||
column_name,
|
frequency_column_name,
|
||||||
frequency_column_name,
|
calc_method,
|
||||||
calc_method,
|
span,
|
||||||
span,
|
// Note that as_list() filters out Value::Error here.
|
||||||
),
|
data_as_value.expect_span(),
|
||||||
Err(e) => Err(e),
|
)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -149,6 +147,7 @@ fn run_histogram(
|
|||||||
freq_column: String,
|
freq_column: String,
|
||||||
calc_method: PercentageCalcMethod,
|
calc_method: PercentageCalcMethod,
|
||||||
head_span: Span,
|
head_span: Span,
|
||||||
|
list_span: Span,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let mut inputs = vec![];
|
let mut inputs = vec![];
|
||||||
// convert from inputs to hashable values.
|
// convert from inputs to hashable values.
|
||||||
@ -157,14 +156,24 @@ fn run_histogram(
|
|||||||
// some invalid input scenario needs to handle:
|
// some invalid input scenario needs to handle:
|
||||||
// Expect input is a list of hashable value, if one value is not hashable, throw out error.
|
// Expect input is a list of hashable value, if one value is not hashable, throw out error.
|
||||||
for v in values {
|
for v in values {
|
||||||
let current_span = v.span().unwrap_or(head_span);
|
match v {
|
||||||
inputs.push(HashableValue::from_value(v, head_span).map_err(|_| {
|
// Propagate existing errors.
|
||||||
ShellError::UnsupportedInput(
|
Value::Error { error } => return Err(error),
|
||||||
"--column-name is not provided, can only support a list of simple value."
|
_ => {
|
||||||
.to_string(),
|
let t = v.get_type();
|
||||||
current_span,
|
let span = v.expect_span();
|
||||||
)
|
inputs.push(HashableValue::from_value(v, head_span).map_err(|_| {
|
||||||
})?);
|
ShellError::UnsupportedInput(
|
||||||
|
"Since --column-name was not provided, only lists of hashable values are supported.".to_string(),
|
||||||
|
format!(
|
||||||
|
"input type: {t:?}"
|
||||||
|
),
|
||||||
|
head_span,
|
||||||
|
span,
|
||||||
|
)
|
||||||
|
})?)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(ref col) => {
|
Some(ref col) => {
|
||||||
@ -186,14 +195,17 @@ fn run_histogram(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate existing errors.
|
||||||
|
Value::Error { error } => return Err(error),
|
||||||
_ => continue,
|
_ => continue,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if inputs.is_empty() {
|
if inputs.is_empty() {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::CantFindColumn(
|
||||||
format!("expect input is table, and inputs doesn't contain any value which has {col_name} column"),
|
col_name.clone(),
|
||||||
head_span,
|
head_span,
|
||||||
|
list_span,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
269
crates/nu-command/src/conversions/fill.rs
Normal file
269
crates/nu-command/src/conversions/fill.rs
Normal file
@ -0,0 +1,269 @@
|
|||||||
|
use crate::input_handler::{operate, CmdArgument};
|
||||||
|
use nu_engine::CallExt;
|
||||||
|
use nu_protocol::{
|
||||||
|
ast::{Call, CellPath},
|
||||||
|
engine::{Command, EngineState, Stack},
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
use print_positions::print_positions;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Fill;
|
||||||
|
|
||||||
|
struct Arguments {
|
||||||
|
width: usize,
|
||||||
|
alignment: FillAlignment,
|
||||||
|
character: String,
|
||||||
|
cell_paths: Option<Vec<CellPath>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CmdArgument for Arguments {
|
||||||
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
||||||
|
self.cell_paths.take()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
enum FillAlignment {
|
||||||
|
Left,
|
||||||
|
Right,
|
||||||
|
Middle,
|
||||||
|
MiddleRight,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Command for Fill {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"fill"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn usage(&self) -> &str {
|
||||||
|
"Fill and Align"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> nu_protocol::Signature {
|
||||||
|
Signature::build("fill")
|
||||||
|
.input_output_types(vec![
|
||||||
|
(Type::Int, Type::String),
|
||||||
|
(Type::Float, Type::String),
|
||||||
|
(Type::String, Type::String),
|
||||||
|
(Type::Filesize, Type::String),
|
||||||
|
])
|
||||||
|
.vectorizes_over_list(true)
|
||||||
|
.named(
|
||||||
|
"width",
|
||||||
|
SyntaxShape::Int,
|
||||||
|
"The width of the output. Defaults to 1",
|
||||||
|
Some('w'),
|
||||||
|
)
|
||||||
|
.named(
|
||||||
|
"alignment",
|
||||||
|
SyntaxShape::String,
|
||||||
|
"The alignment of the output. Defaults to Left (Left(l), Right(r), Center(c/m), MiddleRight(cr/mr))",
|
||||||
|
Some('a'),
|
||||||
|
)
|
||||||
|
.named(
|
||||||
|
"character",
|
||||||
|
SyntaxShape::String,
|
||||||
|
"The character to fill with. Defaults to ' ' (space)",
|
||||||
|
Some('c'),
|
||||||
|
)
|
||||||
|
.category(Category::Conversions)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn search_terms(&self) -> Vec<&str> {
|
||||||
|
vec!["display", "render", "format", "pad", "align"]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn examples(&self) -> Vec<Example> {
|
||||||
|
vec![
|
||||||
|
Example {
|
||||||
|
description:
|
||||||
|
"Fill a string on the left side to a width of 15 with the character '─'",
|
||||||
|
example: "'nushell' | fill -a l -c '─' -w 15",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "nushell────────".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description:
|
||||||
|
"Fill a string on the right side to a width of 15 with the character '─'",
|
||||||
|
example: "'nushell' | fill -a r -c '─' -w 15",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "────────nushell".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Fill a string on both sides to a width of 15 with the character '─'",
|
||||||
|
example: "'nushell' | fill -a m -c '─' -w 15",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "────nushell────".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description:
|
||||||
|
"Fill a number on the left side to a width of 5 with the character '0'",
|
||||||
|
example: "1 | fill --alignment right --character 0 --width 5",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "00001".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Fill a number on both sides to a width of 5 with the character '0'",
|
||||||
|
example: "1.1 | fill --alignment center --character 0 --width 5",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "01.10".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description:
|
||||||
|
"Fill a filesize on the left side to a width of 5 with the character '0'",
|
||||||
|
example: "1kib | fill --alignment middle --character 0 --width 10",
|
||||||
|
result: Some(Value::String {
|
||||||
|
val: "0001024000".into(),
|
||||||
|
span: Span::test_data(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(
|
||||||
|
&self,
|
||||||
|
engine_state: &EngineState,
|
||||||
|
stack: &mut Stack,
|
||||||
|
call: &Call,
|
||||||
|
input: PipelineData,
|
||||||
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
||||||
|
fill(engine_state, stack, call, input)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fill(
|
||||||
|
engine_state: &EngineState,
|
||||||
|
stack: &mut Stack,
|
||||||
|
call: &Call,
|
||||||
|
input: PipelineData,
|
||||||
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
||||||
|
let width_arg: Option<usize> = call.get_flag(engine_state, stack, "width")?;
|
||||||
|
let alignment_arg: Option<String> = call.get_flag(engine_state, stack, "alignment")?;
|
||||||
|
let character_arg: Option<String> = call.get_flag(engine_state, stack, "character")?;
|
||||||
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
||||||
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
||||||
|
|
||||||
|
let alignment = if let Some(arg) = alignment_arg {
|
||||||
|
match arg.to_lowercase().as_str() {
|
||||||
|
"l" | "left" => FillAlignment::Left,
|
||||||
|
"r" | "right" => FillAlignment::Right,
|
||||||
|
"c" | "center" | "m" | "middle" => FillAlignment::Middle,
|
||||||
|
"cr" | "centerright" | "mr" | "middleright" => FillAlignment::MiddleRight,
|
||||||
|
_ => FillAlignment::Left,
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
FillAlignment::Left
|
||||||
|
};
|
||||||
|
|
||||||
|
let width = if let Some(arg) = width_arg { arg } else { 1 };
|
||||||
|
|
||||||
|
let character = if let Some(arg) = character_arg {
|
||||||
|
arg
|
||||||
|
} else {
|
||||||
|
" ".to_string()
|
||||||
|
};
|
||||||
|
|
||||||
|
let arg = Arguments {
|
||||||
|
width,
|
||||||
|
alignment,
|
||||||
|
character,
|
||||||
|
cell_paths,
|
||||||
|
};
|
||||||
|
|
||||||
|
operate(action, arg, input, call.head, engine_state.ctrlc.clone())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
||||||
|
match input {
|
||||||
|
Value::Int { val, .. } => fill_int(*val, args, span),
|
||||||
|
Value::Filesize { val, .. } => fill_int(*val, args, span),
|
||||||
|
Value::Float { val, .. } => fill_float(*val, args, span),
|
||||||
|
Value::String { val, .. } => fill_string(val, args, span),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => input.clone(),
|
||||||
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"int, filesize, float, string".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fill_float(num: f64, args: &Arguments, span: Span) -> Value {
|
||||||
|
let s = num.to_string();
|
||||||
|
let out_str = pad(&s, args.width, &args.character, args.alignment, false);
|
||||||
|
|
||||||
|
Value::String { val: out_str, span }
|
||||||
|
}
|
||||||
|
fn fill_int(num: i64, args: &Arguments, span: Span) -> Value {
|
||||||
|
let s = num.to_string();
|
||||||
|
let out_str = pad(&s, args.width, &args.character, args.alignment, false);
|
||||||
|
|
||||||
|
Value::String { val: out_str, span }
|
||||||
|
}
|
||||||
|
fn fill_string(s: &str, args: &Arguments, span: Span) -> Value {
|
||||||
|
let out_str = pad(s, args.width, &args.character, args.alignment, false);
|
||||||
|
|
||||||
|
Value::String { val: out_str, span }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pad(s: &str, width: usize, pad_char: &str, alignment: FillAlignment, truncate: bool) -> String {
|
||||||
|
// Attribution: Most of this function was taken from https://github.com/ogham/rust-pad and tweaked. Thank you!
|
||||||
|
// Use width instead of len for graphical display
|
||||||
|
|
||||||
|
let cols = print_positions(s).count();
|
||||||
|
|
||||||
|
if cols >= width {
|
||||||
|
if truncate {
|
||||||
|
return s[..width].to_string();
|
||||||
|
} else {
|
||||||
|
return s.to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let diff = width - cols;
|
||||||
|
|
||||||
|
let (left_pad, right_pad) = match alignment {
|
||||||
|
FillAlignment::Left => (0, diff),
|
||||||
|
FillAlignment::Right => (diff, 0),
|
||||||
|
FillAlignment::Middle => (diff / 2, diff - diff / 2),
|
||||||
|
FillAlignment::MiddleRight => (diff - diff / 2, diff / 2),
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut new_str = String::new();
|
||||||
|
for _ in 0..left_pad {
|
||||||
|
new_str.push_str(pad_char)
|
||||||
|
}
|
||||||
|
new_str.push_str(s);
|
||||||
|
for _ in 0..right_pad {
|
||||||
|
new_str.push_str(pad_char)
|
||||||
|
}
|
||||||
|
new_str
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_examples() {
|
||||||
|
use crate::test_examples;
|
||||||
|
|
||||||
|
test_examples(Fill {})
|
||||||
|
}
|
||||||
|
}
|
@ -44,14 +44,14 @@ impl Command for Fmt {
|
|||||||
"upperhex".into(),
|
"upperhex".into(),
|
||||||
],
|
],
|
||||||
vals: vec![
|
vals: vec![
|
||||||
Value::string("0b101010", Span::test_data()),
|
Value::test_string("0b101010"),
|
||||||
Value::string("42", Span::test_data()),
|
Value::test_string("42"),
|
||||||
Value::string("42", Span::test_data()),
|
Value::test_string("42"),
|
||||||
Value::string("4.2e1", Span::test_data()),
|
Value::test_string("4.2e1"),
|
||||||
Value::string("0x2a", Span::test_data()),
|
Value::test_string("0x2a"),
|
||||||
Value::string("0o52", Span::test_data()),
|
Value::test_string("0o52"),
|
||||||
Value::string("4.2E1", Span::test_data()),
|
Value::test_string("4.2E1"),
|
||||||
Value::string("0x2A", Span::test_data()),
|
Value::test_string("0x2A"),
|
||||||
],
|
],
|
||||||
span: Span::test_data(),
|
span: Span::test_data(),
|
||||||
}),
|
}),
|
||||||
@ -64,7 +64,7 @@ impl Command for Fmt {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
fmt(engine_state, stack, call, input)
|
fmt(engine_state, stack, call, input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -74,7 +74,7 @@ fn fmt(
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
||||||
let args = CellPathOnlyArgs::from(cell_paths);
|
let args = CellPathOnlyArgs::from(cell_paths);
|
||||||
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
||||||
@ -84,10 +84,15 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
match input {
|
match input {
|
||||||
Value::Int { val, .. } => fmt_it(*val, span),
|
Value::Int { val, .. } => fmt_it(*val, span),
|
||||||
Value::Filesize { val, .. } => fmt_it(*val, span),
|
Value::Filesize { val, .. } => fmt_it(*val, span),
|
||||||
_ => Value::Error {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
error: ShellError::UnsupportedInput(
|
Value::Error { .. } => input.clone(),
|
||||||
format!("unsupported input type: {:?}", input.get_type()),
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"integer or filesize".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -98,31 +103,31 @@ fn fmt_it(num: i64, span: Span) -> Value {
|
|||||||
let mut vals = vec![];
|
let mut vals = vec![];
|
||||||
|
|
||||||
cols.push("binary".into());
|
cols.push("binary".into());
|
||||||
vals.push(Value::string(format!("{:#b}", num), span));
|
vals.push(Value::string(format!("{num:#b}"), span));
|
||||||
|
|
||||||
cols.push("debug".into());
|
cols.push("debug".into());
|
||||||
vals.push(Value::string(format!("{:#?}", num), span));
|
vals.push(Value::string(format!("{num:#?}"), span));
|
||||||
|
|
||||||
cols.push("display".into());
|
cols.push("display".into());
|
||||||
vals.push(Value::string(format!("{}", num), span));
|
vals.push(Value::string(format!("{num}"), span));
|
||||||
|
|
||||||
cols.push("lowerexp".into());
|
cols.push("lowerexp".into());
|
||||||
vals.push(Value::string(format!("{:#e}", num), span));
|
vals.push(Value::string(format!("{num:#e}"), span));
|
||||||
|
|
||||||
cols.push("lowerhex".into());
|
cols.push("lowerhex".into());
|
||||||
vals.push(Value::string(format!("{:#x}", num), span));
|
vals.push(Value::string(format!("{num:#x}"), span));
|
||||||
|
|
||||||
cols.push("octal".into());
|
cols.push("octal".into());
|
||||||
vals.push(Value::string(format!("{:#o}", num), span));
|
vals.push(Value::string(format!("{num:#o}"), span));
|
||||||
|
|
||||||
// cols.push("pointer".into());
|
// cols.push("pointer".into());
|
||||||
// vals.push(Value::string(format!("{:#p}", &num), span));
|
// vals.push(Value::string(format!("{:#p}", &num), span));
|
||||||
|
|
||||||
cols.push("upperexp".into());
|
cols.push("upperexp".into());
|
||||||
vals.push(Value::string(format!("{:#E}", num), span));
|
vals.push(Value::string(format!("{num:#E}"), span));
|
||||||
|
|
||||||
cols.push("upperhex".into());
|
cols.push("upperhex".into());
|
||||||
vals.push(Value::string(format!("{:#X}", num), span));
|
vals.push(Value::string(format!("{num:#X}"), span));
|
||||||
|
|
||||||
Value::Record { cols, vals, span }
|
Value::Record { cols, vals, span }
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
into_binary(engine_state, stack, call, input)
|
into_binary(engine_state, stack, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -109,7 +109,7 @@ fn into_binary(
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
||||||
|
|
||||||
@ -177,13 +177,24 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
val: int_to_endian(i64::from(*val)),
|
val: int_to_endian(i64::from(*val)),
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
Value::Duration { val, .. } => Value::Binary {
|
||||||
|
val: int_to_endian(*val),
|
||||||
|
span,
|
||||||
|
},
|
||||||
Value::Date { val, .. } => Value::Binary {
|
Value::Date { val, .. } => Value::Binary {
|
||||||
val: val.format("%c").to_string().as_bytes().to_vec(),
|
val: val.format("%c").to_string().as_bytes().to_vec(),
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
_ => Value::Error {
|
Value::Error { .. } => input.clone(),
|
||||||
error: ShellError::UnsupportedInput("'into binary' for unsupported type".into(), span),
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"integer, float, filesize, string, date, duration, binary or bool".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,7 +45,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
into_bool(engine_state, stack, call, input)
|
into_bool(engine_state, stack, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -163,10 +163,15 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
Ok(val) => Value::Bool { val, span },
|
Ok(val) => Value::Bool { val, span },
|
||||||
Err(error) => Value::Error { error },
|
Err(error) => Value::Error { error },
|
||||||
},
|
},
|
||||||
_ => Value::Error {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
error: ShellError::UnsupportedInput(
|
Value::Error { .. } => input.clone(),
|
||||||
"'into bool' does not support this input".into(),
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"bool, integer, float or string".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::get_full_help;
|
|||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
ast::Call,
|
ast::Call,
|
||||||
engine::{Command, EngineState, Stack},
|
engine::{Command, EngineState, Stack},
|
||||||
Category, IntoPipelineData, PipelineData, Signature, Value,
|
Category, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -14,20 +14,26 @@ impl Command for Into {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("into").category(Category::Conversions)
|
Signature::build("into")
|
||||||
|
.category(Category::Conversions)
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::String)])
|
||||||
}
|
}
|
||||||
|
|
||||||
fn usage(&self) -> &str {
|
fn usage(&self) -> &str {
|
||||||
"Commands to convert data from one type to another."
|
"Commands to convert data from one type to another."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn extra_usage(&self) -> &str {
|
||||||
|
"You must use one of the following subcommands. Using this command as-is will only produce this help message."
|
||||||
|
}
|
||||||
|
|
||||||
fn run(
|
fn run(
|
||||||
&self,
|
&self,
|
||||||
engine_state: &EngineState,
|
engine_state: &EngineState,
|
||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(Value::String {
|
Ok(Value::String {
|
||||||
val: get_full_help(
|
val: get_full_help(
|
||||||
&Into.signature(),
|
&Into.signature(),
|
||||||
@ -41,15 +47,3 @@ impl Command for Into {
|
|||||||
.into_pipeline_data())
|
.into_pipeline_data())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_examples() {
|
|
||||||
use crate::test_examples;
|
|
||||||
|
|
||||||
test_examples(Into {})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
@ -147,41 +147,19 @@ impl Command for SubCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
fn examples(&self) -> Vec<Example> {
|
||||||
let example_result_1 = |secs: i64, nsecs: u32| {
|
let example_result_1 = |secs: i64, nsecs: u32| match Utc.timestamp_opt(secs, nsecs) {
|
||||||
let dt = match Utc.timestamp_opt(secs, nsecs) {
|
LocalResult::Single(dt) => Some(Value::Date {
|
||||||
LocalResult::Single(dt) => Some(dt),
|
val: dt.into(),
|
||||||
_ => None,
|
span: Span::test_data(),
|
||||||
};
|
}),
|
||||||
match dt {
|
_ => panic!("datetime: help example is invalid"),
|
||||||
Some(dt) => Some(Value::Date {
|
|
||||||
val: dt.into(),
|
|
||||||
span: Span::test_data(),
|
|
||||||
}),
|
|
||||||
None => Some(Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given datetime representation is unsupported.".to_string(),
|
|
||||||
Span::test_data(),
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
let example_result_2 = |millis: i64| {
|
let example_result_2 = |millis: i64| match Utc.timestamp_millis_opt(millis) {
|
||||||
let dt = match Utc.timestamp_millis_opt(millis) {
|
LocalResult::Single(dt) => Some(Value::Date {
|
||||||
LocalResult::Single(dt) => Some(dt),
|
val: dt.into(),
|
||||||
_ => None,
|
span: Span::test_data(),
|
||||||
};
|
}),
|
||||||
match dt {
|
_ => panic!("datetime: help example is invalid"),
|
||||||
Some(dt) => Some(Value::Date {
|
|
||||||
val: dt.into(),
|
|
||||||
span: Span::test_data(),
|
|
||||||
}),
|
|
||||||
None => Some(Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given datetime representation is unsupported.".to_string(),
|
|
||||||
Span::test_data(),
|
|
||||||
),
|
|
||||||
}),
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
vec![
|
vec![
|
||||||
Example {
|
Example {
|
||||||
@ -213,7 +191,7 @@ impl Command for SubCommand {
|
|||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description:
|
description:
|
||||||
"Convert timestamps like the sqlite history t",
|
"Convert a millisecond-precise timestamp",
|
||||||
example: "1656165681720 | into datetime",
|
example: "1656165681720 | into datetime",
|
||||||
result: example_result_2(1656165681720)
|
result: example_result_2(1656165681720)
|
||||||
},
|
},
|
||||||
@ -231,11 +209,16 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
|
|||||||
let timestamp = match input {
|
let timestamp = match input {
|
||||||
Value::Int { val, .. } => Ok(*val),
|
Value::Int { val, .. } => Ok(*val),
|
||||||
Value::String { val, .. } => val.parse::<i64>(),
|
Value::String { val, .. } => val.parse::<i64>(),
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => return input.clone(),
|
||||||
other => {
|
other => {
|
||||||
return Value::Error {
|
return Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!("Expected string or int, got {} instead", other.get_type()),
|
"string and integer".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
head,
|
head,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -248,113 +231,68 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
|
|||||||
if ts.abs() > TIMESTAMP_BOUND {
|
if ts.abs() > TIMESTAMP_BOUND {
|
||||||
return Value::Error {
|
return Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::UnsupportedInput(
|
||||||
"Given timestamp is out of range, it should between -8e+12 and 8e+12"
|
"timestamp is out of range; it should between -8e+12 and 8e+12".to_string(),
|
||||||
.to_string(),
|
format!("timestamp is {ts:?}"),
|
||||||
head,
|
head,
|
||||||
|
// Again, can safely unwrap this from here on
|
||||||
|
input.expect_span(),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
macro_rules! match_datetime {
|
||||||
|
($expr:expr) => {
|
||||||
|
match $expr {
|
||||||
|
LocalResult::Single(dt) => Value::Date {
|
||||||
|
val: dt.into(),
|
||||||
|
span: head,
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
return Value::Error {
|
||||||
|
error: ShellError::UnsupportedInput(
|
||||||
|
"The given local datetime representation is invalid.".into(),
|
||||||
|
format!("timestamp is {:?}", ts),
|
||||||
|
head,
|
||||||
|
head,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return match timezone {
|
return match timezone {
|
||||||
// default to UTC
|
// default to UTC
|
||||||
None => {
|
None => {
|
||||||
// be able to convert chrono::Utc::now()
|
// be able to convert chrono::Utc::now()
|
||||||
let dt = match ts.to_string().len() {
|
match ts.to_string().len() {
|
||||||
x if x > 13 => Utc.timestamp_nanos(ts).into(),
|
x if x > 13 => Value::Date {
|
||||||
x if x > 10 => match Utc.timestamp_millis_opt(ts) {
|
val: Utc.timestamp_nanos(ts).into(),
|
||||||
LocalResult::Single(dt) => dt.into(),
|
span: head,
|
||||||
_ => {
|
|
||||||
return Value::Error {
|
|
||||||
// This error message is from chrono
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid."
|
|
||||||
.to_string(),
|
|
||||||
head,
|
|
||||||
),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
_ => match Utc.timestamp_opt(ts, 0) {
|
x if x > 10 => match_datetime!(Utc.timestamp_millis_opt(ts)),
|
||||||
LocalResult::Single(dt) => dt.into(),
|
_ => match_datetime!(Utc.timestamp_opt(ts, 0)),
|
||||||
_ => {
|
|
||||||
return Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid."
|
|
||||||
.to_string(),
|
|
||||||
head,
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
Value::Date {
|
|
||||||
val: dt,
|
|
||||||
span: head,
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(Spanned { item, span }) => match item {
|
Some(Spanned { item, span }) => match item {
|
||||||
Zone::Utc => match Utc.timestamp_opt(ts, 0) {
|
Zone::Utc => match_datetime!(Utc.timestamp_opt(ts, 0)),
|
||||||
LocalResult::Single(val) => Value::Date {
|
Zone::Local => match_datetime!(Local.timestamp_opt(ts, 0)),
|
||||||
val: val.into(),
|
|
||||||
span: head,
|
|
||||||
},
|
|
||||||
_ => Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Zone::Local => match Local.timestamp_opt(ts, 0) {
|
|
||||||
LocalResult::Single(val) => Value::Date {
|
|
||||||
val: val.into(),
|
|
||||||
span: head,
|
|
||||||
},
|
|
||||||
_ => Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
Zone::East(i) => match FixedOffset::east_opt((*i as i32) * HOUR) {
|
Zone::East(i) => match FixedOffset::east_opt((*i as i32) * HOUR) {
|
||||||
Some(eastoffset) => match eastoffset.timestamp_opt(ts, 0) {
|
Some(eastoffset) => match_datetime!(eastoffset.timestamp_opt(ts, 0)),
|
||||||
LocalResult::Single(val) => Value::Date { val, span: head },
|
|
||||||
_ => Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
None => Value::Error {
|
None => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::DatetimeParseError(input.debug_value(), *span),
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Zone::West(i) => match FixedOffset::west_opt((*i as i32) * HOUR) {
|
Zone::West(i) => match FixedOffset::west_opt((*i as i32) * HOUR) {
|
||||||
Some(westoffset) => match westoffset.timestamp_opt(ts, 0) {
|
Some(westoffset) => match_datetime!(westoffset.timestamp_opt(ts, 0)),
|
||||||
LocalResult::Single(val) => Value::Date { val, span: head },
|
|
||||||
_ => Value::Error {
|
|
||||||
error: ShellError::UnsupportedInput(
|
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
None => Value::Error {
|
None => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::DatetimeParseError(input.debug_value(), *span),
|
||||||
"The given local datetime representation is invalid.".to_string(),
|
|
||||||
*span,
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Zone::Error => Value::Error {
|
Zone::Error => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
// This is an argument error, not an input error
|
||||||
"Cannot convert given timezone or offset to timestamp".to_string(),
|
error: ShellError::TypeMismatch(
|
||||||
|
"Invalid timezone or offset".to_string(),
|
||||||
*span,
|
*span,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
@ -391,10 +329,15 @@ fn action(input: &Value, args: &Arguments, head: Span) -> Value {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => input.clone(),
|
||||||
other => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
format!("Expected string, got {} instead", other.get_type()),
|
"string".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
head,
|
head,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
||||||
let args = CellPathOnlyArgs::from(cell_paths);
|
let args = CellPathOnlyArgs::from(cell_paths);
|
||||||
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
||||||
@ -105,18 +105,17 @@ fn action(input: &Value, _args: &CellPathOnlyArgs, head: Span) -> Value {
|
|||||||
},
|
},
|
||||||
span: *span,
|
span: *span,
|
||||||
},
|
},
|
||||||
other => {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
let span = other.span();
|
Value::Error { .. } => input.clone(),
|
||||||
match span {
|
other => Value::Error {
|
||||||
Ok(s) => {
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
let got = format!("Expected a string, got {} instead", other.get_type());
|
"string, integer or bool".into(),
|
||||||
Value::Error {
|
other.get_type().to_string(),
|
||||||
error: ShellError::UnsupportedInput(got, s),
|
head,
|
||||||
}
|
// This line requires the Value::Error match above.
|
||||||
}
|
other.expect_span(),
|
||||||
Err(e) => Value::Error { error: e },
|
),
|
||||||
}
|
},
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
into_duration(engine_state, stack, call, input)
|
into_duration(engine_state, stack, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -468,9 +468,11 @@ fn action(
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Value::Error {
|
Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::CantConvert(
|
||||||
"'into duration' does not support this string input".into(),
|
"string".into(),
|
||||||
|
"duration".into(),
|
||||||
span,
|
span,
|
||||||
|
None,
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -481,10 +483,15 @@ fn action(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => Value::Error {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
error: ShellError::UnsupportedInput(
|
Value::Error { .. } => input.clone(),
|
||||||
"'into duration' does not support this input".into(),
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"string or duration".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -44,7 +44,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
||||||
let args = CellPathOnlyArgs::from(cell_paths);
|
let args = CellPathOnlyArgs::from(cell_paths);
|
||||||
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
||||||
@ -116,20 +116,18 @@ pub fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|||||||
val: 0,
|
val: 0,
|
||||||
span: value_span,
|
span: value_span,
|
||||||
},
|
},
|
||||||
_ => Value::Error {
|
other => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
"'into filesize' for unsupported type".into(),
|
"string and integer".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
|
span,
|
||||||
value_span,
|
value_span,
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Value::Error {
|
// Propagate existing errors
|
||||||
error: ShellError::UnsupportedInput(
|
input.clone()
|
||||||
"'into filesize' for unsupported type".into(),
|
|
||||||
span,
|
|
||||||
),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
|
fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
|
||||||
|
@ -62,7 +62,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let cell_paths = call.rest(engine_state, stack, 0)?;
|
let cell_paths = call.rest(engine_state, stack, 0)?;
|
||||||
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
||||||
|
|
||||||
@ -70,7 +70,7 @@ impl Command for SubCommand {
|
|||||||
let radix: u32 = match radix {
|
let radix: u32 = match radix {
|
||||||
Some(Value::Int { val, span }) => {
|
Some(Value::Int { val, span }) => {
|
||||||
if !(2..=36).contains(&val) {
|
if !(2..=36).contains(&val) {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"Radix must lie in the range [2, 36]".to_string(),
|
"Radix must lie in the range [2, 36]".to_string(),
|
||||||
span,
|
span,
|
||||||
));
|
));
|
||||||
@ -113,7 +113,7 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "Convert file size to integer",
|
description: "Convert file size to integer",
|
||||||
example: "4KB | into int",
|
example: "4KB | into int",
|
||||||
result: Some(Value::int(4000, Span::test_data())),
|
result: Some(Value::test_int(4000)),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "Convert bool to integer",
|
description: "Convert bool to integer",
|
||||||
@ -187,9 +187,11 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
Ok(v) => v,
|
Ok(v) => v,
|
||||||
_ => {
|
_ => {
|
||||||
return Value::Error {
|
return Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::CantConvert(
|
||||||
"Could not convert float to integer".to_string(),
|
"float".to_string(),
|
||||||
|
"integer".to_string(),
|
||||||
span,
|
span,
|
||||||
|
None,
|
||||||
),
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -219,6 +221,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
val: val.timestamp(),
|
val: val.timestamp(),
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
|
Value::Duration { val, .. } => Value::Int { val: *val, span },
|
||||||
Value::Binary { val, span } => {
|
Value::Binary { val, span } => {
|
||||||
use byteorder::{BigEndian, ByteOrder, LittleEndian};
|
use byteorder::{BigEndian, ByteOrder, LittleEndian};
|
||||||
|
|
||||||
@ -240,10 +243,15 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
Value::int(BigEndian::read_i64(&val), *span)
|
Value::int(BigEndian::read_i64(&val), *span)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => Value::Error {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
error: ShellError::UnsupportedInput(
|
Value::Error { .. } => input.clone(),
|
||||||
format!("'into int' for unsupported type '{}'", input.get_type()),
|
other => Value::Error {
|
||||||
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
|
"integer, float, filesize, date, string, binary, duration or bool".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
span,
|
span,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -281,13 +289,18 @@ fn convert_int(input: &Value, head: Span, radix: u32) -> Value {
|
|||||||
}
|
}
|
||||||
val.to_string()
|
val.to_string()
|
||||||
}
|
}
|
||||||
_ => {
|
// Propagate errors by explicitly matching them before the final case.
|
||||||
|
Value::Error { .. } => return input.clone(),
|
||||||
|
other => {
|
||||||
return Value::Error {
|
return Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
"only strings or integers are supported".to_string(),
|
"string and integer".into(),
|
||||||
|
other.get_type().to_string(),
|
||||||
head,
|
head,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
),
|
),
|
||||||
}
|
};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
match i64::from_str_radix(i.trim(), radix) {
|
match i64::from_str_radix(i.trim(), radix) {
|
||||||
@ -354,8 +367,7 @@ fn int_from_string(a_string: &str, span: Span) -> Result<i64, ShellError> {
|
|||||||
"string".to_string(),
|
"string".to_string(),
|
||||||
span,
|
span,
|
||||||
Some(format!(
|
Some(format!(
|
||||||
r#"string "{}" does not represent a valid integer"#,
|
r#"string "{trimmed}" does not represent a valid integer"#
|
||||||
trimmed
|
|
||||||
)),
|
)),
|
||||||
)),
|
)),
|
||||||
},
|
},
|
||||||
|
@ -40,7 +40,7 @@ impl Command for SubCommand {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
into_record(engine_state, call, input)
|
into_record(engine_state, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -183,12 +183,16 @@ fn into_record(
|
|||||||
Value::Record { cols, vals, span }
|
Value::Record { cols, vals, span }
|
||||||
}
|
}
|
||||||
Value::Record { cols, vals, span } => Value::Record { cols, vals, span },
|
Value::Record { cols, vals, span } => Value::Record { cols, vals, span },
|
||||||
other => {
|
Value::Error { .. } => input,
|
||||||
return Err(ShellError::UnsupportedInput(
|
other => Value::Error {
|
||||||
"'into record' does not support this input".into(),
|
error: ShellError::OnlySupportsThisInputType(
|
||||||
other.span().unwrap_or(call.head),
|
"string".into(),
|
||||||
))
|
other.get_type().to_string(),
|
||||||
}
|
call.head,
|
||||||
|
// This line requires the Value::Error match above.
|
||||||
|
other.expect_span(),
|
||||||
|
),
|
||||||
|
},
|
||||||
};
|
};
|
||||||
Ok(res.into_pipeline_data())
|
Ok(res.into_pipeline_data())
|
||||||
}
|
}
|
||||||
|
@ -70,7 +70,7 @@ impl Command for SubCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
string_helper(engine_state, stack, call, input)
|
string_helper(engine_state, stack, call, input)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -79,22 +79,22 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "convert integer to string and append three decimal places",
|
description: "convert integer to string and append three decimal places",
|
||||||
example: "5 | into string -d 3",
|
example: "5 | into string -d 3",
|
||||||
result: Some(Value::string("5.000", Span::test_data())),
|
result: Some(Value::test_string("5.000")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "convert decimal to string and round to nearest integer",
|
description: "convert decimal to string and round to nearest integer",
|
||||||
example: "1.7 | into string -d 0",
|
example: "1.7 | into string -d 0",
|
||||||
result: Some(Value::string("2", Span::test_data())),
|
result: Some(Value::test_string("2")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "convert decimal to string",
|
description: "convert decimal to string",
|
||||||
example: "1.7 | into string -d 1",
|
example: "1.7 | into string -d 1",
|
||||||
result: Some(Value::string("1.7", Span::test_data())),
|
result: Some(Value::test_string("1.7")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "convert decimal to string and limit to 2 decimals",
|
description: "convert decimal to string and limit to 2 decimals",
|
||||||
example: "1.734 | into string -d 2",
|
example: "1.734 | into string -d 2",
|
||||||
result: Some(Value::string("1.73", Span::test_data())),
|
result: Some(Value::test_string("1.73")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "try to convert decimal to string and provide negative decimal points",
|
description: "try to convert decimal to string and provide negative decimal points",
|
||||||
@ -111,17 +111,17 @@ impl Command for SubCommand {
|
|||||||
Example {
|
Example {
|
||||||
description: "convert decimal to string",
|
description: "convert decimal to string",
|
||||||
example: "4.3 | into string",
|
example: "4.3 | into string",
|
||||||
result: Some(Value::string("4.3", Span::test_data())),
|
result: Some(Value::test_string("4.3")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "convert string to string",
|
description: "convert string to string",
|
||||||
example: "'1234' | into string",
|
example: "'1234' | into string",
|
||||||
result: Some(Value::string("1234", Span::test_data())),
|
result: Some(Value::test_string("1234")),
|
||||||
},
|
},
|
||||||
Example {
|
Example {
|
||||||
description: "convert boolean to string",
|
description: "convert boolean to string",
|
||||||
example: "true | into string",
|
example: "true | into string",
|
||||||
result: Some(Value::string("true", Span::test_data())),
|
result: Some(Value::test_string("true")),
|
||||||
},
|
},
|
||||||
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
// TODO: This should work but does not; see https://github.com/nushell/nushell/issues/7032
|
||||||
// Example {
|
// Example {
|
||||||
@ -148,13 +148,13 @@ fn string_helper(
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let decimals = call.has_flag("decimals");
|
let decimals = call.has_flag("decimals");
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let decimals_value: Option<i64> = call.get_flag(engine_state, stack, "decimals")?;
|
let decimals_value: Option<i64> = call.get_flag(engine_state, stack, "decimals")?;
|
||||||
if let Some(decimal_val) = decimals_value {
|
if let Some(decimal_val) = decimals_value {
|
||||||
if decimals && decimal_val.is_negative() {
|
if decimals && decimal_val.is_negative() {
|
||||||
return Err(ShellError::UnsupportedInput(
|
return Err(ShellError::TypeMismatch(
|
||||||
"Cannot accept negative integers for decimals arguments".to_string(),
|
"Cannot accept negative integers for decimals arguments".to_string(),
|
||||||
head,
|
head,
|
||||||
));
|
));
|
||||||
@ -206,7 +206,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
if decimals {
|
if decimals {
|
||||||
let decimal_value = digits.unwrap_or(2) as usize;
|
let decimal_value = digits.unwrap_or(2) as usize;
|
||||||
Value::String {
|
Value::String {
|
||||||
val: format!("{:.*}", decimal_value, val),
|
val: format!("{val:.decimal_value$}"),
|
||||||
span,
|
span,
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -234,12 +234,7 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
Value::Error { error } => Value::String {
|
Value::Error { error } => Value::String {
|
||||||
val: {
|
val: into_code(error).unwrap_or_default(),
|
||||||
match into_code(error) {
|
|
||||||
Some(code) => code,
|
|
||||||
None => "".to_string(),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
span,
|
span,
|
||||||
},
|
},
|
||||||
Value::Nothing { .. } => Value::String {
|
Value::Nothing { .. } => Value::String {
|
||||||
@ -251,9 +246,11 @@ fn action(input: &Value, args: &Arguments, span: Span) -> Value {
|
|||||||
vals: _,
|
vals: _,
|
||||||
span: _,
|
span: _,
|
||||||
} => Value::Error {
|
} => Value::Error {
|
||||||
error: ShellError::UnsupportedInput(
|
error: ShellError::CantConvert(
|
||||||
"Cannot convert Record into string".to_string(),
|
"record".into(),
|
||||||
|
"string".into(),
|
||||||
span,
|
span,
|
||||||
|
Some("try using the `to nuon` command".into()),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
Value::Binary { .. } => Value::Error {
|
Value::Binary { .. } => Value::Error {
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
|
mod fill;
|
||||||
mod fmt;
|
mod fmt;
|
||||||
pub(crate) mod into;
|
pub(crate) mod into;
|
||||||
|
|
||||||
|
pub use fill::Fill;
|
||||||
pub use fmt::Fmt;
|
pub use fmt::Fmt;
|
||||||
pub use into::*;
|
pub use into::*;
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, Span, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Alias;
|
pub struct Alias;
|
||||||
@ -45,7 +47,7 @@ impl Command for Alias {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ impl Command for Break {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Err(ShellError::Break(call.head))
|
Err(ShellError::Break(call.head))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
104
crates/nu-command/src/core_commands/const_.rs
Normal file
104
crates/nu-command/src/core_commands/const_.rs
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
use nu_protocol::ast::Call;
|
||||||
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Const;
|
||||||
|
|
||||||
|
impl Command for Const {
|
||||||
|
fn name(&self) -> &str {
|
||||||
|
"const"
|
||||||
|
}
|
||||||
|
|
||||||
|
fn usage(&self) -> &str {
|
||||||
|
"Create a parse-time constant."
|
||||||
|
}
|
||||||
|
|
||||||
|
fn signature(&self) -> nu_protocol::Signature {
|
||||||
|
Signature::build("const")
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
||||||
|
.allow_variants_without_examples(true)
|
||||||
|
.required("const_name", SyntaxShape::VarWithOptType, "constant name")
|
||||||
|
.required(
|
||||||
|
"initial_value",
|
||||||
|
SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::Expression)),
|
||||||
|
"equals sign followed by constant value",
|
||||||
|
)
|
||||||
|
.category(Category::Core)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extra_usage(&self) -> &str {
|
||||||
|
r#"This command is a parser keyword. For details, check:
|
||||||
|
https://www.nushell.sh/book/thinking_in_nu.html"#
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_parser_keyword(&self) -> bool {
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fn search_terms(&self) -> Vec<&str> {
|
||||||
|
vec!["set", "let"]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run(
|
||||||
|
&self,
|
||||||
|
engine_state: &EngineState,
|
||||||
|
stack: &mut Stack,
|
||||||
|
call: &Call,
|
||||||
|
_input: PipelineData,
|
||||||
|
) -> Result<PipelineData, ShellError> {
|
||||||
|
let var_id = call
|
||||||
|
.positional_nth(0)
|
||||||
|
.expect("checked through parser")
|
||||||
|
.as_var()
|
||||||
|
.expect("internal error: missing variable");
|
||||||
|
|
||||||
|
if let Some(constval) = engine_state.find_constant(var_id, &[]) {
|
||||||
|
// Instead of creating a second copy of the value in the stack, we could change
|
||||||
|
// stack.get_var() to check engine_state.find_constant().
|
||||||
|
stack.add_var(var_id, constval.clone());
|
||||||
|
|
||||||
|
Ok(PipelineData::empty())
|
||||||
|
} else {
|
||||||
|
Err(ShellError::NushellFailedSpanned(
|
||||||
|
"Missing Constant".to_string(),
|
||||||
|
"constant not added by the parser".to_string(),
|
||||||
|
call.head,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn examples(&self) -> Vec<Example> {
|
||||||
|
vec![
|
||||||
|
Example {
|
||||||
|
description: "Create a new parse-time constant.",
|
||||||
|
example: "const x = 10",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Create a composite constant value",
|
||||||
|
example: "const x = { a: 10, b: 20 }",
|
||||||
|
result: None,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use nu_protocol::engine::CommandType;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_examples() {
|
||||||
|
use crate::test_examples;
|
||||||
|
|
||||||
|
test_examples(Const {})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_command_type() {
|
||||||
|
assert!(matches!(Const.command_type(), CommandType::Keyword));
|
||||||
|
}
|
||||||
|
}
|
@ -35,7 +35,7 @@ impl Command for Continue {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Err(ShellError::Continue(call.head))
|
Err(ShellError::Continue(call.head))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Def;
|
pub struct Def;
|
||||||
@ -38,7 +40,7 @@ impl Command for Def {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, Span, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct DefEnv;
|
pub struct DefEnv;
|
||||||
@ -26,32 +28,7 @@ impl Command for DefEnv {
|
|||||||
fn extra_usage(&self) -> &str {
|
fn extra_usage(&self) -> &str {
|
||||||
r#"This command is a parser keyword. For details, check:
|
r#"This command is a parser keyword. For details, check:
|
||||||
https://www.nushell.sh/book/thinking_in_nu.html
|
https://www.nushell.sh/book/thinking_in_nu.html
|
||||||
|
"#
|
||||||
=== EXTRA NOTE ===
|
|
||||||
All blocks are scoped, including variable definition and environment variable changes.
|
|
||||||
|
|
||||||
Because of this, the following doesn't work:
|
|
||||||
|
|
||||||
def-env cd_with_fallback [arg = ""] {
|
|
||||||
let fall_back_path = "/tmp"
|
|
||||||
if $arg != "" {
|
|
||||||
cd $arg
|
|
||||||
} else {
|
|
||||||
cd $fall_back_path
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Instead, you have to use cd in the top level scope:
|
|
||||||
|
|
||||||
def-env cd_with_fallback [arg = ""] {
|
|
||||||
let fall_back_path = "/tmp"
|
|
||||||
let path = if $arg != "" {
|
|
||||||
$arg
|
|
||||||
} else {
|
|
||||||
$fall_back_path
|
|
||||||
}
|
|
||||||
cd $path
|
|
||||||
}"#
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_parser_keyword(&self) -> bool {
|
fn is_parser_keyword(&self) -> bool {
|
||||||
@ -64,7 +41,7 @@ def-env cd_with_fallback [arg = ""] {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +49,7 @@ def-env cd_with_fallback [arg = ""] {
|
|||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Set environment variable by call a custom command",
|
description: "Set environment variable by call a custom command",
|
||||||
example: r#"def-env foo [] { let-env BAR = "BAZ" }; foo; $env.BAR"#,
|
example: r#"def-env foo [] { let-env BAR = "BAZ" }; foo; $env.BAR"#,
|
||||||
result: Some(Value::string("BAZ", Span::test_data())),
|
result: Some(Value::test_string("BAZ")),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,11 @@ impl Command for Describe {
|
|||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("describe")
|
Signature::build("describe")
|
||||||
.input_output_types(vec![(Type::Any, Type::String)])
|
.input_output_types(vec![(Type::Any, Type::String)])
|
||||||
|
.switch(
|
||||||
|
"no-collect",
|
||||||
|
"do not collect streams of structured data",
|
||||||
|
Some('n'),
|
||||||
|
)
|
||||||
.category(Category::Core)
|
.category(Category::Core)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,32 +35,58 @@ impl Command for Describe {
|
|||||||
input: PipelineData,
|
input: PipelineData,
|
||||||
) -> Result<PipelineData, ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
if matches!(input, PipelineData::ExternalStream { .. }) {
|
|
||||||
Ok(PipelineData::Value(
|
|
||||||
Value::string("raw input", call.head),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
} else {
|
|
||||||
let value = input.into_value(call.head);
|
|
||||||
let description = match value {
|
|
||||||
Value::CustomValue { val, .. } => val.value_string(),
|
|
||||||
_ => value.get_type().to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(Value::String {
|
let no_collect: bool = call.has_flag("no-collect");
|
||||||
val: description,
|
|
||||||
span: head,
|
let description = match input {
|
||||||
|
PipelineData::ExternalStream { .. } => "raw input".into(),
|
||||||
|
PipelineData::ListStream(_, _) => {
|
||||||
|
if no_collect {
|
||||||
|
"stream".into()
|
||||||
|
} else {
|
||||||
|
let value = input.into_value(head);
|
||||||
|
let base_description = match value {
|
||||||
|
Value::CustomValue { val, .. } => val.value_string(),
|
||||||
|
_ => value.get_type().to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
format!("{base_description} (stream)")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
.into_pipeline_data())
|
_ => {
|
||||||
|
let value = input.into_value(head);
|
||||||
|
match value {
|
||||||
|
Value::CustomValue { val, .. } => val.value_string(),
|
||||||
|
_ => value.get_type().to_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(Value::String {
|
||||||
|
val: description,
|
||||||
|
span: head,
|
||||||
}
|
}
|
||||||
|
.into_pipeline_data())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn examples(&self) -> Vec<Example> {
|
fn examples(&self) -> Vec<Example> {
|
||||||
vec![Example {
|
vec![
|
||||||
description: "Describe the type of a string",
|
Example {
|
||||||
example: "'hello' | describe",
|
description: "Describe the type of a string",
|
||||||
result: Some(Value::test_string("string")),
|
example: "'hello' | describe",
|
||||||
}]
|
result: Some(Value::test_string("string")),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Describe a stream of data, collecting it first",
|
||||||
|
example: "[1 2 3] | each {|i| $i} | describe",
|
||||||
|
result: Some(Value::test_string("list<int> (stream)")),
|
||||||
|
},
|
||||||
|
Example {
|
||||||
|
description: "Describe the input but do not collect streams",
|
||||||
|
example: "[1 2 3] | each {|i| $i} | describe --no-collect",
|
||||||
|
result: Some(Value::test_string("stream")),
|
||||||
|
},
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn search_terms(&self) -> Vec<&str> {
|
fn search_terms(&self) -> Vec<&str> {
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
|
use std::thread;
|
||||||
|
|
||||||
use nu_engine::{eval_block_with_early_return, CallExt};
|
use nu_engine::{eval_block_with_early_return, CallExt};
|
||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Closure, Command, EngineState, Stack};
|
use nu_protocol::engine::{Closure, Command, EngineState, Stack};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
Category, Example, ListStream, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
Category, Example, ListStream, PipelineData, RawStream, ShellError, Signature, SyntaxShape,
|
||||||
|
Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -106,7 +109,7 @@ impl Command for Do {
|
|||||||
block,
|
block,
|
||||||
input,
|
input,
|
||||||
call.redirect_stdout,
|
call.redirect_stdout,
|
||||||
capture_errors || ignore_shell_errors || ignore_program_errors,
|
call.redirect_stdout,
|
||||||
);
|
);
|
||||||
|
|
||||||
match result {
|
match result {
|
||||||
@ -118,6 +121,58 @@ impl Command for Do {
|
|||||||
metadata,
|
metadata,
|
||||||
trim_end_newline,
|
trim_end_newline,
|
||||||
}) if capture_errors => {
|
}) if capture_errors => {
|
||||||
|
// Use a thread to receive stdout message.
|
||||||
|
// Or we may get a deadlock if child process sends out too much bytes to stderr.
|
||||||
|
//
|
||||||
|
// For example: in normal linux system, stderr pipe's limit is 65535 bytes.
|
||||||
|
// if child process sends out 65536 bytes, the process will be hanged because no consumer
|
||||||
|
// consumes the first 65535 bytes
|
||||||
|
// So we need a thread to receive stdout message, then the current thread can continue to consume
|
||||||
|
// stderr messages.
|
||||||
|
let stdout_handler = stdout.map(|stdout_stream| {
|
||||||
|
thread::Builder::new()
|
||||||
|
.name("stderr redirector".to_string())
|
||||||
|
.spawn(move || {
|
||||||
|
let ctrlc = stdout_stream.ctrlc.clone();
|
||||||
|
let span = stdout_stream.span;
|
||||||
|
RawStream::new(
|
||||||
|
Box::new(
|
||||||
|
vec![stdout_stream.into_bytes().map(|s| s.item)].into_iter(),
|
||||||
|
),
|
||||||
|
ctrlc,
|
||||||
|
span,
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.expect("Failed to create thread")
|
||||||
|
});
|
||||||
|
|
||||||
|
// Intercept stderr so we can return it in the error if the exit code is non-zero.
|
||||||
|
// The threading issues mentioned above dictate why we also need to intercept stdout.
|
||||||
|
let mut stderr_ctrlc = None;
|
||||||
|
let stderr_msg = match stderr {
|
||||||
|
None => "".to_string(),
|
||||||
|
Some(stderr_stream) => {
|
||||||
|
stderr_ctrlc = stderr_stream.ctrlc.clone();
|
||||||
|
stderr_stream.into_string().map(|s| s.item)?
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let stdout = if let Some(handle) = stdout_handler {
|
||||||
|
match handle.join() {
|
||||||
|
Err(err) => {
|
||||||
|
return Err(ShellError::ExternalCommand(
|
||||||
|
"Fail to receive external commands stdout message".to_string(),
|
||||||
|
format!("{err:?}"),
|
||||||
|
span,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
Ok(res) => Some(res),
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let mut exit_code_ctrlc = None;
|
let mut exit_code_ctrlc = None;
|
||||||
let exit_code: Vec<Value> = match exit_code {
|
let exit_code: Vec<Value> = match exit_code {
|
||||||
None => vec![],
|
None => vec![],
|
||||||
@ -128,11 +183,6 @@ impl Command for Do {
|
|||||||
};
|
};
|
||||||
if let Some(Value::Int { val: code, .. }) = exit_code.last() {
|
if let Some(Value::Int { val: code, .. }) = exit_code.last() {
|
||||||
if *code != 0 {
|
if *code != 0 {
|
||||||
let stderr_msg = match stderr {
|
|
||||||
None => "".to_string(),
|
|
||||||
Some(stderr_stream) => stderr_stream.into_string().map(|s| s.item)?,
|
|
||||||
};
|
|
||||||
|
|
||||||
return Err(ShellError::ExternalCommand(
|
return Err(ShellError::ExternalCommand(
|
||||||
"External command failed".to_string(),
|
"External command failed".to_string(),
|
||||||
stderr_msg,
|
stderr_msg,
|
||||||
@ -143,7 +193,12 @@ impl Command for Do {
|
|||||||
|
|
||||||
Ok(PipelineData::ExternalStream {
|
Ok(PipelineData::ExternalStream {
|
||||||
stdout,
|
stdout,
|
||||||
stderr,
|
stderr: Some(RawStream::new(
|
||||||
|
Box::new(vec![Ok(stderr_msg.into_bytes())].into_iter()),
|
||||||
|
stderr_ctrlc,
|
||||||
|
span,
|
||||||
|
None,
|
||||||
|
)),
|
||||||
exit_code: Some(ListStream::from_stream(
|
exit_code: Some(ListStream::from_stream(
|
||||||
exit_code.into_iter(),
|
exit_code.into_iter(),
|
||||||
exit_code_ctrlc,
|
exit_code_ctrlc,
|
||||||
@ -160,18 +215,35 @@ impl Command for Do {
|
|||||||
span,
|
span,
|
||||||
metadata,
|
metadata,
|
||||||
trim_end_newline,
|
trim_end_newline,
|
||||||
}) if ignore_program_errors => Ok(PipelineData::ExternalStream {
|
}) if ignore_program_errors && !call.redirect_stdout => {
|
||||||
stdout,
|
Ok(PipelineData::ExternalStream {
|
||||||
stderr,
|
stdout,
|
||||||
exit_code: None,
|
stderr,
|
||||||
span,
|
exit_code: None,
|
||||||
metadata,
|
span,
|
||||||
trim_end_newline,
|
metadata,
|
||||||
}),
|
trim_end_newline,
|
||||||
Ok(PipelineData::Value(Value::Error { .. }, ..)) if ignore_shell_errors => {
|
})
|
||||||
|
}
|
||||||
|
Ok(PipelineData::Value(Value::Error { .. }, ..)) | Err(_) if ignore_shell_errors => {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
Err(_) if ignore_shell_errors => Ok(PipelineData::empty()),
|
Ok(PipelineData::ListStream(ls, metadata)) if ignore_shell_errors => {
|
||||||
|
// check if there is a `Value::Error` in given list stream first.
|
||||||
|
let mut values = vec![];
|
||||||
|
let ctrlc = ls.ctrlc.clone();
|
||||||
|
for v in ls {
|
||||||
|
if let Value::Error { .. } = v {
|
||||||
|
values.push(Value::nothing(call.head));
|
||||||
|
} else {
|
||||||
|
values.push(v)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(PipelineData::ListStream(
|
||||||
|
ListStream::from_stream(values.into_iter(), ctrlc),
|
||||||
|
metadata,
|
||||||
|
))
|
||||||
|
}
|
||||||
r => r,
|
r => r,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::CallExt;
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Value,
|
Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -15,6 +15,7 @@ impl Command for ErrorMake {
|
|||||||
|
|
||||||
fn signature(&self) -> Signature {
|
fn signature(&self) -> Signature {
|
||||||
Signature::build("error make")
|
Signature::build("error make")
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::Error)])
|
||||||
.required("error_struct", SyntaxShape::Record, "the error to create")
|
.required("error_struct", SyntaxShape::Record, "the error to create")
|
||||||
.switch(
|
.switch(
|
||||||
"unspanned",
|
"unspanned",
|
||||||
@ -38,7 +39,7 @@ impl Command for ErrorMake {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let span = call.head;
|
let span = call.head;
|
||||||
let arg: Value = call.req(engine_state, stack, 0)?;
|
let arg: Value = call.req(engine_state, stack, 0)?;
|
||||||
let unspanned = call.has_flag("unspanned");
|
let unspanned = call.has_flag("unspanned");
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::get_full_help;
|
|||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
ast::Call,
|
ast::Call,
|
||||||
engine::{Command, EngineState, Stack},
|
engine::{Command, EngineState, Stack},
|
||||||
Category, Example, IntoPipelineData, PipelineData, Signature, Span, Type, Value,
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -38,7 +38,7 @@ impl Command for ExportCommand {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(Value::String {
|
Ok(Value::String {
|
||||||
val: get_full_help(
|
val: get_full_help(
|
||||||
&ExportCommand.signature(),
|
&ExportCommand.signature(),
|
||||||
@ -56,7 +56,7 @@ impl Command for ExportCommand {
|
|||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Export a definition from a module",
|
description: "Export a definition from a module",
|
||||||
example: r#"module utils { export def my-command [] { "hello" } }; use utils my-command; my-command"#,
|
example: r#"module utils { export def my-command [] { "hello" } }; use utils my-command; my-command"#,
|
||||||
result: Some(Value::string("hello", Span::test_data())),
|
result: Some(Value::test_string("hello")),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, SyntaxShape, Type};
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct ExportAlias;
|
pub struct ExportAlias;
|
||||||
@ -41,7 +41,7 @@ impl Command for ExportAlias {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, Span, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct ExportDef;
|
pub struct ExportDef;
|
||||||
@ -38,7 +40,7 @@ impl Command for ExportDef {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,7 +48,7 @@ impl Command for ExportDef {
|
|||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Define a custom command in a module and call it",
|
description: "Define a custom command in a module and call it",
|
||||||
example: r#"module spam { export def foo [] { "foo" } }; use spam foo; foo"#,
|
example: r#"module spam { export def foo [] { "foo" } }; use spam foo; foo"#,
|
||||||
result: Some(Value::string("foo", Span::test_data())),
|
result: Some(Value::test_string("foo")),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, Span, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct ExportDefEnv;
|
pub struct ExportDefEnv;
|
||||||
@ -64,7 +66,7 @@ export def-env cd_with_fallback [arg = ""] {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +74,7 @@ export def-env cd_with_fallback [arg = ""] {
|
|||||||
vec![Example {
|
vec![Example {
|
||||||
description: "Define a custom command that participates in the environment in a module and call it",
|
description: "Define a custom command that participates in the environment in a module and call it",
|
||||||
example: r#"module foo { export def-env bar [] { let-env FOO_BAR = "BAZ" } }; use foo bar; bar; $env.FOO_BAR"#,
|
example: r#"module foo { export def-env bar [] { let-env FOO_BAR = "BAZ" } }; use foo bar; bar; $env.FOO_BAR"#,
|
||||||
result: Some(Value::string("BAZ", Span::test_data())),
|
result: Some(Value::test_string("BAZ")),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, SyntaxShape, Type};
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct ExportExtern;
|
pub struct ExportExtern;
|
||||||
@ -37,7 +37,7 @@ impl Command for ExportExtern {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, Span, SyntaxShape, Type, Value};
|
use nu_protocol::{
|
||||||
|
Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct ExportUse;
|
pub struct ExportUse;
|
||||||
@ -17,7 +19,12 @@ impl Command for ExportUse {
|
|||||||
fn signature(&self) -> nu_protocol::Signature {
|
fn signature(&self) -> nu_protocol::Signature {
|
||||||
Signature::build("export use")
|
Signature::build("export use")
|
||||||
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
||||||
.required("pattern", SyntaxShape::ImportPattern, "import pattern")
|
.required("module", SyntaxShape::String, "Module or module file")
|
||||||
|
.optional(
|
||||||
|
"members",
|
||||||
|
SyntaxShape::Any,
|
||||||
|
"Which members of the module to import",
|
||||||
|
)
|
||||||
.category(Category::Core)
|
.category(Category::Core)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,7 +43,7 @@ impl Command for ExportUse {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,7 +55,7 @@ impl Command for ExportUse {
|
|||||||
use eggs foo
|
use eggs foo
|
||||||
foo
|
foo
|
||||||
"#,
|
"#,
|
||||||
result: Some(Value::string("foo", Span::test_data())),
|
result: Some(Value::test_string("foo")),
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Command, EngineState, Stack};
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
||||||
use nu_protocol::{Category, Example, PipelineData, Signature, SyntaxShape, Type};
|
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
pub struct Extern;
|
pub struct Extern;
|
||||||
@ -37,7 +37,7 @@ impl Command for Extern {
|
|||||||
_stack: &mut Stack,
|
_stack: &mut Stack,
|
||||||
_call: &Call,
|
_call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
Ok(PipelineData::empty())
|
Ok(PipelineData::empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ use nu_engine::{eval_block, eval_expression, CallExt};
|
|||||||
use nu_protocol::ast::Call;
|
use nu_protocol::ast::Call;
|
||||||
use nu_protocol::engine::{Block, Command, EngineState, Stack};
|
use nu_protocol::engine::{Block, Command, EngineState, Stack};
|
||||||
use nu_protocol::{
|
use nu_protocol::{
|
||||||
Category, Example, ListStream, PipelineData, ShellError, Signature, SyntaxShape, Value,
|
Category, Example, ListStream, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
@ -19,6 +19,8 @@ impl Command for For {
|
|||||||
|
|
||||||
fn signature(&self) -> nu_protocol::Signature {
|
fn signature(&self) -> nu_protocol::Signature {
|
||||||
Signature::build("for")
|
Signature::build("for")
|
||||||
|
.input_output_types(vec![(Type::Nothing, Type::Nothing)])
|
||||||
|
.allow_variants_without_examples(true)
|
||||||
.required(
|
.required(
|
||||||
"var_name",
|
"var_name",
|
||||||
SyntaxShape::VarWithOptType,
|
SyntaxShape::VarWithOptType,
|
||||||
@ -32,7 +34,7 @@ impl Command for For {
|
|||||||
.required("block", SyntaxShape::Block, "the block to run")
|
.required("block", SyntaxShape::Block, "the block to run")
|
||||||
.switch(
|
.switch(
|
||||||
"numbered",
|
"numbered",
|
||||||
"returned a numbered item ($it.index and $it.item)",
|
"return a numbered item ($it.index and $it.item)",
|
||||||
Some('n'),
|
Some('n'),
|
||||||
)
|
)
|
||||||
.creates_scope()
|
.creates_scope()
|
||||||
@ -54,7 +56,7 @@ impl Command for For {
|
|||||||
stack: &mut Stack,
|
stack: &mut Stack,
|
||||||
call: &Call,
|
call: &Call,
|
||||||
_input: PipelineData,
|
_input: PipelineData,
|
||||||
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
) -> Result<PipelineData, ShellError> {
|
||||||
let head = call.head;
|
let head = call.head;
|
||||||
let var_id = call
|
let var_id = call
|
||||||
.positional_nth(0)
|
.positional_nth(0)
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user