aboutsummaryrefslogtreecommitdiffstats
path: root/xtask/src
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2026-06-29 18:10:59 +0200
committerGitHub <noreply@github.com>2026-06-29 18:10:59 +0200
commit245f5141c9bb7eb91f003efac4defc94470243fd (patch)
tree52ae6d003366f97e41c8a1450602aef63c8fdca2 /xtask/src
parentfeat: reload config on theme change (#5135) (diff)
downloadsl0ppij-245f5141c9bb7eb91f003efac4defc94470243fd.tar.gz
sl0ppij-245f5141c9bb7eb91f003efac4defc94470243fd.tar.xz
sl0ppij-245f5141c9bb7eb91f003efac4defc94470243fd.zip
Title frames (#5318)
* initial implementation * improve single line title design * hint text plugin infra * add proto regen task * display alt text in status bar * don't display text with full frames * style alt hover text * fix + style control own pane hover * make multiplayer indications responsive * update snapshots * plugin api * single pane as tab * better scroll styling * fix tests * tab-bar plus hover * plugin surface tests * integration tests * adjust all integration tests * reduce hover noise * add pane id to in place * more integration tests * style: rustfmt * update plugin assets * update assets and snapshots * add pr
Diffstat (limited to 'xtask/src')
-rw-r--r--xtask/src/build.rs15
-rw-r--r--xtask/src/flags.rs6
-rw-r--r--xtask/src/main.rs1
3 files changed, 19 insertions, 3 deletions
diff --git a/xtask/src/build.rs b/xtask/src/build.rs
index 53ab8ade..b736897f 100644
--- a/xtask/src/build.rs
+++ b/xtask/src/build.rs
@@ -27,7 +27,7 @@ pub fn build(sh: &Shell, flags: flags::Build) -> anyhow::Result<()> {
// See [this PR][1] for details.
//
// [1]: https://github.com/zellij-org/zellij/pull/2711#issuecomment-1695015818
- run_proto_codegen(sh);
+ run_proto_codegen(sh, false);
// Build all plugins in a single invocation so Cargo can unify transitive dependency
// features across all of them and compile shared crates (e.g. zellij-utils) only once.
@@ -114,7 +114,16 @@ pub fn build(sh: &Shell, flags: flags::Build) -> anyhow::Result<()> {
Ok(())
}
-fn run_proto_codegen(sh: &Shell) {
+pub fn proto(sh: &Shell) -> anyhow::Result<()> {
+ let msg = ">> Generating protobuffer code";
+ crate::status(msg);
+ println!("{}", msg);
+
+ run_proto_codegen(sh, true);
+ Ok(())
+}
+
+fn run_proto_codegen(sh: &Shell, force: bool) {
let zellij_utils_basedir = crate::project_root().join("zellij-utils");
let _pd = sh.push_dir(&zellij_utils_basedir);
@@ -142,7 +151,7 @@ fn run_proto_codegen(sh: &Shell) {
.metadata()
.and_then(|m| m.modified());
let mut proto_files = vec![];
- let mut needs_regeneration = false;
+ let mut needs_regeneration = force;
for entry in std::fs::read_dir(&src_dir).unwrap() {
let entry_path = entry.unwrap().path();
diff --git a/xtask/src/flags.rs b/xtask/src/flags.rs
index 82302e45..bd963770 100644
--- a/xtask/src/flags.rs
+++ b/xtask/src/flags.rs
@@ -42,6 +42,8 @@ xflags::xflags! {
/// Build the manpage
cmd manpage {}
+ cmd proto {}
+
/// Publish zellij and all the sub-crates
cmd publish {
/// Perform a dry-run (don't push/publish anything)
@@ -142,6 +144,7 @@ pub enum XtaskCmd {
Deprecated(Deprecated),
Ci(Ci),
Manpage(Manpage),
+ Proto(Proto),
Publish(Publish),
Dist(Dist),
Clippy(Clippy),
@@ -195,6 +198,9 @@ pub struct BuildRelease {
pub struct Manpage;
#[derive(Debug)]
+pub struct Proto;
+
+#[derive(Debug)]
pub struct Publish {
pub dry_run: bool,
pub no_push: bool,
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 0e99d0b3..cb378b44 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -134,6 +134,7 @@ fn main() -> anyhow::Result<()> {
flags::XtaskCmd::Test(flags) => test::test(shell, flags),
flags::XtaskCmd::IntegrationTest(flags) => integration_test::integration_test(shell, flags),
flags::XtaskCmd::Manpage(_flags) => build::manpage(shell),
+ flags::XtaskCmd::Proto(_flags) => build::proto(shell),
// Pipelines
// These are composite commands, made up of multiple "stages" defined above.
flags::XtaskCmd::Make(flags) => pipelines::make(shell, flags),