Merge pull request #93 from Univers42/develop

chore(release): 2.8.2 -> main

Author: LESdylan

RELEASE.md

@@ -8,6 +8,32 @@ shows you how to drive the shell.
 
 ---
 
+## v2.8.2 — *the customize-your-prompt release*
+
+Paste any zsh prompt tutorial into `~/.hellishrc` and it now just works
+(issue #91):
+
+- **`colors`** defines `$fg[..]`, `$bg[..]`, `$fg_bold[..]`,
+  `$reset_color` — the arrays zsh's own colors function provides.
+- **`vcs_info`** fills `$vcs_info_msg_0_` from the prompt's fork-free
+  cached git reader; **`zstyle`** silently honours the
+  `formats`/`actionformats` it reads (everything else keeps the loud stub).
+- **`precmd` / `preexec`** functions (and the `precmd_functions` /
+  `preexec_functions` arrays) fire like zsh's — unless bash-preexec is
+  loaded, which owns the convention and would otherwise double-fire.
+- **`RPROMPT`** renders at the right margin, invisible to readline's
+  width model, skipped on dumb terminals.
+- And the bug that started it: the alias scanner expanded aliases inside
+  `case` **patterns**, so re-sourcing a config whose loader contains
+  `case "$1" in list|ls)` died on
+  `syntax error near unexpected token --color=auto` with the stock
+  `ls` alias active. Patterns are never commands now — 12 golden cases
+  diff every shape (`|`, `(`, `;;`, `;&`, `;;&`, newline-led, nested)
+  against bash 5.3.9, and `tests/prompt_zshrc_test.py` drives the whole
+  tutorial rc on a pty inside a real repository, ten checks.
+
+---
+
 ## v2.8.1 — *the first-prompt release*
 
 A fresh `curl install.sh | sh` with the plugin framework, bash-preexec and z

incs/ft_builtins.h

@@ -130,6 +130,9 @@ int				builtin_emulate(t_shell *state, t_vec argv);
 int				builtin_print(t_shell *state, t_vec argv);
 int				builtin_autoload(t_shell *state, t_vec argv);
 int				builtin_zunsupported(t_shell *state, t_vec argv);
+int				builtin_colors(t_shell *state, t_vec argv);
+int				builtin_vcs_info(t_shell *state, t_vec argv);
+int				builtin_zstyle(t_shell *state, t_vec argv);
 int				builtin_zle(t_shell *state, t_vec argv);
 int				builtin_bindkey(t_shell *state, t_vec argv);
 int				builtin_add_zsh_hook(t_shell *state, t_vec argv);

incs/helpers.h

@@ -69,6 +69,9 @@ void	rc_load_all(t_shell *state, const char *home);
 
 /* Composable rc hooks (src/core/hooks*.c). */
 void	run_hook_funcs(t_shell *state, char *var, const char *arg);
+void	hook_run_one(t_shell *state, const char *fn, const char *arg);
+void	run_zsh_prompt_hooks(t_shell *state, const char *which,
+			const char *arg);
 void	run_preexec(t_shell *state);
 
 #endif

incs/prompt.h

@@ -29,6 +29,12 @@ typedef struct s_shell	t_shell;
    `prompt` switcher bring it back. */
 # define HELLISH_PS1_DEFAULT "%m\\U%# "
 
+/* The prompt's fork-free cached git reader (prompt_metadata.c): branch is
+   heap-owned by the caller, dirty is the TTL-throttled `git status`
+   answer. Public because vcs_info (builtin_zsh_prompt.c) reports the
+   same repository state the \g escape renders. */
+void		get_git_info(char **branch, int *dirty);
+
 // buff_readline.c
 typedef struct s_rl
 {

incs/sh_alias.h

@@ -55,6 +55,17 @@ typedef struct s_ascan_src
 	bool		blank_end;
 }	t_ascan_src;
 
+/* Where the scan stands inside `case … esac` (cs_st, with cs_n the
+   nesting depth): the SUBJECT word, the `in` that follows it, the PATTERN
+   region (where `|`, `(`, newlines and `;;` must NOT re-arm command
+   position -- bash never alias-expands a pattern, issue #91), or the
+   command BODY after a `)`. */
+# define CS_NONE 0
+# define CS_SUBJ 1
+# define CS_IN 2
+# define CS_PAT 3
+# define CS_BODY 4
+
 typedef struct s_ascan
 {
 	t_ascan_src	src[ALIAS_SCAN_DEPTH];
@@ -65,6 +76,9 @@ typedef struct s_ascan
 	bool		chk_next;
 	bool		wstart;
 	bool		after_redir;
+	bool		was_cmd;
+	int			cs_n;
+	int			cs_st;
 	int			pend_hd;
 	char		*hd_delim[ALIAS_HD_MAX];
 	bool		hd_strip[ALIAS_HD_MAX];
@@ -88,6 +102,8 @@ bool	asc_active(t_ascan *a, const char *w, size_t len);
 void	asc_word(t_ascan *a);
 void	asc_op(t_ascan *a);
 void	asc_newline(t_ascan *a);
+bool	asc_case_word(t_ascan *a, const char *w, size_t len, bool plain);
+bool	asc_op_case(t_ascan *a, t_ascan_src *s);
 void	asc_comment(t_ascan *a);
 void	asc_hd_delim(t_ascan *a, const char *w, size_t len);
 void	asc_hd_drop(t_ascan *a);

incs/version.h

@@ -15,7 +15,7 @@
 
 /* The single source of truth for the running shell's version. Bumped in step
    with the git tag / GitHub release / npm package / docker image. */
-# define HELLISH_VERSION "2.8.1"
+# define HELLISH_VERSION "2.8.2"
 
 /* Where releases live; used by the `update` builtin and the daily check. */
 # define HELLISH_REPO "Univers42/hellish"

npm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hellish-shell",
-  "version": "2.8.1",
+  "version": "2.8.2",
   "description": "hellish — a fast, POSIX-compliant shell, with horns",
   "bin": {
     "hellish": "bin/hellish.js"

src/alias/alias_scan2.c

@@ -71,6 +71,8 @@ static void	asc_word_state(t_ascan *a, const char *w, size_t len, bool plain)
 {
 	if (a->after_redir)
 		a->after_redir = false;
+	else if (asc_case_word(a, w, len, plain))
+		;
 	else if (plain && asc_kw_cmdnext(w, len))
 		a->cmd_pos = true;
 	else if (plain && asc_kw_noncmd(w, len))
@@ -117,6 +119,7 @@ void	asc_word(t_ascan *a)
 
 	s = &a->src[a->depth - 1];
 	len = asc_word_span(s->s + s->pos, &plain);
+	a->was_cmd = (a->cmd_pos || a->chk_next);
 	if (asc_word_verbatim(a, s, len))
 		return ;
 	if (!a->after_redir && (a->cmd_pos || a->chk_next) && plain

src/alias/alias_scan3.c

@@ -38,6 +38,8 @@ void	asc_op(t_ascan *a)
 	char		c;
 
 	s = &a->src[a->depth - 1];
+	if (asc_op_case(a, s))
+		return ;
 	c = s->s[s->pos];
 	vec_push(&a->out, &c);
 	s->pos++;

src/alias/alias_scan6.c

@@ -62,7 +62,7 @@ void	asc_newline(t_ascan *a)
 		vec_push(&a->out, &c);
 	while (a->hd_n > 0 && s->s[s->pos])
 		asc_hd_body(a, s);
-	a->cmd_pos = true;
+	a->cmd_pos = (a->cs_n == 0 || a->cs_st == CS_BODY);
 	a->chk_next = false;
 	a->after_redir = false;
 	a->pend_hd = 0;