From: Sebastian Gniazdowski <sgniazdowski@gmail.com>
To: Bart Schaefer <schaefer@brasslantern.com>
Cc: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: Slow highlighting (Re: "drop-in replacement" and transpose-words-match)
Date: Wed, 10 Feb 2016 19:37:01 +0100 [thread overview]
Message-ID: <CAKc7PVC1BNFMBrB+BHAn31N0LGvY7GgCa28Yj39uxP=9rH1=1Q@mail.gmail.com> (raw)
In-Reply-To: <160210101846.ZM2333@torch.brasslantern.com>
Did a following test and indeed zed on 323 lines long function is still slow
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -87,10 +87,10 @@ _zsh_highlight_main_add_region_highlight() {
# NOTE: This runs 'setopt', but that should be safe since it'll only ever be
# called inside a $(...) subshell, so the effects will be local.
_zsh_highlight_main__type() {
- if (( $#options_to_set )); then
- setopt $options_to_set;
- fi
- LC_ALL=C builtin type -w -- $1 2>/dev/null
+ typeset -a arr
+ arr=( ': reserved' ': suffix alias' ': alias' ': builtin' ':
function' ': command' ': hashed' )
+ integer len=${#arr}
+ REPLY=${arr[ (RANDOM % len) + 1 ]}
}
# Main syntax highlighting function.
@@ -283,7 +283,8 @@ _zsh_highlight_main_highlighter()
else
_zsh_highlight_main_highlighter_expand_path $arg
local expanded_arg="$REPLY"
- local res="$(_zsh_highlight_main__type ${expanded_arg})"
+ _zsh_highlight_main__type ${expanded_arg}
+ local res="$REPLY"
() {
# Special-case: command word is '$foo', like that, without
braces or anything.
#
@@ -295,7 +296,8 @@ _zsh_highlight_main_highlighter()
local MATCH; integer MBEGIN MEND
if [[ $res == *': none' ]] && (( ${+parameters} )) &&
[[ ${arg[1]} == \$ ]] && [[ ${arg:1} =~
^([A-Za-z_][A-Za-z0-9_]*|[0-9]+)$ ]]; then
- res="$(_zsh_highlight_main__type ${(P)MATCH})"
+ _zsh_highlight_main__type ${(P)MATCH}
+ res="$REPLY"
fi
}
Best regards,
Sebastian Gniazdowski
next prev parent reply other threads:[~2016-02-10 18:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-12 7:32 "drop-in replacement" and transpose-words-match Bart Schaefer
2016-01-18 2:25 ` Daniel Shahaf
2016-01-18 16:29 ` Bart Schaefer
2016-01-18 17:04 ` Sebastian Gniazdowski
2016-01-19 6:31 ` Bart Schaefer
2016-01-19 8:28 ` Sebastian Gniazdowski
2016-01-20 3:56 ` Bart Schaefer
2016-01-23 23:53 ` Daniel Shahaf
2016-01-24 6:20 ` Slow highlighting (Re: "drop-in replacement" and transpose-words-match) Bart Schaefer
2016-01-26 22:50 ` Daniel Shahaf
2016-01-27 4:31 ` Bart Schaefer
2016-01-27 5:10 ` Mikael Magnusson
2016-01-29 9:18 ` Daniel Shahaf
2016-02-10 16:32 ` Sebastian Gniazdowski
2016-02-10 18:18 ` Bart Schaefer
2016-02-10 18:37 ` Sebastian Gniazdowski [this message]
2016-02-11 10:43 ` Sebastian Gniazdowski
2016-02-11 12:07 ` Sebastian Gniazdowski
2016-02-14 14:34 ` Daniel Shahaf
2016-02-11 16:11 ` Sebastian Gniazdowski
2016-02-12 7:34 ` Sebastian Gniazdowski
2016-02-12 10:05 ` Bart Schaefer
2016-02-14 14:34 ` Daniel Shahaf
2016-02-12 9:41 ` Bart Schaefer
2016-05-06 13:15 ` Sebastian Gniazdowski
2016-02-14 14:34 ` Avoiding github link bitrot " Daniel Shahaf
2016-01-20 7:47 ` "drop-in replacement" and transpose-words-match Daniel Shahaf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKc7PVC1BNFMBrB+BHAn31N0LGvY7GgCa28Yj39uxP=9rH1=1Q@mail.gmail.com' \
--to=sgniazdowski@gmail.com \
--cc=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).