53404: terminal integration with semantic markers

2 files changed, 14 insertions, 7 deletions

diff --git a/Test/X04zlehighlight.ztst b/Test/X04zlehighlight.ztst
index be0564912..ecb309605 100644
--- a/Test/X04zlehighlight.ztst
+++ b/Test/X04zlehighlight.ztst
@@ -12,7 +12,7 @@
       zpty zsh "${(q)ZTST_testdir}/../Src/zsh -fiV +Z"
       zpty -w zsh "module_path=( ${(j< >)${(@q-)module_path}} \$module_path )"
       zpty -w zsh 'zle_highlight=( fg_start_code:"CDE|3" fg_end_code:"|" bg_start_code:"BCDE|4" bg_end_code:"|" )'
-      zpty -w zsh '.term.extensions=( -query truecolor )'
+      zpty -w zsh '.term.extensions=( -query truecolor -bracketed-paste -integration )'
     }
     zpty_input() {
       zpty ${${(M)2:#nonl}:+-n} -w zsh "$1"
@@ -20,7 +20,7 @@
     zpty_enable_zle() {
       zpty -w zsh "tcfunc() { REPLY=""; }"
       # This line will not be echoed back, behaving like ! -o zle
-      zpty -w zsh "setopt zle; zle -T tc tcfunc; unset zle_bracketed_paste"
+      zpty -w zsh "setopt zle; zle -T tc tcfunc"
     }
     zpty_line() {
       setopt localoptions extendedglob noshwordsplit
diff --git a/Test/X06termquery.ztst b/Test/X06termquery.ztst
index cce4e626f..5f3a81aae 100644
--- a/Test/X06termquery.ztst
+++ b/Test/X06termquery.ztst
@@ -9,6 +9,7 @@
       zpty -d
       zpty zsh "${(q)ZTST_testdir}/../Src/zsh -fiV +Z"
       zpty -w zsh "module_path=( ${(j< >)${(@q-)module_path}} \$module_path )"
+      zpty -w zsh ".term.extensions=( -bracketed-paste -integration )"
       zpty -w zsh "setopt zle"
       zpty -r zsh REPLY $'\e*\r'
       zpty -n -w zsh "$1"
@@ -30,7 +31,7 @@
 >typeset .term.bg='#ffffdd'
 >typeset .term.version=1.20.2
 >typeset .term.mode=light
->typeset -a .term.extensions=( modkeys-kitty truecolor )
+>typeset -a .term.extensions=( -bracketed-paste -integration modkeys-kitty truecolor )
 
   termresp $'\e]11;rgb:0/0/0\e\\\e]10;rgb:ff/ff/ff\e\\\eP>|Wayst(0.0.0)\e\\\e[?63;1;4c'
 0:wayst response to terminal queries (shorter colour sequences)
@@ -39,6 +40,7 @@
 >typeset .term.bg='#000000'
 >typeset .term.version=0.0.0
 >typeset .term.mode=dark
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
   termresp $'\e]11;rgb:0000/0000/0000\e\\\e]10;rgb:b2b2/b2b2/b2b2\e\\\eP1+r524742=382F382F38\e\\\eP>|WezTerm 20240203-110809-5046fc22\e\\\e[?65;4;6;18;22c'
 0:WezTerm response to terminal queries (space separates version and longer RGB response)
@@ -47,13 +49,14 @@
 >typeset .term.bg='#000000'
 >typeset .term.version=20240203-110809-5046fc22
 >typeset .term.mode=dark
->typeset -a .term.extensions=( truecolor )
+>typeset -a .term.extensions=( -bracketed-paste -integration truecolor )
 
   termresp $'\e]11;rgb:9600/8700/7900\e\e]10;rgb:0000/0000/0000\e\e[?1;2c'
 0:urxvt response to terminal queries (bug in end of colour sequences)
 >typeset .term.fg='#000000'
 >typeset .term.bg='#968779'
 >typeset .term.mode=light
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
   termresp $'\e]11;rgb:0000/0000/0000\e\\\e]10;rgb:dddd/dddd/dddd\e\\\e[?0u\eP0+r524742\e\\\eP>|kitty(0.36.4)\e\\\e[?62;c'
 0:kitty response to terminal queries (responds with error to RGB request)
@@ -62,7 +65,7 @@
 >typeset .term.bg='#000000'
 >typeset .term.version=0.36.4
 >typeset .term.mode=dark
->typeset -a .term.extensions=( modkeys-kitty )
+>typeset -a .term.extensions=( -bracketed-paste -integration modkeys-kitty )
 
   termresp $'\e]11;rgb:0000/ffff/8c8c\e\\\e]10;rgb:0000/0000/0000\e\\\eP1+r524742=38\e\\\eP>|XTerm(396)\e\\\e[?64;1;2;6;9;15;16;17;18;21;22;28c'
 0:xterm response to terminal queries
@@ -71,7 +74,7 @@
 >typeset .term.bg='#00ff8c'
 >typeset .term.version=396
 >typeset .term.mode=light
->typeset -a .term.extensions=( truecolor )
+>typeset -a .term.extensions=( -bracketed-paste -integration truecolor )
 
   termresp $'echo type\e]11;rgb:0/0/0\aah\e]10;rgb:A/B/C\aea\e[?0u\eP0+r\e\\d\n\e[?0;c'
 0:type-ahead
@@ -79,24 +82,28 @@
 >typeset .term.fg='#0a0b0c'
 >typeset .term.bg='#000000'
 >typeset .term.mode=dark
->typeset -a .term.extensions=( modkeys-kitty )
+>typeset -a .term.extensions=( -bracketed-paste -integration modkeys-kitty )
 
   termresp ''
 0:no response - timeout
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
 # Following three vi-put tests also cover 0, 1 and 2 `=' padding
 # characters in the base64 decoding.
   termresp $'\e[?0;cbindkey -v\necho \e"*p\e]52;p;YWZ0ZXI=\aa\n'
 0:paste after from clipboard
 >after
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
   termresp $'\e[?0;cbindkey -v\necho X\e"*P\e]52;p;YmVmb3Jl\aa\n'
 0:paste before from clipboard
 >beforeX
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
   termresp $'\e[?0;cbindkey -v\necho X\ev"*p\e]52;p;cmVwbGFjZQ==\aa\n'
 0:paste over from clipboard
 >replace
+>typeset -a .term.extensions=( -bracketed-paste -integration )
 
 %clean