From 1fcf671ca45063289986f9761b17c54bfbcdfc95 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Wed, 4 Dec 2019 19:38:40 +1300 Subject: [PATCH] Re-enable the textview plugin, now its own crate --- Cargo.lock | 3 ++- Cargo.toml | 2 +- crates/nu-build/Cargo.toml | 2 +- crates/nu-errors/Cargo.toml | 2 +- crates/nu-parser/Cargo.toml | 2 +- crates/nu-protocol/Cargo.toml | 2 +- crates/nu-source/Cargo.toml | 2 +- crates/{nu-textview => nu_plugin_textview}/Cargo.toml | 11 +++-------- crates/{nu-textview => nu_plugin_textview}/build.rs | 0 .../{nu-textview => nu_plugin_textview}/src/main.rs | 5 +++-- 10 files changed, 14 insertions(+), 17 deletions(-) rename crates/{nu-textview => nu_plugin_textview}/Cargo.toml (72%) rename crates/{nu-textview => nu_plugin_textview}/build.rs (100%) rename crates/{nu-textview => nu_plugin_textview}/src/main.rs (98%) diff --git a/Cargo.lock b/Cargo.lock index 42749f2bb3..9e892aee65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2079,13 +2079,14 @@ dependencies = [ ] [[package]] -name = "nu-textview" +name = "nu_plugin_textview" version = "0.1.0" dependencies = [ "ansi_term 0.12.1", "crossterm", "nu", "nu-build", + "nu-errors", "nu-protocol", "nu-source", "syntect", diff --git a/Cargo.toml b/Cargo.toml index 63eca929ec..90b7166ab0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ documentation = "https://book.nushell.sh" [workspace] -members = ["crates/nu-errors", "crates/nu-source", "crates/nu-textview", "crates/nu-protocol", "crates/nu-parser", "crates/nu-build"] +members = ["crates/nu-errors", "crates/nu-source", "crates/nu_plugin_textview", "crates/nu-protocol", "crates/nu-parser", "crates/nu-build"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/nu-build/Cargo.toml b/crates/nu-build/Cargo.toml index 66a6ffbbe0..c9d2baf317 100644 --- a/crates/nu-build/Cargo.toml +++ b/crates/nu-build/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nu-build" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/nu-errors/Cargo.toml b/crates/nu-errors/Cargo.toml index 3c3f4a4409..fc4c723464 100644 --- a/crates/nu-errors/Cargo.toml +++ b/crates/nu-errors/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nu-errors" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml index 0fea0a1112..0c9c89b9af 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nu-parser" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 4379527189..2851ef3f1d 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nu-protocol" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/nu-source/Cargo.toml b/crates/nu-source/Cargo.toml index f30a937267..3eb0f59f23 100644 --- a/crates/nu-source/Cargo.toml +++ b/crates/nu-source/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "nu-source" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" description = "A source string characterizer for Nushell" license = "MIT" diff --git a/crates/nu-textview/Cargo.toml b/crates/nu_plugin_textview/Cargo.toml similarity index 72% rename from crates/nu-textview/Cargo.toml rename to crates/nu_plugin_textview/Cargo.toml index dab1b330b6..b6ea36489d 100644 --- a/crates/nu-textview/Cargo.toml +++ b/crates/nu_plugin_textview/Cargo.toml @@ -1,24 +1,19 @@ [package] -name = "nu-textview" +name = "nu_plugin_textview" version = "0.1.0" -authors = ["Yehuda Katz "] +authors = ["Yehuda Katz ", "Jonathan Turner ", "Andrés N. Robalino "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -[[bin]] -name = "nu_plugin_textview" -path = "src/main.rs" -required-features = ["textview"] - [dependencies] - syntect = { version = "3.2.0" } ansi_term = "0.12.1" crossterm = { version = "0.10.2" } nu = { path = "../.." } nu-protocol = { path = "../nu-protocol" } nu-source = { path = "../nu-source" } +nu-errors = { path = "../nu-errors" } url = "2.1.0" [build-dependencies] diff --git a/crates/nu-textview/build.rs b/crates/nu_plugin_textview/build.rs similarity index 100% rename from crates/nu-textview/build.rs rename to crates/nu_plugin_textview/build.rs diff --git a/crates/nu-textview/src/main.rs b/crates/nu_plugin_textview/src/main.rs similarity index 98% rename from crates/nu-textview/src/main.rs rename to crates/nu_plugin_textview/src/main.rs index 208eaae810..8163c91dbe 100644 --- a/crates/nu-textview/src/main.rs +++ b/crates/nu_plugin_textview/src/main.rs @@ -1,7 +1,8 @@ use crossterm::{cursor, terminal, RawScreen}; use crossterm::{InputEvent, KeyEvent}; -use nu::{CallInfo, Plugin, Primitive, ShellError, Signature, UntaggedValue, Value}; -use nu_protocol::{outln, serve_plugin}; +use nu::Plugin; +use nu_errors::ShellError; +use nu_protocol::{outln, serve_plugin, CallInfo, Primitive, Signature, UntaggedValue, Value}; use nu_source::AnchorLocation; use syntect::easy::HighlightLines;