Commit Graph

884 Commits

Author SHA1 Message Date
garinger
f1eb5aeef7 skip all brackets inside quotes (" and ') 2011-07-12 08:11:21 -07:00
garinger
2fe9505647 simplify check for bracket under cursor 2011-07-12 08:07:08 -07:00
garinger
05e4a031c7 * remove a safety belt - no need to check if array has elements, as defaults are provided
* reuse $pos instead of using another variable
* remove declaration forgotten in last commit
2011-07-12 07:56:12 -07:00
garinger
d4acac9837 eliminate a variable and simplify 2011-07-08 12:43:59 -07:00
garinger
ef74d2b611 Only match brackets of the same type 2011-07-08 12:25:09 -07:00
Julien Nicoulaud
eb749f2681 Merge pull request #62 from garinger/master
Fix for Issue #35 "Unclosed brackets not marked as error"
2011-07-08 08:30:04 -07:00
garinger
48c30a805a highlight opening bracket with "bracket-error" style, if the closing bracket is still missing 2011-07-08 07:52:32 -07:00
garinger
1858be26bd exclude .beep 2011-07-07 00:25:44 +08:00
garinger
3802e03b4c exclude .beep 2011-07-05 06:48:02 -07:00
Julien Nicoulaud
9e75ca0e76 Add @tednaleid to the list of contributors 2011-06-30 20:11:38 +02:00
Julien Nicoulaud
28720c77aa Some fixes consecutive to pull request #61 merge
* Allow to override highlighters directory through `ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR`
* Handle spaces in the directory path
* Use Zsh builtin "h" modifier instead of `dirname`
2011-06-30 20:08:43 +02:00
Julien Nicoulaud
df2fe2a97d Merge pull request #61 from tednaleid/master
Error: "unrecognized modifier 'A'" on startup for zsh 4.3.9 on OSX
2011-06-30 11:05:48 -07:00
Ted Naleid
4ed9f9a68f fix for issue #60, unrecognized modifier 'A' on startup 2011-06-29 21:32:58 -05:00
Julien Nicoulaud
e04f6ab862 Safety checks before looking up cursor position 2011-06-17 12:36:07 +02:00
Julien Nicoulaud
f6af27b8a6 More reliable way to hook precmd 2011-06-17 12:35:26 +02:00
Julien Nicoulaud
52bdb56fdb Merge pull request #57 from guidovansteen/patch-1
Much easier and less error prone way to start highlighting immediately af
2011-06-17 02:27:49 -07:00
Guido
71e797a8b5 Much easier and less error prone way to start highlighting immediately after the creation of a new command line. 2011-06-16 13:57:34 -07:00
Julien Nicoulaud
bf4fe1f228 Another README link fix 2011-06-16 14:56:55 +02:00
Julien Nicoulaud
1435868740 Another README link fix 2011-06-16 14:54:47 +02:00
Julien Nicoulaud
e7d7ccfe35 Group if statements in f26310d97e 2011-06-16 14:54:24 +02:00
Guido
f26310d97e * enable command lines starting with a hyphen. 2011-06-16 04:28:59 -07:00
Guido
56801a6b42 * added a workaround to start highlighting immediately after the creation of a new command line. 2011-06-16 04:26:51 -07:00
Julien Nicoulaud
ef4f5ed638 Fix READMEs 2011-06-12 23:16:41 +02:00
Julien Nicoulaud
bb7fcb79fa Fix #56: tolerance to WARN_GLOBAL option 2011-06-12 23:09:59 +02:00
Julien Nicoulaud
55e6a85fbb Merge branch 'master' of github.com:nicoulaj/zsh-syntax-highlighting
Conflicts:
	zsh-syntax-highlighting.zsh
2011-06-12 23:04:33 +02:00
Julien Nicoulaud
0772ddd346 Big refactoring.
* Don't override user defined styles
* Better modularisation of highlighters
* Allow to define which highlighters are activated
* Allow to define the order in which they are defined
* Minor performance optimizations
* Fixed some variables leak
* Improve documentation
* Brackets highlighter: use ZSH_HIGHLIGHT_STYLES instead of a specific array
2011-06-12 22:57:14 +02:00
NAKAMURA Yoshitaka
0999ab05ba do nothing if PENDING inputs are exist
Originally, zsh-syntax-highlighting called highlight functions at every inputs.
It's OK for user's keyboard inputs. But when long inputs come from clipboard,
it cause noticeable slowdown.
2011-03-12 16:31:18 +09:00
Julien Nicoulaud
19f16752bb Issue 49: Don't use readlink, options differ between systems
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-03-02 00:34:12 +01:00
Julien Nicoulaud
bc788f3f19 Start splitting highlighters to separate files.
The script still works on its own, highlighters in highlighters/ are
loaded as addons if present.

Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 23:41:01 +01:00
Julien Nicoulaud
2f0fb81af4 More efficient way to look for elements in arrays
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 22:27:31 +01:00
Julien Nicoulaud
3abf463753 More code style fixes
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 21:02:23 +01:00
Julien Nicoulaud
2670c93e05 Make sure functions names match _zsh_highlight_*
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 20:58:22 +01:00
Julien Nicoulaud
dd84bff854 Code style
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 19:51:07 +01:00
Julien Nicoulaud
6879d3c29f Issue 47: Removing styling of 'isearch' and 'special', as it has no effect
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-17 19:31:20 +01:00
Julien Nicoulaud
e1479022a0 Merge branch 'hchbaw-for-nicoulaj' 2011-02-17 19:20:32 +01:00
Julien Nicoulaud
69e7442e4d Add nakamuray to the list of contributors
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-16 22:42:18 +01:00
Julien Nicoulaud
fdc113996e Merge branch 'highlight-assignment' of https://github.com/nakamuray/zsh-syntax-highlighting into nakamuray-highlight-assignment 2011-02-16 22:39:45 +01:00
NAKAMURA Yoshitaka
390ab0fc32 Highlight variable assignment 2011-02-14 19:26:24 +09:00
Julien Nicoulaud
d66b15aeb0 Fix contributor URL
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-13 09:57:36 +01:00
Julien Nicoulaud
93c9e6a753 Split off contributors list to a separate file
Markdown for everyone

Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-01 21:07:00 +01:00
Julien Nicoulaud
ca79a5f65a Fix fish shell URL
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-01 21:02:45 +01:00
Julien Nicoulaud
78ff61eddc Fix typo
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-02-01 21:01:37 +01:00
Takeshi Banse
bb5f41ef6d Add contrib/keyword.zsh
Signed-off-by: Takeshi Banse <takebi@laafc.net>
2011-01-16 22:45:17 +09:00
Takeshi Banse
0948c3d676 Introduce _zsh_add-highlighter.
For easily extending the highlighting behavior, split the
actual highlighting function into some pieces.

For example "_zsh_main-highlight" transformed into,

1) An actual highlighting function which updates the
`region_highlight` on its own. (_zsh_main-highlight)
2) A predicate which determines whether its highlighting function
(in this case `_zsh_main-highlight`) should be called or not.
(_zsh_buffer-modified-p)

