From 3ba25af848e9789a9a631590d9a251902ee18440 Mon Sep 17 00:00:00 2001 From: Shav Kinderlehrer Date: Thu, 10 Aug 2023 11:13:22 -0400 Subject: [PATCH] Update path comp in ps1 --- source/prompt/ps1.d | 4 ++-- source/style/package.d | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/source/prompt/ps1.d b/source/prompt/ps1.d index 88d9f6e..ded5c2d 100644 --- a/source/prompt/ps1.d +++ b/source/prompt/ps1.d @@ -14,10 +14,10 @@ import style.font; string ps1(Opts opt) { string ps; - string pathstr = path(opt.pathlen); + string pathstr = path(opt.pathlen).set(Color.magenta).set(Font.italic).set(Font.bold); ps ~= "\n"; - ps ~= (",-(" ~ pathstr.set(Color.magenta) ~ ")").set(Color.black); + ps ~= (",-(" ~ pathstr ~ ")".set(Color.black)).set(Color.black); ps ~= "\n"; ps ~= ("'-(" ~ to!string(opt.status) ~ ") ").set(Color.black); // prompt char diff --git a/source/style/package.d b/source/style/package.d index 57e87c2..2e5ff7f 100644 --- a/source/style/package.d +++ b/source/style/package.d @@ -5,5 +5,11 @@ import std.conv; import style.color; string set(string s, int code) { - return ("%{\x1b[" ~ to!string(code) ~ "m%}") ~ s ~ ("%{\x1b[" ~ to!string((Color.reset + 0)) ~ "m%}"); + return ("%{\x1b[" ~ to!string(code) ~ "m%}") ~ s ~ ( + "%{\x1b[" ~ to!string((Color.reset + 0)) ~ "m%}"); +} + +string set(string s, int code, bool close) { + return ("%{\x1b[" ~ to!string(code) ~ "m%}") ~ s ~ (close ? ( + "%{\x1b[" ~ to!string((Color.reset + 0)) ~ "m%}") : ""); }