Likewise, `_zsh_highlight-bracket-match` and
`_zsh_highlight-bracket-match-p` are born.

Eventually, `_zsh_highlight-zle-buffer` coordinates above these
functions and maintain some internal state variables.

Finally, added `_zsh_add-highlighter` a little syntactic-sugar-ish
function to register the highlighting functions in an appropriate manner.

Signed-off-by: Takeshi Banse <takebi@laafc.net>
2011-01-16 20:32:53 +09:00
Takeshi Banse
6663c5647d Make bracket match a function.
Append it to ZSH_HIGHLIGHT_FUNCTIONS.

Signed-off-by: Takeshi Banse <takebi@laafc.net>
2011-01-16 20:32:20 +09:00
Takeshi Banse
07588d2165 Make core syntax highlighting a function.
Make `_zsh_highlight-zle-buffer` just a hands-off.
Now, `_zsh_highlight-zle-buffer` calls each ZSH_HIGHLIGHT_FUNCTIONS
in turn.  The former `_zsh_highlight-zle-buffer` is renamed to
`_zsh_main-highlight.`

Signed-off-by: Takeshi Banse <takebi@laafc.net>
2011-01-16 20:26:50 +09:00
Julien Nicoulaud
ea792cbf87 Add a mechanism for testing the correctness of the highlighting.
Feel free to add more test data !

Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-01-10 23:46:27 +01:00
Julien Nicoulaud
e162de6f51 Add BSD license
(http://www.zsh.org/mla/users//2011/msg00030.html)

Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-01-10 10:11:35 +01:00
Julien Nicoulaud
0392fdc46a Issue 34: Do not highlight non commands as commands.
Signed-off-by: Julien Nicoulaud <julien.nicoulaud@gmail.com>
2011-01-08 18:03:52 +01:00
Julien Nicoulaud
50b612cec4 Merge branch 'celtic-master' 2011-01-08 13:09:56 +01:00