mirror of
https://github.com/zsh-users/zsh-autosuggestions.git
synced 2025-12-06 23:30:39 +01:00
Compare commits
2 Commits
v0.7.0
...
features/r
| Author | SHA1 | Date | |
|---|---|---|---|
|
161de32912 | ||
|
|
de4256a63b |
@@ -5,6 +5,7 @@ jobs:
|
|||||||
shell: /bin/bash --login
|
shell: /bin/bash --login
|
||||||
docker:
|
docker:
|
||||||
- image: ericfreese/zsh-autosuggestions-test:latest
|
- image: ericfreese/zsh-autosuggestions-test:latest
|
||||||
|
command: /sbin/init
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run:
|
- run:
|
||||||
|
|||||||
36
.github/ISSUE_TEMPLATE/bug-report.md
vendored
36
.github/ISSUE_TEMPLATE/bug-report.md
vendored
@@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
name: Bug report
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: bug
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Describe the bug
|
|
||||||
<!-- A clear and concise description of what the bug is. -->
|
|
||||||
|
|
||||||
### To Reproduce
|
|
||||||
Steps to reproduce the behavior:
|
|
||||||
|
|
||||||
<!-- If you are not able to reproduce it by running `zsh -df` and sourcing the plugin manually, it means there that the issue is caused by something in your local config file(s). Temporarily comment out or remove sections of your config and restart `zsh` until you narrow down exactly what is causing the issue. -->
|
|
||||||
|
|
||||||
```sh
|
|
||||||
% zsh -df
|
|
||||||
% source path/to/zsh-autosuggestions.zsh
|
|
||||||
% ... # what do you do to reproduce?
|
|
||||||
```
|
|
||||||
|
|
||||||
### Expected behavior
|
|
||||||
<!-- A clear and concise description of what you expected to happen. -->
|
|
||||||
|
|
||||||
### Screenshots
|
|
||||||
<!-- If applicable, add screenshots to help explain your problem. -->
|
|
||||||
|
|
||||||
### Desktop
|
|
||||||
- OS + distribution: <!-- e.g. Arch Linux 2019.07.01 -->
|
|
||||||
- Zsh version: <!-- `echo $ZSH_VERSION` -->
|
|
||||||
- Plugin version: <!-- or git commit hash if installed via git -->
|
|
||||||
|
|
||||||
### Additional context
|
|
||||||
<!-- Add any other context about the problem here. -->
|
|
||||||
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: ''
|
|
||||||
labels: enhancement
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Is your feature request related to a problem? Please describe.
|
|
||||||
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
|
|
||||||
|
|
||||||
### Describe the solution you'd like
|
|
||||||
<!-- A clear and concise description of what you want to happen. -->
|
|
||||||
|
|
||||||
### Describe alternatives you've considered
|
|
||||||
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
|
|
||||||
|
|
||||||
### Additional context
|
|
||||||
<!-- Add any other context or screenshots about the feature request here. -->
|
|
||||||
40
CHANGELOG.md
40
CHANGELOG.md
@@ -1,43 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## v0.7.0
|
|
||||||
- Enable asynchronous mode by default (#498)
|
|
||||||
- No longer wrap user widgets starting with `autosuggest-` prefix (#496)
|
|
||||||
- Fix a bug wrapping widgets that modify the buffer (#541)
|
|
||||||
|
|
||||||
|
|
||||||
## v0.6.4
|
|
||||||
- Fix `vi-forward-char` triggering a bell when using it to accept a suggestion (#488)
|
|
||||||
- New configuration option to skip completion suggestions when buffer matches a pattern (#487)
|
|
||||||
- New configuration option to ignore history entries matching a pattern (#456)
|
|
||||||
|
|
||||||
## v0.6.3
|
|
||||||
- Fixed bug moving cursor to end of buffer after accepting suggestion (#453)
|
|
||||||
|
|
||||||
## v0.6.2
|
|
||||||
- Fixed bug deleting the last character in the buffer in vi mode (#450)
|
|
||||||
- Degrade gracefully when user doesn't have `zsh/system` module installed (#447)
|
|
||||||
|
|
||||||
## v0.6.1
|
|
||||||
- Fixed bug occurring when `_complete` had been aliased (#443)
|
|
||||||
|
|
||||||
## v0.6.0
|
|
||||||
- Added `completion` suggestion strategy powered by completion system (#111)
|
|
||||||
- Allow setting `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an empty string (#422)
|
|
||||||
- Don't fetch suggestions after copy-earlier-word (#439)
|
|
||||||
- Allow users to unignore zle-\* widgets (e.g. zle-line-init) (#432)
|
|
||||||
|
|
||||||
|
|
||||||
## v0.5.2
|
|
||||||
- Allow disabling automatic widget re-binding for better performance (#418)
|
|
||||||
- Fix async suggestions when `SH_WORD_SPLIT` is set
|
|
||||||
- Refactor async mode to use process substitution instead of zpty (#417)
|
|
||||||
|
|
||||||
## v0.5.1
|
|
||||||
- Speed up widget rebinding (#413)
|
|
||||||
- Clean up global variable creations (#403)
|
|
||||||
- Respect user's set options when running original widget (#402)
|
|
||||||
|
|
||||||
## v0.5.0
|
## v0.5.0
|
||||||
- Don't overwrite config with default values (#335)
|
- Don't overwrite config with default values (#335)
|
||||||
- Support fallback strategies by supplying array to suggestion config var
|
- Support fallback strategies by supplying array to suggestion config var
|
||||||
@@ -74,7 +36,7 @@
|
|||||||
- Experimental support for asynchronous suggestions (#170)
|
- Experimental support for asynchronous suggestions (#170)
|
||||||
- Fix problems with multi-line suggestions (#225)
|
- Fix problems with multi-line suggestions (#225)
|
||||||
- Optimize case where manually typing in suggestion
|
- Optimize case where manually typing in suggestion
|
||||||
- Avoid wrapping any zle-\* widgets (#206)
|
- Avoid wrapping any zle-* widgets (#206)
|
||||||
- Remove support for deprecated options from v0.0.x
|
- Remove support for deprecated options from v0.0.x
|
||||||
- Handle history entries that begin with dashes
|
- Handle history entries that begin with dashes
|
||||||
- Gracefully handle being sourced multiple times (#126)
|
- Gracefully handle being sourced multiple times (#126)
|
||||||
|
|||||||
111
INSTALL.md
111
INSTALL.md
@@ -1,53 +1,6 @@
|
|||||||
# Installation
|
## Installation
|
||||||
|
|
||||||
* [Packages](#packages)
|
### Manual (Git Clone)
|
||||||
* [Antigen](#antigen)
|
|
||||||
* [Oh My Zsh](#oh-my-zsh)
|
|
||||||
* [Manual](#manual-git-clone)
|
|
||||||
|
|
||||||
## Packages
|
|
||||||
|
|
||||||
| System | Package |
|
|
||||||
| ------------- | ------------- |
|
|
||||||
| Debian / Ubuntu | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
|
|
||||||
| Fedora / CentOS / RHEL / Scientific Linux | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
|
|
||||||
| OpenSUSE / SLE | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
|
|
||||||
| Arch Linux / Manjaro / Antergos / Hyperbola | [zsh-autosuggestions](https://www.archlinux.org/packages/zsh-autosuggestions), [zsh-autosuggestions-git](https://aur.archlinux.org/packages/zsh-autosuggestions-git) |
|
|
||||||
| NixOS | [zsh-autosuggestions](https://github.com/NixOS/nixpkgs/blob/master/pkgs/shells/zsh/zsh-autosuggestions/default.nix) |
|
|
||||||
| Void Linux | [zsh-autosuggestions](https://github.com/void-linux/void-packages/blob/master/srcpkgs/zsh-autosuggestions/template) |
|
|
||||||
| Mac OS | [homebrew](https://github.com/Homebrew/homebrew-core/blob/master/Formula/zsh-autosuggestions.rb) |
|
|
||||||
| NetBSD | [pkgsrc](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/shells/zsh-autosuggestions/README.html) |
|
|
||||||
|
|
||||||
## Antigen
|
|
||||||
|
|
||||||
1. Add the following to your `.zshrc`:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
antigen bundle zsh-users/zsh-autosuggestions
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Start a new terminal session.
|
|
||||||
|
|
||||||
## Oh My Zsh
|
|
||||||
|
|
||||||
1. Clone this repository into `$ZSH_CUSTOM/plugins` (by default `~/.oh-my-zsh/custom/plugins`)
|
|
||||||
|
|
||||||
```sh
|
|
||||||
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
|
||||||
```
|
|
||||||
|
|
||||||
2. Add the plugin to the list of plugins for Oh My Zsh to load (inside `~/.zshrc`):
|
|
||||||
|
|
||||||
```sh
|
|
||||||
plugins=(
|
|
||||||
# other plugins...
|
|
||||||
zsh-autosuggestions
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
3. Start a new terminal session.
|
|
||||||
|
|
||||||
## Manual (Git Clone)
|
|
||||||
|
|
||||||
1. Clone this repository somewhere on your machine. This guide will assume `~/.zsh/zsh-autosuggestions`.
|
1. Clone this repository somewhere on your machine. This guide will assume `~/.zsh/zsh-autosuggestions`.
|
||||||
|
|
||||||
@@ -62,3 +15,63 @@
|
|||||||
```
|
```
|
||||||
|
|
||||||
3. Start a new terminal session.
|
3. Start a new terminal session.
|
||||||
|
|
||||||
|
### Antigen
|
||||||
|
|
||||||
|
1. Add the following to your `.zshrc`:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
antigen bundle zsh-users/zsh-autosuggestions
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Start a new terminal session.
|
||||||
|
|
||||||
|
### Oh My Zsh
|
||||||
|
|
||||||
|
1. Clone this repository into `$ZSH_CUSTOM/plugins` (by default `~/.oh-my-zsh/custom/plugins`)
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Add the plugin to the list of plugins for Oh My Zsh to load (inside `~/.zshrc`):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
plugins=(zsh-autosuggestions)
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Start a new terminal session.
|
||||||
|
|
||||||
|
### Arch Linux
|
||||||
|
|
||||||
|
1. Install [`zsh-autosuggestions`](https://www.archlinux.org/packages/community/any/zsh-autosuggestions/) from the `community` repository.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
pacman -S zsh-autosuggestions
|
||||||
|
```
|
||||||
|
|
||||||
|
or, to use a package based on the `master` branch, install [`zsh-autosuggestions-git`](https://aur.archlinux.org/packages/zsh-autosuggestions-git/) from the [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository).
|
||||||
|
|
||||||
|
2. Add the following to your `.zshrc`:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Start a new terminal session.
|
||||||
|
|
||||||
|
### macOS via Homebrew
|
||||||
|
1. Install the `zsh-autosuggestions` package using [Homebrew](https://brew.sh/).
|
||||||
|
|
||||||
|
```sh
|
||||||
|
brew install zsh-autosuggestions
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Add the following to your `.zshrc`:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
source /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Start a new terminal session.
|
||||||
|
|
||||||
|
|||||||
2
LICENSE
2
LICENSE
@@ -1,5 +1,5 @@
|
|||||||
Copyright (c) 2013 Thiago de Arruda
|
Copyright (c) 2013 Thiago de Arruda
|
||||||
Copyright (c) 2016-2021 Eric Freese
|
Copyright (c) 2016-2018 Eric Freese
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person
|
Permission is hereby granted, free of charge, to any person
|
||||||
obtaining a copy of this software and associated documentation
|
obtaining a copy of this software and associated documentation
|
||||||
|
|||||||
2
Makefile
2
Makefile
@@ -1,8 +1,10 @@
|
|||||||
SRC_DIR := ./src
|
SRC_DIR := ./src
|
||||||
|
|
||||||
SRC_FILES := \
|
SRC_FILES := \
|
||||||
|
$(SRC_DIR)/setup.zsh \
|
||||||
$(SRC_DIR)/config.zsh \
|
$(SRC_DIR)/config.zsh \
|
||||||
$(SRC_DIR)/util.zsh \
|
$(SRC_DIR)/util.zsh \
|
||||||
|
$(SRC_DIR)/features.zsh \
|
||||||
$(SRC_DIR)/bind.zsh \
|
$(SRC_DIR)/bind.zsh \
|
||||||
$(SRC_DIR)/highlight.zsh \
|
$(SRC_DIR)/highlight.zsh \
|
||||||
$(SRC_DIR)/widgets.zsh \
|
$(SRC_DIR)/widgets.zsh \
|
||||||
|
|||||||
49
README.md
49
README.md
@@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
_[Fish](http://fishshell.com/)-like fast/unobtrusive autosuggestions for zsh._
|
_[Fish](http://fishshell.com/)-like fast/unobtrusive autosuggestions for zsh._
|
||||||
|
|
||||||
It suggests commands as you type based on history and completions.
|
It suggests commands as you type, based on command history.
|
||||||
|
|
||||||
Requirements: Zsh v4.3.11 or later
|
Requirements: Zsh v4.3.11 or later
|
||||||
|
|
||||||
[](https://circleci.com/gh/zsh-users/zsh-autosuggestions)
|
[](https://circleci.com/gh/zsh-users/zsh-autosuggestions)
|
||||||
[](https://gitter.im/zsh-users/zsh-autosuggestions)
|
|
||||||
|
|
||||||
<a href="https://asciinema.org/a/37390" target="_blank"><img src="https://asciinema.org/a/37390.png" width="400" /></a>
|
<a href="https://asciinema.org/a/37390" target="_blank"><img src="https://asciinema.org/a/37390.png" width="400" /></a>
|
||||||
|
|
||||||
@@ -35,29 +34,16 @@ You may want to override the default global config variables. Default values of
|
|||||||
|
|
||||||
### Suggestion Highlight Style
|
### Suggestion Highlight Style
|
||||||
|
|
||||||
Set `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` to configure the style that the suggestion is shown with. The default is `fg=8`, which will set the foreground color to color 8 from the [256-color palette](https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg). If your terminal only supports 8 colors, you will need to use a number between 0 and 7.
|
Set `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` to configure the style that the suggestion is shown with. The default is `fg=8`.
|
||||||
|
|
||||||
Background color can also be set, and the suggestion can be styled bold, underlined, or standout. For example, this would show suggestions with bold, underlined, pink text on a cyan background:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ff00ff,bg=cyan,bold,underline"
|
|
||||||
```
|
|
||||||
|
|
||||||
For more info, read the Character Highlighting section of the zsh manual: `man zshzle` or [online](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting).
|
|
||||||
|
|
||||||
**Note:** Some iTerm2 users have reported [not being able to see the suggestions](https://github.com/zsh-users/zsh-autosuggestions/issues/416#issuecomment-486516333). If this affects you, the problem is likely caused by incorrect color settings. In order to correct this, go into iTerm2's setting, navigate to profile > colors and make sure that the colors for Basic Colors > Background and ANSI Colors > Bright Black are **different**.
|
|
||||||
|
|
||||||
|
|
||||||
### Suggestion Strategy
|
### Suggestion Strategy
|
||||||
|
|
||||||
`ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. The strategies in the array are tried successively until a suggestion is found. There are currently three built-in strategies to choose from:
|
`ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. The strategies in the array are tried successively until a suggestion is found. There are currently two built-in strategies to choose from:
|
||||||
|
|
||||||
- `history`: Chooses the most recent match from history.
|
- `history`: Chooses the most recent match from history.
|
||||||
- `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module)
|
|
||||||
- `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
|
- `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
|
||||||
|
|
||||||
For example, setting `ZSH_AUTOSUGGEST_STRATEGY=(history completion)` will first try to find a suggestion from your history, but, if it can't find a match, will find a suggestion from the completion engine.
|
|
||||||
|
|
||||||
|
|
||||||
### Widget Mapping
|
### Widget Mapping
|
||||||
|
|
||||||
@@ -77,29 +63,11 @@ Widgets that modify the buffer and are not found in any of these arrays will fet
|
|||||||
### Disabling suggestion for large buffers
|
### Disabling suggestion for large buffers
|
||||||
|
|
||||||
Set `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an integer value to disable autosuggestion for large buffers. The default is unset, which means that autosuggestion will be tried for any buffer size. Recommended value is 20.
|
Set `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an integer value to disable autosuggestion for large buffers. The default is unset, which means that autosuggestion will be tried for any buffer size. Recommended value is 20.
|
||||||
This can be useful when pasting large amount of text in the terminal, to avoid triggering autosuggestion for strings that are too long.
|
This can be useful when pasting large amount of text in the terminal, to avoid triggering autosuggestion for too long strings.
|
||||||
|
|
||||||
### Asynchronous Mode
|
### Enable Asynchronous Mode
|
||||||
|
|
||||||
Suggestions are fetched asynchronously by default in zsh versions 5.0.8 and greater. To disable asynchronous suggestions and fetch them synchronously instead, `unset ZSH_AUTOSUGGEST_USE_ASYNC` after sourcing the plugin.
|
As of `v0.4.0`, suggestions can be fetched asynchronously using the `zsh/zpty` module. To enable this behavior, set the `ZSH_AUTOSUGGEST_USE_ASYNC` variable (it can be set to anything).
|
||||||
|
|
||||||
Alternatively, if you are using a version of zsh older than 5.0.8 and want to enable asynchronous mode, set the `ZSH_AUTOSUGGEST_USE_ASYNC` variable after sourcing the plugin (it can be set to anything). Note that there is [a bug](https://github.com/zsh-users/zsh-autosuggestions/issues/364#issuecomment-481423232) in versions of zsh older than 5.0.8 where <kbd>ctrl</kbd> + <kbd>c</kbd> will fail to reset the prompt immediately after fetching a suggestion asynchronously.
|
|
||||||
|
|
||||||
### Disabling automatic widget re-binding
|
|
||||||
|
|
||||||
Set `ZSH_AUTOSUGGEST_MANUAL_REBIND` (it can be set to anything) to disable automatic widget re-binding on each precmd. This can be a big boost to performance, but you'll need to handle re-binding yourself if any of the widget lists change or if you or another plugin wrap any of the autosuggest widgets. To re-bind widgets, run `_zsh_autosuggest_bind_widgets`.
|
|
||||||
|
|
||||||
### Ignoring history suggestions that match a pattern
|
|
||||||
|
|
||||||
Set `ZSH_AUTOSUGGEST_HISTORY_IGNORE` to a [glob pattern](http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators) to prevent offering suggestions for history entries that match the pattern. For example, set it to `"cd *"` to never suggest any `cd` commands from history. Or set to `"?(#c50,)"` to never suggest anything 50 characters or longer.
|
|
||||||
|
|
||||||
**Note:** This only affects the `history` and `match_prev_cmd` suggestion strategies.
|
|
||||||
|
|
||||||
### Skipping completion suggestions for certain cases
|
|
||||||
|
|
||||||
Set `ZSH_AUTOSUGGEST_COMPLETION_IGNORE` to a [glob pattern](http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators) to prevent offering completion suggestions when the buffer matches that pattern. For example, set it to `"git *"` to disable completion suggestions for git subcommands.
|
|
||||||
|
|
||||||
**Note:** This only affects the `completion` suggestion strategy.
|
|
||||||
|
|
||||||
|
|
||||||
### Key Bindings
|
### Key Bindings
|
||||||
@@ -123,7 +91,8 @@ bindkey '^ ' autosuggest-accept
|
|||||||
|
|
||||||
## Troubleshooting
|
## Troubleshooting
|
||||||
|
|
||||||
If you have a problem, please search through [the list of issues on GitHub](https://github.com/zsh-users/zsh-autosuggestions/issues?q=) to see if someone else has already reported it.
|
If you have a problem, please search through [the list of issues on GitHub](https://github.com/zsh-users/zsh-autosuggestions/issues) to see if someone else has already reported it.
|
||||||
|
|
||||||
|
|
||||||
### Reporting an Issue
|
### Reporting an Issue
|
||||||
|
|
||||||
|
|||||||
@@ -13,5 +13,3 @@
|
|||||||
5.4.2
|
5.4.2
|
||||||
5.5.1
|
5.5.1
|
||||||
5.6.2
|
5.6.2
|
||||||
5.7.1
|
|
||||||
5.8
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ for v in $(grep "^[^#]" ZSH_VERSIONS); do
|
|||||||
--enable-cap \
|
--enable-cap \
|
||||||
--enable-multibyte \
|
--enable-multibyte \
|
||||||
--with-term-lib='ncursesw tinfo' \
|
--with-term-lib='ncursesw tinfo' \
|
||||||
--with-tcsetpgrp \
|
--without-tcsetpgrp \
|
||||||
--program-suffix="-$v"
|
--program-suffix="-$v"
|
||||||
|
|
||||||
make install.bin
|
make install.bin
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
context 'with asynchronous suggestions enabled' do
|
context 'with asynchronous suggestions enabled' do
|
||||||
|
before do
|
||||||
|
skip 'Async mode not supported below v5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
|
||||||
|
end
|
||||||
|
|
||||||
let(:options) { ["ZSH_AUTOSUGGEST_USE_ASYNC="] }
|
let(:options) { ["ZSH_AUTOSUGGEST_USE_ASYNC="] }
|
||||||
|
|
||||||
describe '`up-line-or-beginning-search`' do
|
describe '`up-line-or-beginning-search`' do
|
||||||
@@ -27,42 +31,52 @@ context 'with asynchronous suggestions enabled' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '`copy-earlier-word`' do
|
it 'should not add extra carriage returns before newlines' do
|
||||||
let(:before_sourcing) do
|
session.
|
||||||
-> do
|
send_string('echo "').
|
||||||
session.
|
send_keys('escape').
|
||||||
run_command('autoload -Uz copy-earlier-word').
|
send_keys('enter').
|
||||||
run_command('zle -N copy-earlier-word').
|
send_string('"').
|
||||||
run_command('bindkey "^N" copy-earlier-word')
|
send_keys('enter')
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should cycle through previous words in the buffer' do
|
session.clear_screen
|
||||||
session.clear_screen
|
|
||||||
session.send_string('foo bar baz')
|
session.send_string('echo')
|
||||||
sleep 0.5
|
wait_for { session.content }.to eq("echo \"\n\"")
|
||||||
session.send_keys('C-n')
|
|
||||||
wait_for { session.content }.to eq('foo bar bazbaz')
|
|
||||||
session.send_keys('C-n')
|
|
||||||
wait_for { session.content }.to eq('foo bar bazbar')
|
|
||||||
session.send_keys('C-n')
|
|
||||||
wait_for { session.content }.to eq('foo bar bazfoo')
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'pressing ^C after fetching a suggestion' do
|
it 'should treat carriage returns and newlines as separate characters' do
|
||||||
before do
|
session.
|
||||||
skip 'Workaround does not work below v5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
|
send_string('echo "').
|
||||||
end
|
send_keys('C-v').
|
||||||
|
send_keys('enter').
|
||||||
|
send_string('foo"').
|
||||||
|
send_keys('enter')
|
||||||
|
|
||||||
it 'terminates the prompt and begins a new one' do
|
session.
|
||||||
session.send_keys('e')
|
send_string('echo "').
|
||||||
sleep 0.5
|
send_keys('control').
|
||||||
session.send_keys('C-c')
|
send_keys('enter').
|
||||||
sleep 0.5
|
send_string('bar"').
|
||||||
session.send_keys('echo')
|
send_keys('enter')
|
||||||
|
|
||||||
wait_for { session.content }.to eq("e\necho")
|
session.clear_screen
|
||||||
|
|
||||||
|
session.
|
||||||
|
send_string('echo "').
|
||||||
|
send_keys('C-v').
|
||||||
|
send_keys('enter')
|
||||||
|
|
||||||
|
wait_for { session.content }.to eq('echo "^Mfoo"')
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'exiting a subshell' do
|
||||||
|
it 'should not cause error messages to be printed' do
|
||||||
|
session.run_command('$(exit)')
|
||||||
|
|
||||||
|
sleep 1
|
||||||
|
|
||||||
|
expect(session.content).to eq('$(exit)')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -24,20 +24,4 @@ describe 'pasting using bracketed-paste-magic' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'with `bracketed-paste` added to the list of widgets that clear the suggestion' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(bracketed-paste)'] }
|
|
||||||
|
|
||||||
it 'does not retain an old suggestion' do
|
|
||||||
with_history ('echo foo') do
|
|
||||||
session.send_string('echo ')
|
|
||||||
wait_for { session.content }.to eq('echo foo')
|
|
||||||
session.paste_string('bar')
|
|
||||||
wait_for { session.content }.to eq('echo bar')
|
|
||||||
session.send_keys('C-a') # Any cursor movement works
|
|
||||||
sleep 1
|
|
||||||
expect(session.content).to eq('echo bar')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,14 +1,10 @@
|
|||||||
describe 'a running zpty command' do
|
describe 'a running zpty command' do
|
||||||
let(:before_sourcing) { -> { session.run_command('zmodload zsh/zpty && zpty -b kitty cat') } }
|
let(:before_sourcing) { -> { session.run_command('zmodload zsh/zpty && zpty -b kitty cat') } }
|
||||||
|
|
||||||
context 'when using `completion` strategy' do
|
it 'is not affected by running zsh-autosuggestions' do
|
||||||
let(:options) { ["ZSH_AUTOSUGGEST_STRATEGY=completion"] }
|
sleep 1 # Give a little time for precmd hooks to run
|
||||||
|
session.run_command('zpty -t kitty; echo $?')
|
||||||
|
|
||||||
it 'is not affected' do
|
wait_for { session.content }.to end_with("\n0")
|
||||||
session.send_keys('a').send_keys('C-h')
|
|
||||||
session.run_command('zpty -t kitty; echo $?')
|
|
||||||
|
|
||||||
wait_for { session.content }.to end_with("\n0")
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -63,18 +63,5 @@ describe 'when using vi mode' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '`vi-delete`' do
|
|
||||||
it 'should be able to remove the last character in the buffer' do
|
|
||||||
skip 'deleting last char did not work below zsh version 5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
|
|
||||||
|
|
||||||
session.
|
|
||||||
send_string('echo foo').
|
|
||||||
send_keys('escape').
|
|
||||||
send_keys('d').
|
|
||||||
send_keys('l')
|
|
||||||
|
|
||||||
wait_for { session.content }.to eq('echo fo')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,24 @@
|
|||||||
describe 'a wrapped widget' do
|
describe 'a wrapped widget' do
|
||||||
let(:widget) { 'backward-delete-char' }
|
let(:widget) { 'backward-delete-char' }
|
||||||
|
|
||||||
context 'initialized before sourcing the plugin' do
|
let(:initialize_widget) do
|
||||||
let(:before_sourcing) do
|
-> do
|
||||||
-> do
|
session.run_command(<<~ZSH)
|
||||||
session.
|
if [[ "$widgets[#{widget}]" == "builtin" ]]; then
|
||||||
run_command("_orig_#{widget}() { zle .#{widget} }").
|
_orig_#{widget}() { zle .#{widget} }
|
||||||
run_command("zle -N orig-#{widget} _orig_#{widget}").
|
zle -N orig-#{widget} _orig_#{widget}
|
||||||
run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
|
else
|
||||||
run_command("zle -N #{widget} #{widget}-magic")
|
zle -N orig-#{widget} ${widgets[#{widget}]#*:}
|
||||||
end
|
fi
|
||||||
|
|
||||||
|
#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }
|
||||||
|
zle -N #{widget} #{widget}-magic
|
||||||
|
ZSH
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'initialized before sourcing the plugin' do
|
||||||
|
let(:before_sourcing) { initialize_widget }
|
||||||
|
|
||||||
it 'executes the custom behavior and the built-in behavior' do
|
it 'executes the custom behavior and the built-in behavior' do
|
||||||
with_history('foobar', 'foodar') do
|
with_history('foobar', 'foodar') do
|
||||||
@@ -21,13 +29,7 @@ describe 'a wrapped widget' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
context 'initialized after sourcing the plugin' do
|
context 'initialized after sourcing the plugin' do
|
||||||
before do
|
let(:after_sourcing) { initialize_widget }
|
||||||
session.
|
|
||||||
run_command("zle -N orig-#{widget} ${widgets[#{widget}]#*:}").
|
|
||||||
run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
|
|
||||||
run_command("zle -N #{widget} #{widget}-magic").
|
|
||||||
clear_screen
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'executes the custom behavior and the built-in behavior' do
|
it 'executes the custom behavior and the built-in behavior' do
|
||||||
with_history('foobar', 'foodar') do
|
with_history('foobar', 'foodar') do
|
||||||
|
|||||||
@@ -9,8 +9,9 @@ describe 'using `zle -U`' do
|
|||||||
|
|
||||||
let(:options) { ['unset ZSH_AUTOSUGGEST_USE_ASYNC', 'ZSH_AUTOSUGGEST_STRATEGY=test'] }
|
let(:options) { ['unset ZSH_AUTOSUGGEST_USE_ASYNC', 'ZSH_AUTOSUGGEST_STRATEGY=test'] }
|
||||||
|
|
||||||
# TODO: This is only possible with the $KEYS_QUEUED_COUNT widget parameter, coming soon...
|
it 'does not fetch a suggestion for every inserted character' do
|
||||||
xit 'does not fetch a suggestion for every inserted character' do
|
skip 'KEYS_QUEUED_COUNT not supported below v5.4.0' if session.zsh_version < Gem::Version.new('5.4.0')
|
||||||
|
|
||||||
session.send_keys('C-b')
|
session.send_keys('C-b')
|
||||||
wait_for { session.content }.to eq('echo hello')
|
wait_for { session.content }.to eq('echo hello')
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
context 'with zle-line-init unignored' do
|
|
||||||
let(:after_sourcing) do
|
|
||||||
-> do
|
|
||||||
session.
|
|
||||||
run_command('setopt extendedglob').
|
|
||||||
run_command('ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(${(@)ZSH_AUTOSUGGEST_IGNORE_WIDGETS:#zle-\*} zle-\^line-init)').
|
|
||||||
run_command('zle-line-init() { BUFFER="echo" }')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should fetch a suggestion on each line initialization' do
|
|
||||||
with_history('echo foo') do
|
|
||||||
session.run_command('zle -N zle-line-init')
|
|
||||||
wait_for { session.content }.to end_with('echo foo')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,6 +1,11 @@
|
|||||||
describe 'a multi-line suggestion' do
|
describe 'a multi-line suggestion' do
|
||||||
it 'should be displayed on multiple lines' do
|
it 'should be displayed on multiple lines' do
|
||||||
with_history("echo \"\n\"") do
|
with_history(-> {
|
||||||
|
session.send_string('echo "')
|
||||||
|
session.send_keys('enter')
|
||||||
|
session.send_string('"')
|
||||||
|
session.send_keys('enter')
|
||||||
|
}) do
|
||||||
session.send_keys('e')
|
session.send_keys('e')
|
||||||
wait_for { session.content }.to eq("echo \"\n\"")
|
wait_for { session.content }.to eq("echo \"\n\"")
|
||||||
end
|
end
|
||||||
|
|||||||
19
spec/options/async_zpty_name_spec.rb
Normal file
19
spec/options/async_zpty_name_spec.rb
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
context 'when async suggestions are enabled' do
|
||||||
|
let(:options) { ["ZSH_AUTOSUGGEST_USE_ASYNC="] }
|
||||||
|
|
||||||
|
describe 'the zpty for async suggestions' do
|
||||||
|
it 'is created with the default name' do
|
||||||
|
session.run_command('zpty -t zsh_autosuggest_pty &>/dev/null; echo $?')
|
||||||
|
wait_for { session.content }.to end_with("\n0")
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'when ZSH_AUTOSUGGEST_ASYNC_PTY_NAME is set' do
|
||||||
|
let(:options) { super() + ['ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=foo_pty'] }
|
||||||
|
|
||||||
|
it 'is created with the specified name' do
|
||||||
|
session.run_command('zpty -t foo_pty &>/dev/null; echo $?')
|
||||||
|
wait_for { session.content }.to end_with("\n0")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
7
spec/options/use_async_spec.rb
Normal file
7
spec/options/use_async_spec.rb
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
describe 'suggestion fetching' do
|
||||||
|
it 'is performed synchronously'
|
||||||
|
|
||||||
|
context 'when ZSH_AUTOSUGGEST_USE_ASYNC is set' do
|
||||||
|
it 'is performed asynchronously'
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -5,13 +5,12 @@ describe 'a zle widget' do
|
|||||||
context 'when added to ZSH_AUTOSUGGEST_ACCEPT_WIDGETS' do
|
context 'when added to ZSH_AUTOSUGGEST_ACCEPT_WIDGETS' do
|
||||||
let(:options) { ["ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=(#{widget})"] }
|
let(:options) { ["ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=(#{widget})"] }
|
||||||
|
|
||||||
it 'accepts the suggestion and moves the cursor to the end of the buffer when invoked' do
|
it 'accepts the suggestion when invoked' do
|
||||||
with_history('echo hello') do
|
with_history('echo hello') do
|
||||||
session.send_string('e')
|
session.send_string('e')
|
||||||
wait_for { session.content }.to eq('echo hello')
|
wait_for { session.content }.to eq('echo hello')
|
||||||
session.send_keys('C-b')
|
session.send_keys('C-b')
|
||||||
wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
|
wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
|
||||||
wait_for { session.cursor }.to eq([10, 0])
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -42,12 +41,20 @@ describe 'a zle widget' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when added to ZSH_AUTOSUGGEST_IGNORE_WIDGETS' do
|
context 'that accesses POSTDISPLAY' do
|
||||||
let(:options) { ["ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(#{widget})"] }
|
before { session.run_command("#{widget}() { zle -M \"POSTDISPLAY=$POSTDISPLAY\" }") }
|
||||||
|
|
||||||
it 'should not be wrapped with an autosuggest widget' do
|
context 'when added to ZSH_AUTOSUGGEST_IGNORE_WIDGETS' do
|
||||||
session.run_command("echo $widgets[#{widget}]")
|
let(:options) { ["ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(#{widget})"] }
|
||||||
wait_for { session.content }.to end_with("\nuser:#{widget}")
|
|
||||||
|
it 'gets the correct POSTDISPLAY value' do
|
||||||
|
with_history('echo hello') do
|
||||||
|
session.send_string('e')
|
||||||
|
wait_for { session.content }.to start_with('echo hello')
|
||||||
|
session.send_keys('C-b')
|
||||||
|
wait_for { session.content }.to end_with("\nPOSTDISPLAY=cho hello")
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -95,27 +102,4 @@ describe 'a modification to the widget lists' do
|
|||||||
wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
|
wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when manual rebind is enabled' do
|
|
||||||
let(:options) { ["ZSH_AUTOSUGGEST_MANUAL_REBIND=true"] }
|
|
||||||
|
|
||||||
it 'does not take effect until bind command is re-run' do
|
|
||||||
with_history('echo hello') do
|
|
||||||
session.send_string('e')
|
|
||||||
wait_for { session.content }.to eq('echo hello')
|
|
||||||
session.send_keys('C-b')
|
|
||||||
sleep 1
|
|
||||||
expect(session.content(esc_seqs: true)).not_to eq('echo hello')
|
|
||||||
|
|
||||||
session.send_keys('C-c')
|
|
||||||
session.run_command('_zsh_autosuggest_bind_widgets').clear_screen
|
|
||||||
wait_for { session.content }.to eq('')
|
|
||||||
|
|
||||||
session.send_string('e')
|
|
||||||
wait_for { session.content }.to eq('echo hello')
|
|
||||||
session.send_keys('C-b')
|
|
||||||
wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
require 'pry'
|
require 'pry'
|
||||||
require 'rspec/wait'
|
require 'rspec/wait'
|
||||||
require 'terminal_session'
|
require 'terminal_session'
|
||||||
require 'tempfile'
|
|
||||||
|
|
||||||
RSpec.shared_context 'terminal session' do
|
RSpec.shared_context 'terminal session' do
|
||||||
let(:term_opts) { {} }
|
let(:term_opts) { {} }
|
||||||
@@ -12,7 +11,8 @@ RSpec.shared_context 'terminal session' do
|
|||||||
|
|
||||||
around do |example|
|
around do |example|
|
||||||
before_sourcing.call
|
before_sourcing.call
|
||||||
session.run_command(['source zsh-autosuggestions.zsh', *options].join('; '))
|
session.run_command(options.join('; '))
|
||||||
|
session.run_command('source zsh-autosuggestions.zsh')
|
||||||
after_sourcing.call
|
after_sourcing.call
|
||||||
session.clear_screen
|
session.clear_screen
|
||||||
|
|
||||||
@@ -22,20 +22,18 @@ RSpec.shared_context 'terminal session' do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def with_history(*commands, &block)
|
def with_history(*commands, &block)
|
||||||
Tempfile.create do |f|
|
session.run_command('fc -p')
|
||||||
f.write(commands.map{|c| c.gsub("\n", "\\\n")}.join("\n"))
|
|
||||||
f.flush
|
|
||||||
|
|
||||||
session.run_command('fc -p')
|
commands.each do |c|
|
||||||
session.run_command("fc -R #{f.path}")
|
c.respond_to?(:call) ? c.call : session.run_command(c)
|
||||||
|
|
||||||
session.clear_screen
|
|
||||||
|
|
||||||
yield block
|
|
||||||
|
|
||||||
session.send_keys('C-c')
|
|
||||||
session.run_command('fc -P')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
session.clear_screen
|
||||||
|
|
||||||
|
yield block
|
||||||
|
|
||||||
|
session.send_keys('C-c')
|
||||||
|
session.run_command('fc -P')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
describe 'the `completion` suggestion strategy' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=completion'] }
|
|
||||||
let(:before_sourcing) do
|
|
||||||
-> do
|
|
||||||
session.
|
|
||||||
run_command('autoload compinit && compinit').
|
|
||||||
run_command('_foo() { compadd bar; compadd bat }').
|
|
||||||
run_command('_num() { compadd two; compadd three }').
|
|
||||||
run_command('compdef _foo baz').
|
|
||||||
run_command('compdef _num one')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'suggests the first completion result' do
|
|
||||||
session.send_string('baz ')
|
|
||||||
wait_for { session.content }.to eq('baz bar')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not add extra carriage returns when prefix has a line feed' do
|
|
||||||
skip '`stty` does not work inside zpty below zsh version 5.0.3' if session.zsh_version < Gem::Version.new('5.0.3')
|
|
||||||
session.send_string('baz \\').send_keys('C-v', 'C-j')
|
|
||||||
wait_for { session.content }.to eq("baz \\\nbar")
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when `_complete` is aliased' do
|
|
||||||
let(:before_sourcing) do
|
|
||||||
-> do
|
|
||||||
session.
|
|
||||||
run_command('autoload compinit && compinit').
|
|
||||||
run_command('_foo() { compadd bar; compadd bat }').
|
|
||||||
run_command('compdef _foo baz').
|
|
||||||
run_command('alias _complete=_complete')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'suggests the first completion result' do
|
|
||||||
session.send_string('baz ')
|
|
||||||
wait_for { session.content }.to eq('baz bar')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when ZSH_AUTOSUGGEST_COMPLETION_IGNORE is set to a pattern' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=completion', 'ZSH_AUTOSUGGEST_COMPLETION_IGNORE="one *"'] }
|
|
||||||
|
|
||||||
it 'makes suggestions when the buffer does not match the pattern' do
|
|
||||||
session.send_string('baz ')
|
|
||||||
wait_for { session.content }.to eq('baz bar')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not make suggestions when the buffer matches the pattern' do
|
|
||||||
session.send_string('one t')
|
|
||||||
sleep 1
|
|
||||||
expect(session.content).to eq('one t')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
context 'when async mode is enabled' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_USE_ASYNC=true', 'ZSH_AUTOSUGGEST_STRATEGY=completion'] }
|
|
||||||
|
|
||||||
it 'suggests the first completion result' do
|
|
||||||
session.send_string('baz ')
|
|
||||||
wait_for { session.content }.to eq('baz bar')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not add extra carriage returns when prefix has a line feed' do
|
|
||||||
skip '`stty` does not work inside zpty below zsh version 5.0.3' if session.zsh_version < Gem::Version.new('5.0.3')
|
|
||||||
session.send_string('baz \\').send_keys('C-v', 'C-j')
|
|
||||||
wait_for { session.content }.to eq("baz \\\nbar")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
@@ -8,16 +8,5 @@ describe 'the `history` suggestion strategy' do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when ZSH_AUTOSUGGEST_HISTORY_IGNORE is set to a pattern' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_HISTORY_IGNORE="* bar"'] }
|
|
||||||
|
|
||||||
it 'does not make suggestions that match the pattern' do
|
|
||||||
with_history('ls foo', 'ls bar', 'echo baz') do
|
|
||||||
session.send_string('ls')
|
|
||||||
wait_for { session.content }.to eq('ls foo')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'special characters'
|
include_examples 'special characters'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -3,32 +3,19 @@ require 'strategies/special_characters_helper'
|
|||||||
describe 'the `match_prev_cmd` strategy' do
|
describe 'the `match_prev_cmd` strategy' do
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd'] }
|
let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd'] }
|
||||||
|
|
||||||
let(:history) { [
|
|
||||||
'echo what',
|
|
||||||
'ls foo',
|
|
||||||
'echo what',
|
|
||||||
'ls bar',
|
|
||||||
'ls baz',
|
|
||||||
'echo what'
|
|
||||||
] }
|
|
||||||
|
|
||||||
it 'suggests the last matching history entry after the previous command' do
|
it 'suggests the last matching history entry after the previous command' do
|
||||||
with_history(*history) do
|
with_history(
|
||||||
|
'echo what',
|
||||||
|
'ls foo',
|
||||||
|
'echo what',
|
||||||
|
'ls bar',
|
||||||
|
'ls baz',
|
||||||
|
'echo what'
|
||||||
|
) do
|
||||||
session.send_string('ls')
|
session.send_string('ls')
|
||||||
wait_for { session.content }.to eq('ls bar')
|
wait_for { session.content }.to eq('ls bar')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when ZSH_AUTOSUGGEST_HISTORY_IGNORE is set to a pattern' do
|
|
||||||
let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd', 'ZSH_AUTOSUGGEST_HISTORY_IGNORE="* bar"'] }
|
|
||||||
|
|
||||||
it 'does not make suggestions that match the pattern' do
|
|
||||||
with_history(*history) do
|
|
||||||
session.send_string('ls')
|
|
||||||
wait_for { session.content }.to eq('ls foo')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
include_examples 'special characters'
|
include_examples 'special characters'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,71 +1,58 @@
|
|||||||
shared_examples 'special characters' do
|
shared_examples 'special characters' do
|
||||||
describe 'a special character in the buffer should be treated like any other character' do
|
describe 'a special character in the buffer' do
|
||||||
it 'asterisk' do
|
it 'should be treated like any other character' do
|
||||||
with_history('echo "hello*"', 'echo "hello."') do
|
with_history('echo "hello*"', 'echo "hello."') do
|
||||||
session.send_string('echo "hello*')
|
session.send_string('echo "hello*')
|
||||||
wait_for { session.content }.to eq('echo "hello*"')
|
wait_for { session.content }.to eq('echo "hello*"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'question mark' do
|
|
||||||
with_history('echo "hello?"', 'echo "hello."') do
|
with_history('echo "hello?"', 'echo "hello."') do
|
||||||
session.send_string('echo "hello?')
|
session.send_string('echo "hello?')
|
||||||
wait_for { session.content }.to eq('echo "hello?"')
|
wait_for { session.content }.to eq('echo "hello?"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'backslash' do
|
|
||||||
with_history('echo "hello\nworld"') do
|
with_history('echo "hello\nworld"') do
|
||||||
session.send_string('echo "hello\\')
|
session.send_string('echo "hello\\')
|
||||||
wait_for { session.content }.to eq('echo "hello\nworld"')
|
wait_for { session.content }.to eq('echo "hello\nworld"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'double backslash' do
|
|
||||||
with_history('echo "\\\\"') do
|
with_history('echo "\\\\"') do
|
||||||
session.send_string('echo "\\\\')
|
session.send_string('echo "\\\\')
|
||||||
wait_for { session.content }.to eq('echo "\\\\"')
|
wait_for { session.content }.to eq('echo "\\\\"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'tilde' do
|
|
||||||
with_history('echo ~/foo') do
|
with_history('echo ~/foo') do
|
||||||
session.send_string('echo ~')
|
session.send_string('echo ~')
|
||||||
wait_for { session.content }.to eq('echo ~/foo')
|
wait_for { session.content }.to eq('echo ~/foo')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'parentheses' do
|
|
||||||
with_history('echo "$(ls foo)"') do
|
with_history('echo "$(ls foo)"') do
|
||||||
session.send_string('echo "$(')
|
session.send_string('echo "$(')
|
||||||
wait_for { session.content }.to eq('echo "$(ls foo)"')
|
wait_for { session.content }.to eq('echo "$(ls foo)"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'square bracket' do
|
|
||||||
with_history('echo "$history[123]"') do
|
with_history('echo "$history[123]"') do
|
||||||
session.send_string('echo "$history[')
|
session.send_string('echo "$history[')
|
||||||
wait_for { session.content }.to eq('echo "$history[123]"')
|
wait_for { session.content }.to eq('echo "$history[123]"')
|
||||||
session.send_string('123]')
|
session.send_string('123]')
|
||||||
wait_for { session.content }.to eq('echo "$history[123]"')
|
wait_for { session.content }.to eq('echo "$history[123]"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'octothorpe' do
|
|
||||||
with_history('echo "#yolo"') do
|
with_history('echo "#yolo"') do
|
||||||
session.send_string('echo "#')
|
session.send_string('echo "#')
|
||||||
wait_for { session.content }.to eq('echo "#yolo"')
|
wait_for { session.content }.to eq('echo "#yolo"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'caret' do
|
with_history('echo "#foo"', 'echo $#abc') do
|
||||||
|
session.send_string('echo "#')
|
||||||
|
wait_for { session.content }.to eq('echo "#foo"')
|
||||||
|
end
|
||||||
|
|
||||||
with_history('echo "^A"', 'echo "^B"') do
|
with_history('echo "^A"', 'echo "^B"') do
|
||||||
session.send_string('echo "^A')
|
session.send_string('echo "^A')
|
||||||
wait_for { session.content }.to eq('echo "^A"')
|
wait_for { session.content }.to eq('echo "^A"')
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
it 'dash' do
|
|
||||||
with_history('-foo() {}') do
|
with_history('-foo() {}') do
|
||||||
session.send_string('-')
|
session.send_string('-')
|
||||||
wait_for { session.content }.to eq('-foo() {}')
|
wait_for { session.content }.to eq('-foo() {}')
|
||||||
|
|||||||
135
src/async.zsh
135
src/async.zsh
@@ -3,74 +3,107 @@
|
|||||||
# Async #
|
# Async #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
_zsh_autosuggest_async_request() {
|
# Zpty process is spawned running this function
|
||||||
zmodload zsh/system 2>/dev/null # For `$sysparams`
|
_zsh_autosuggest_async_server() {
|
||||||
|
emulate -R zsh
|
||||||
|
|
||||||
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
|
# There is a bug in zpty module (fixed in zsh/master) by which a
|
||||||
|
# zpty that exits will kill all zpty processes that were forked
|
||||||
|
# before it. Here we set up a zsh exit hook to SIGKILL the zpty
|
||||||
|
# process immediately, before it has a chance to kill any other
|
||||||
|
# zpty processes.
|
||||||
|
zshexit() {
|
||||||
|
kill -KILL $$
|
||||||
|
sleep 1 # Block for long enough for the signal to come through
|
||||||
|
}
|
||||||
|
|
||||||
# If we've got a pending request, cancel it
|
# Don't add any extra carriage returns
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then
|
stty -onlcr
|
||||||
# Close the file descriptor and remove the handler
|
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
|
|
||||||
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
|
||||||
|
|
||||||
# We won't know the pid unless the user has zsh/system module installed
|
# Don't translate carriage returns to newlines
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
|
stty -icrnl
|
||||||
# Zsh will make a new process group for the child process only if job
|
|
||||||
# control is enabled (MONITOR option)
|
|
||||||
if [[ -o MONITOR ]]; then
|
|
||||||
# Send the signal to the process group to kill any processes that may
|
|
||||||
# have been forked by the suggestion strategy
|
|
||||||
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
|
||||||
else
|
|
||||||
# Kill just the child process since it wasn't placed in a new process
|
|
||||||
# group. If the suggestion strategy forked any child processes they may
|
|
||||||
# be orphaned and left behind.
|
|
||||||
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Fork a process to fetch a suggestion and open a pipe to read from it
|
# Silence any error messages
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
exec 2>/dev/null
|
||||||
# Tell parent process our pid
|
|
||||||
echo $sysparams[pid]
|
|
||||||
|
|
||||||
# Fetch and print the suggestion
|
local last_pid
|
||||||
local suggestion
|
|
||||||
_zsh_autosuggest_fetch_suggestion "$1"
|
|
||||||
echo -nE "$suggestion"
|
|
||||||
)
|
|
||||||
|
|
||||||
# There's a weird bug here where ^C stops working unless we force a fork
|
while IFS='' read -r -d $'\0' query; do
|
||||||
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
|
# Kill last bg process
|
||||||
autoload -Uz is-at-least
|
kill -KILL $last_pid &>/dev/null
|
||||||
is-at-least 5.8 || command true
|
|
||||||
|
|
||||||
# Read the pid from the child process
|
# Run suggestion search in the background
|
||||||
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
(
|
||||||
|
local suggestion
|
||||||
|
_zsh_autosuggest_fetch_suggestion "$query"
|
||||||
|
echo -n -E "$suggestion"$'\0'
|
||||||
|
) &
|
||||||
|
|
||||||
# When the fd is readable, call the response handler
|
last_pid=$!
|
||||||
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Called when new data is ready to be read from the pipe
|
_zsh_autosuggest_async_request() {
|
||||||
|
# Write the query to the zpty process to fetch a suggestion
|
||||||
|
zpty -w -n $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME "${1}"$'\0'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Called when new data is ready to be read from the pty
|
||||||
# First arg will be fd ready for reading
|
# First arg will be fd ready for reading
|
||||||
# Second arg will be passed in case of error
|
# Second arg will be passed in case of error
|
||||||
_zsh_autosuggest_async_response() {
|
_zsh_autosuggest_async_response() {
|
||||||
emulate -L zsh
|
setopt LOCAL_OPTIONS EXTENDED_GLOB
|
||||||
|
|
||||||
local suggestion
|
local suggestion
|
||||||
|
|
||||||
if [[ -z "$2" || "$2" == "hup" ]]; then
|
zpty -rt $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME suggestion '*'$'\0' 2>/dev/null
|
||||||
# Read everything from the fd and give it as a suggestion
|
zle autosuggest-suggest -- "${suggestion%%$'\0'##}"
|
||||||
IFS='' read -rd '' -u $1 suggestion
|
}
|
||||||
zle autosuggest-suggest -- "$suggestion"
|
|
||||||
|
|
||||||
# Close the fd
|
_zsh_autosuggest_async_pty_create() {
|
||||||
exec {1}<&-
|
# With newer versions of zsh, REPLY stores the fd to read from
|
||||||
|
typeset -h REPLY
|
||||||
|
|
||||||
|
# If we won't get a fd back from zpty, try to guess it
|
||||||
|
if (( ! $_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD )); then
|
||||||
|
integer -l zptyfd
|
||||||
|
exec {zptyfd}>&1 # Open a new file descriptor (above 10).
|
||||||
|
exec {zptyfd}>&- # Close it so it's free to be used by zpty.
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always remove the handler
|
# Fork a zpty process running the server function
|
||||||
zle -F "$1"
|
zpty -b $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME _zsh_autosuggest_async_server
|
||||||
|
|
||||||
|
# Store the fd so we can remove the handler later
|
||||||
|
if (( REPLY )); then
|
||||||
|
_ZSH_AUTOSUGGEST_PTY_FD=$REPLY
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_PTY_FD=$zptyfd
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set up input handler from the zpty
|
||||||
|
zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_response
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_pty_destroy() {
|
||||||
|
# Remove the input handler
|
||||||
|
zle -F $_ZSH_AUTOSUGGEST_PTY_FD &>/dev/null
|
||||||
|
|
||||||
|
# Destroy the zpty
|
||||||
|
zpty -d $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME &>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_pty_recreate() {
|
||||||
|
_zsh_autosuggest_async_pty_destroy
|
||||||
|
_zsh_autosuggest_async_pty_create
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_start() {
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_PTY_FD
|
||||||
|
|
||||||
|
_zsh_autosuggest_feature_detect_zpty_returns_fd
|
||||||
|
_zsh_autosuggest_async_pty_recreate
|
||||||
|
|
||||||
|
# We recreate the pty to get a fresh list of history events
|
||||||
|
add-zsh-hook precmd _zsh_autosuggest_async_pty_recreate
|
||||||
}
|
}
|
||||||
|
|||||||
75
src/bind.zsh
75
src/bind.zsh
@@ -4,8 +4,21 @@
|
|||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
_zsh_autosuggest_incr_bind_count() {
|
_zsh_autosuggest_incr_bind_count() {
|
||||||
typeset -gi bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]+1))
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
|
||||||
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=$bind_count
|
((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]++))
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_get_bind_count() {
|
||||||
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
|
||||||
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
|
||||||
|
else
|
||||||
|
typeset -gi bind_count=0
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Bind a single widget to an autosuggest widget, saving a reference to the original widget
|
# Bind a single widget to an autosuggest widget, saving a reference to the original widget
|
||||||
@@ -21,30 +34,30 @@ _zsh_autosuggest_bind_widget() {
|
|||||||
# Save a reference to the original widget
|
# Save a reference to the original widget
|
||||||
case $widgets[$widget] in
|
case $widgets[$widget] in
|
||||||
# Already bound
|
# Already bound
|
||||||
user:_zsh_autosuggest_(bound|orig)_*)
|
user:_zsh_autosuggest_(bound|orig)_*);;
|
||||||
bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$widget]))
|
|
||||||
;;
|
|
||||||
|
|
||||||
# User-defined widget
|
# User-defined widget
|
||||||
user:*)
|
user:*)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
zle -N $prefix$bind_count-$widget ${widgets[$widget]#*:}
|
zle -N $prefix${bind_count}-$widget ${widgets[$widget]#*:}
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Built-in widget
|
# Built-in widget
|
||||||
builtin)
|
builtin)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
|
eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
|
||||||
zle -N $prefix$bind_count-$widget _zsh_autosuggest_orig_$widget
|
zle -N $prefix${bind_count}-$widget _zsh_autosuggest_orig_$widget
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Completion widget
|
# Completion widget
|
||||||
completion:*)
|
completion:*)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
eval "zle -C $prefix$bind_count-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
|
eval "zle -C $prefix${bind_count}-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
_zsh_autosuggest_get_bind_count $widget
|
||||||
|
|
||||||
# Pass the original widget's name explicitly into the autosuggest
|
# Pass the original widget's name explicitly into the autosuggest
|
||||||
# function. Use this passed in widget name to call the original
|
# function. Use this passed in widget name to call the original
|
||||||
# widget instead of relying on the $WIDGET variable being set
|
# widget instead of relying on the $WIDGET variable being set
|
||||||
@@ -59,35 +72,49 @@ _zsh_autosuggest_bind_widget() {
|
|||||||
zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
|
zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_bind_autosuggest_widgets() {
|
||||||
|
local widget
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_CLEAR_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget clear
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_ACCEPT_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget accept
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_EXECUTE_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget execute
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget partial_accept
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
# Map all configured widgets to the right autosuggest widgets
|
# Map all configured widgets to the right autosuggest widgets
|
||||||
_zsh_autosuggest_bind_widgets() {
|
_zsh_autosuggest_bind_modify_widgets() {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
local widget
|
local widget
|
||||||
local ignore_widgets
|
local ignore_widgets
|
||||||
|
|
||||||
ignore_widgets=(
|
ignore_widgets=(
|
||||||
.\*
|
.\*
|
||||||
_\*
|
_\*
|
||||||
${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
|
zle-\*
|
||||||
|
autosuggest-\*
|
||||||
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
|
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
|
||||||
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
|
||||||
)
|
)
|
||||||
|
|
||||||
# Find every widget we might want to bind and bind it appropriately
|
# Assume any widget omitted from the config arrays might modify the buffer
|
||||||
for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
|
for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
|
||||||
if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
|
_zsh_autosuggest_bind_widget $widget modify
|
||||||
_zsh_autosuggest_bind_widget $widget clear
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget accept
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget execute
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget partial_accept
|
|
||||||
else
|
|
||||||
# Assume any unspecified widget might modify the buffer
|
|
||||||
_zsh_autosuggest_bind_widget $widget modify
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
up-line-or-history
|
up-line-or-history
|
||||||
down-line-or-history
|
down-line-or-history
|
||||||
accept-line
|
accept-line
|
||||||
copy-earlier-word
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,6 +73,7 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Widgets that should be ignored (globbing supported but must be escaped)
|
# Widgets that should be ignored (globbing supported but must be escaped)
|
||||||
|
# Only relevant for zsh versions older than 5.4
|
||||||
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
|
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
|
||||||
typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
|
ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
|
||||||
@@ -84,10 +84,13 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
which-command
|
which-command
|
||||||
yank
|
yank
|
||||||
yank-pop
|
yank-pop
|
||||||
zle-\*
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Pty name for capturing completions for completion suggestion strategy
|
# Max size of buffer to trigger autosuggestion. Leave null for no upper bound.
|
||||||
(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
|
(( ! ${+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE} )) &&
|
||||||
typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
|
typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
|
||||||
|
|
||||||
|
# Pty name for calculating autosuggestions asynchronously
|
||||||
|
(( ! ${+ZSH_AUTOSUGGEST_ASYNC_PTY_NAME} )) &&
|
||||||
|
typeset -g ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty
|
||||||
|
|||||||
19
src/features.zsh
Normal file
19
src/features.zsh
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
# Feature Detection #
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
|
_zsh_autosuggest_feature_detect_zpty_returns_fd() {
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD
|
||||||
|
typeset -h REPLY
|
||||||
|
|
||||||
|
zpty zsh_autosuggest_feature_detect '{ zshexit() { kill -KILL $$; sleep 1 } }'
|
||||||
|
|
||||||
|
if (( REPLY )); then
|
||||||
|
_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD=1
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
zpty -d zsh_autosuggest_feature_detect
|
||||||
|
}
|
||||||
@@ -18,10 +18,7 @@ _zsh_autosuggest_fetch_suggestion() {
|
|||||||
# Try to get a suggestion from this strategy
|
# Try to get a suggestion from this strategy
|
||||||
_zsh_autosuggest_strategy_$strategy "$1"
|
_zsh_autosuggest_strategy_$strategy "$1"
|
||||||
|
|
||||||
# Ensure the suggestion matches the prefix
|
# Break once we've found a suggestion
|
||||||
[[ "$suggestion" != "$1"* ]] && unset suggestion
|
|
||||||
|
|
||||||
# Break once we've found a valid suggestion
|
|
||||||
[[ -n "$suggestion" ]] && break
|
[[ -n "$suggestion" ]] && break
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|||||||
12
src/setup.zsh
Normal file
12
src/setup.zsh
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
# Setup #
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
|
# Precmd hooks for initializing the library and starting pty's
|
||||||
|
autoload -Uz add-zsh-hook
|
||||||
|
autoload -Uz add-zle-hook-widget
|
||||||
|
autoload -Uz is-at-least
|
||||||
|
|
||||||
|
# Asynchronous suggestions are generated in a pty
|
||||||
|
zmodload zsh/zpty
|
||||||
@@ -5,29 +5,29 @@
|
|||||||
|
|
||||||
# Start the autosuggestion widgets
|
# Start the autosuggestion widgets
|
||||||
_zsh_autosuggest_start() {
|
_zsh_autosuggest_start() {
|
||||||
# By default we re-bind widgets on every precmd to ensure we wrap other
|
add-zsh-hook -d precmd _zsh_autosuggest_start
|
||||||
# wrappers. Specifically, highlighting breaks if our widgets are wrapped by
|
|
||||||
# zsh-syntax-highlighting widgets. This also allows modifications to the
|
# Re-bind widgets on every precmd to ensure we wrap other wrappers.
|
||||||
# widget list variables to take effect on the next precmd. However this has
|
# Specifically, highlighting breaks if our widgets are wrapped by
|
||||||
# a decent performance hit, so users can set ZSH_AUTOSUGGEST_MANUAL_REBIND
|
# zsh-syntax-highlighting widgets. This also allows modifications
|
||||||
# to disable the automatic re-binding.
|
# to the widget list variables to take effect on the next precmd.
|
||||||
if (( ${+ZSH_AUTOSUGGEST_MANUAL_REBIND} )); then
|
_zsh_autosuggest_bind_autosuggest_widgets
|
||||||
add-zsh-hook -d precmd _zsh_autosuggest_start
|
add-zsh-hook precmd _zsh_autosuggest_bind_autosuggest_widgets
|
||||||
|
|
||||||
|
# If available, use a ZLE redraw hook to trigger fetching suggestions.
|
||||||
|
# Otherwise, we need to wrap all widgets and fetch suggestions after
|
||||||
|
# running them.
|
||||||
|
if is-at-least 5.4; then
|
||||||
|
add-zle-hook-widget line-pre-redraw autosuggest-redraw
|
||||||
|
else
|
||||||
|
_zsh_autosuggest_bind_modify_widgets
|
||||||
|
add-zsh-hook precmd _zsh_autosuggest_bind_modify_widgets
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_zsh_autosuggest_bind_widgets
|
if [[ -n "${ZSH_AUTOSUGGEST_USE_ASYNC+x}" ]]; then
|
||||||
|
_zsh_autosuggest_async_start
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Mark for auto-loading the functions that we use
|
|
||||||
autoload -Uz add-zsh-hook is-at-least
|
|
||||||
|
|
||||||
# Automatically enable asynchronous mode in newer versions of zsh. Disable for
|
|
||||||
# older versions because there is a bug when using async mode where ^C does not
|
|
||||||
# work immediately after fetching a suggestion.
|
|
||||||
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
|
|
||||||
if is-at-least 5.0.8; then
|
|
||||||
typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start the autosuggestion widgets on the next precmd
|
# Start the autosuggestion widgets on the next precmd
|
||||||
add-zsh-hook precmd _zsh_autosuggest_start
|
add-zsh-hook precmd _zsh_autosuggest_start
|
||||||
|
|||||||
@@ -1,137 +0,0 @@
|
|||||||
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
# Completion Suggestion Strategy #
|
|
||||||
#--------------------------------------------------------------------#
|
|
||||||
# Fetches a suggestion from the completion engine
|
|
||||||
#
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_postcompletion() {
|
|
||||||
# Always insert the first completion into the buffer
|
|
||||||
compstate[insert]=1
|
|
||||||
|
|
||||||
# Don't list completions
|
|
||||||
unset 'compstate[list]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_widget() {
|
|
||||||
# Add a post-completion hook to be called after all completions have been
|
|
||||||
# gathered. The hook can modify compstate to affect what is done with the
|
|
||||||
# gathered completions.
|
|
||||||
local -a +h comppostfuncs
|
|
||||||
comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
|
|
||||||
|
|
||||||
# Only capture completions at the end of the buffer
|
|
||||||
CURSOR=$#BUFFER
|
|
||||||
|
|
||||||
# Run the original widget wrapping `.complete-word` so we don't
|
|
||||||
# recursively try to fetch suggestions, since our pty is forked
|
|
||||||
# after autosuggestions is initialized.
|
|
||||||
zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
|
|
||||||
|
|
||||||
if is-at-least 5.0.3; then
|
|
||||||
# Don't do any cr/lf transformations. We need to do this immediately before
|
|
||||||
# output because if we do it in setup, onlcr will be re-enabled when we enter
|
|
||||||
# vared in the async code path. There is a bug in zpty module in older versions
|
|
||||||
# where the tty is not properly attached to the pty slave, resulting in stty
|
|
||||||
# getting stopped with a SIGTTOU. See zsh-workers thread 31660 and upstream
|
|
||||||
# commit f75904a38
|
|
||||||
stty -onlcr -ocrnl -F /dev/tty
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The completion has been added, print the buffer as the suggestion
|
|
||||||
echo -nE - $'\0'$BUFFER$'\0'
|
|
||||||
}
|
|
||||||
|
|
||||||
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_setup() {
|
|
||||||
# There is a bug in zpty module in older zsh versions by which a
|
|
||||||
# zpty that exits will kill all zpty processes that were forked
|
|
||||||
# before it. Here we set up a zsh exit hook to SIGKILL the zpty
|
|
||||||
# process immediately, before it has a chance to kill any other
|
|
||||||
# zpty processes.
|
|
||||||
if ! is-at-least 5.4; then
|
|
||||||
zshexit() {
|
|
||||||
# The zsh builtin `kill` fails sometimes in older versions
|
|
||||||
# https://unix.stackexchange.com/a/477647/156673
|
|
||||||
kill -KILL $$ 2>&- || command kill -KILL $$
|
|
||||||
|
|
||||||
# Block for long enough for the signal to come through
|
|
||||||
sleep 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to avoid any suggestions that wouldn't match the prefix
|
|
||||||
zstyle ':completion:*' matcher-list ''
|
|
||||||
zstyle ':completion:*' path-completion false
|
|
||||||
zstyle ':completion:*' max-errors 0 not-numeric
|
|
||||||
|
|
||||||
bindkey '^I' autosuggest-capture-completion
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_sync() {
|
|
||||||
_zsh_autosuggest_capture_setup
|
|
||||||
|
|
||||||
zle autosuggest-capture-completion
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_async() {
|
|
||||||
_zsh_autosuggest_capture_setup
|
|
||||||
|
|
||||||
zmodload zsh/parameter 2>/dev/null || return # For `$functions`
|
|
||||||
|
|
||||||
# Make vared completion work as if for a normal command line
|
|
||||||
# https://stackoverflow.com/a/7057118/154703
|
|
||||||
autoload +X _complete
|
|
||||||
functions[_original_complete]=$functions[_complete]
|
|
||||||
function _complete() {
|
|
||||||
unset 'compstate[vared]'
|
|
||||||
_original_complete "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Open zle with buffer set so we can capture completions for it
|
|
||||||
vared 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_completion() {
|
|
||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
|
||||||
emulate -L zsh
|
|
||||||
|
|
||||||
# Enable extended glob for completion ignore pattern
|
|
||||||
setopt EXTENDED_GLOB
|
|
||||||
|
|
||||||
typeset -g suggestion
|
|
||||||
local line REPLY
|
|
||||||
|
|
||||||
# Exit if we don't have completions
|
|
||||||
whence compdef >/dev/null || return
|
|
||||||
|
|
||||||
# Exit if we don't have zpty
|
|
||||||
zmodload zsh/zpty 2>/dev/null || return
|
|
||||||
|
|
||||||
# Exit if our search string matches the ignore pattern
|
|
||||||
[[ -n "$ZSH_AUTOSUGGEST_COMPLETION_IGNORE" ]] && [[ "$1" == $~ZSH_AUTOSUGGEST_COMPLETION_IGNORE ]] && return
|
|
||||||
|
|
||||||
# Zle will be inactive if we are in async mode
|
|
||||||
if zle; then
|
|
||||||
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
|
|
||||||
else
|
|
||||||
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
|
|
||||||
zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
|
|
||||||
fi
|
|
||||||
|
|
||||||
{
|
|
||||||
# The completion result is surrounded by null bytes, so read the
|
|
||||||
# content between the first two null bytes.
|
|
||||||
zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
|
|
||||||
|
|
||||||
# Extract the suggestion from between the null bytes. On older
|
|
||||||
# versions of zsh (older than 5.3), we sometimes get extra bytes after
|
|
||||||
# the second null byte, so trim those off the end.
|
|
||||||
# See http://www.zsh.org/mla/workers/2015/msg03290.html
|
|
||||||
suggestion="${${(@0)line}[2]}"
|
|
||||||
} always {
|
|
||||||
# Destroy the pty
|
|
||||||
zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,7 +10,7 @@ _zsh_autosuggest_strategy_history() {
|
|||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
# Reset options to defaults and enable LOCAL_OPTIONS
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m) and (x~y) glob operator
|
# Enable globbing flags so that we can use (#m)
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
# Escape backslashes and all of the glob operators so we can use
|
# Escape backslashes and all of the glob operators so we can use
|
||||||
@@ -19,14 +19,7 @@ _zsh_autosuggest_strategy_history() {
|
|||||||
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
||||||
|
|
||||||
# Get the history items that match the prefix, excluding those that match
|
# Get the history items that match
|
||||||
# the ignore pattern
|
|
||||||
local pattern="$prefix*"
|
|
||||||
if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
|
|
||||||
pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Give the first history item matching the pattern as the suggestion
|
|
||||||
# - (r) subscript flag makes the pattern match on values
|
# - (r) subscript flag makes the pattern match on values
|
||||||
typeset -g suggestion="${history[(r)$pattern]}"
|
typeset -g suggestion="${history[(r)${prefix}*]}"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,23 +24,16 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
|
|||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
# Reset options to defaults and enable LOCAL_OPTIONS
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m) and (x~y) glob operator
|
# Enable globbing flags so that we can use (#m)
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
||||||
|
|
||||||
# Get the history items that match the prefix, excluding those that match
|
|
||||||
# the ignore pattern
|
|
||||||
local pattern="$prefix*"
|
|
||||||
if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
|
|
||||||
pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get all history event numbers that correspond to history
|
# Get all history event numbers that correspond to history
|
||||||
# entries that match the pattern
|
# entries that match pattern $prefix*
|
||||||
local history_match_keys
|
local history_match_keys
|
||||||
history_match_keys=(${(k)history[(R)$~pattern]})
|
history_match_keys=(${(k)history[(R)$prefix*]})
|
||||||
|
|
||||||
# By default we use the first history number (most recent history entry)
|
# By default we use the first history number (most recent history entry)
|
||||||
local histkey="${history_match_keys[1]}"
|
local histkey="${history_match_keys[1]}"
|
||||||
|
|||||||
153
src/widgets.zsh
153
src/widgets.zsh
@@ -20,7 +20,7 @@ _zsh_autosuggest_enable() {
|
|||||||
|
|
||||||
# Toggle suggestions (enable/disable)
|
# Toggle suggestions (enable/disable)
|
||||||
_zsh_autosuggest_toggle() {
|
_zsh_autosuggest_toggle() {
|
||||||
if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
|
if [[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]]; then
|
||||||
_zsh_autosuggest_enable
|
_zsh_autosuggest_enable
|
||||||
else
|
else
|
||||||
_zsh_autosuggest_disable
|
_zsh_autosuggest_disable
|
||||||
@@ -39,52 +39,28 @@ _zsh_autosuggest_clear() {
|
|||||||
_zsh_autosuggest_modify() {
|
_zsh_autosuggest_modify() {
|
||||||
local -i retval
|
local -i retval
|
||||||
|
|
||||||
# Only available in zsh >= 5.4
|
# Save the contents of the postdisplay
|
||||||
local -i KEYS_QUEUED_COUNT
|
|
||||||
|
|
||||||
# Save the contents of the buffer/postdisplay
|
|
||||||
local orig_buffer="$BUFFER"
|
|
||||||
local orig_postdisplay="$POSTDISPLAY"
|
local orig_postdisplay="$POSTDISPLAY"
|
||||||
|
|
||||||
# Clear suggestion while waiting for next one
|
# Clear suggestion while original widget runs
|
||||||
unset POSTDISPLAY
|
unset POSTDISPLAY
|
||||||
|
|
||||||
# Original widget may modify the buffer
|
# Original widget may modify the buffer
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
_zsh_autosuggest_invoke_original_widget $@
|
||||||
retval=$?
|
retval=$?
|
||||||
|
|
||||||
emulate -L zsh
|
# Restore postdisplay to be used in redraw
|
||||||
|
POSTDISPLAY="$orig_postdisplay"
|
||||||
|
|
||||||
# Don't fetch a new suggestion if there's more input to be read immediately
|
# Run redraw to fetch a suggestion if needed
|
||||||
if (( $PENDING > 0 || $KEYS_QUEUED_COUNT > 0 )); then
|
_zsh_autosuggest_redraw
|
||||||
POSTDISPLAY="$orig_postdisplay"
|
|
||||||
return $retval
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Optimize if manually typing in the suggestion or if buffer hasn't changed
|
|
||||||
if [[ "$BUFFER" = "$orig_buffer"* && "$orig_postdisplay" = "${BUFFER:$#orig_buffer}"* ]]; then
|
|
||||||
POSTDISPLAY="${orig_postdisplay:$(($#BUFFER - $#orig_buffer))}"
|
|
||||||
return $retval
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Bail out if suggestions are disabled
|
|
||||||
if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
|
|
||||||
return $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get a new suggestion if the buffer is not empty after modification
|
|
||||||
if (( $#BUFFER > 0 )); then
|
|
||||||
if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
|
|
||||||
_zsh_autosuggest_fetch
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
return $retval
|
return $retval
|
||||||
}
|
}
|
||||||
|
|
||||||
# Fetch a new suggestion based on what's currently in the buffer
|
# Fetch a new suggestion based on what's currently in the buffer
|
||||||
_zsh_autosuggest_fetch() {
|
_zsh_autosuggest_fetch() {
|
||||||
if (( ${+ZSH_AUTOSUGGEST_USE_ASYNC} )); then
|
if zpty -t "$ZSH_AUTOSUGGEST_ASYNC_PTY_NAME" &>/dev/null; then
|
||||||
_zsh_autosuggest_async_request "$BUFFER"
|
_zsh_autosuggest_async_request "$BUFFER"
|
||||||
else
|
else
|
||||||
local suggestion
|
local suggestion
|
||||||
@@ -108,7 +84,7 @@ _zsh_autosuggest_suggest() {
|
|||||||
|
|
||||||
# Accept the entire suggestion
|
# Accept the entire suggestion
|
||||||
_zsh_autosuggest_accept() {
|
_zsh_autosuggest_accept() {
|
||||||
local -i retval max_cursor_pos=$#BUFFER
|
local -i max_cursor_pos=$#BUFFER
|
||||||
|
|
||||||
# When vicmd keymap is active, the cursor can't move all the way
|
# When vicmd keymap is active, the cursor can't move all the way
|
||||||
# to the end of the buffer
|
# to the end of the buffer
|
||||||
@@ -116,33 +92,19 @@ _zsh_autosuggest_accept() {
|
|||||||
max_cursor_pos=$((max_cursor_pos - 1))
|
max_cursor_pos=$((max_cursor_pos - 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If we're not in a valid state to accept a suggestion, just run the
|
|
||||||
# original widget and bail out
|
|
||||||
if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
|
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Only accept if the cursor is at the end of the buffer
|
# Only accept if the cursor is at the end of the buffer
|
||||||
# Add the suggestion to the buffer
|
if [[ $CURSOR = $max_cursor_pos ]]; then
|
||||||
BUFFER="$BUFFER$POSTDISPLAY"
|
# Add the suggestion to the buffer
|
||||||
|
BUFFER="$BUFFER$POSTDISPLAY"
|
||||||
|
|
||||||
# Remove the suggestion
|
# Remove the suggestion
|
||||||
unset POSTDISPLAY
|
unset POSTDISPLAY
|
||||||
|
|
||||||
# Run the original widget before manually moving the cursor so that the
|
# Move the cursor to the end of the buffer
|
||||||
# cursor movement doesn't make the widget do something unexpected
|
CURSOR=${#BUFFER}
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
|
||||||
retval=$?
|
|
||||||
|
|
||||||
# Move the cursor to the end of the buffer
|
|
||||||
if [[ "$KEYMAP" = "vicmd" ]]; then
|
|
||||||
CURSOR=$(($#BUFFER - 1))
|
|
||||||
else
|
|
||||||
CURSOR=$#BUFFER
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return $retval
|
_zsh_autosuggest_invoke_original_widget $@
|
||||||
}
|
}
|
||||||
|
|
||||||
# Accept the entire suggestion and execute it
|
# Accept the entire suggestion and execute it
|
||||||
@@ -193,22 +155,67 @@ _zsh_autosuggest_partial_accept() {
|
|||||||
return $retval
|
return $retval
|
||||||
}
|
}
|
||||||
|
|
||||||
() {
|
_zsh_autosuggest_redraw() {
|
||||||
typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
|
emulate -L zsh
|
||||||
|
|
||||||
_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
|
typeset -g _ZSH_AUTOSUGGEST_LAST_BUFFER
|
||||||
clear
|
|
||||||
fetch
|
# Only available in zsh >= 5.4
|
||||||
suggest
|
local -i KEYS_QUEUED_COUNT
|
||||||
accept
|
|
||||||
execute
|
local orig_buffer="$_ZSH_AUTOSUGGEST_LAST_BUFFER"
|
||||||
enable
|
local widget
|
||||||
disable
|
|
||||||
toggle
|
# Store the current state of the buffer for next time
|
||||||
|
_ZSH_AUTOSUGGEST_LAST_BUFFER="$BUFFER"
|
||||||
|
|
||||||
|
# Buffer hasn't changed
|
||||||
|
[[ "$BUFFER" = "$orig_buffer" ]] && return 0
|
||||||
|
|
||||||
|
local ignore_widgets
|
||||||
|
ignore_widgets=(
|
||||||
|
$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Don't fetch a new suggestion after mapped widgets
|
||||||
|
for widget in $ignore_widgets; do
|
||||||
|
[[ "$LASTWIDGET" == "$widget" ]] && return 0
|
||||||
|
done
|
||||||
|
|
||||||
|
# Optimize if manually typing in the suggestion
|
||||||
|
if (( $#BUFFER > $#orig_buffer )); then
|
||||||
|
local added=${BUFFER#$orig_buffer}
|
||||||
|
|
||||||
|
# If the string added matches the beginning of the postdisplay
|
||||||
|
if [[ "$added" = "${POSTDISPLAY:0:$#added}" ]]; then
|
||||||
|
POSTDISPLAY="${POSTDISPLAY:$#added}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
unset POSTDISPLAY
|
||||||
|
|
||||||
|
# Don't fetch a new suggestion if there's more input to be read immediately
|
||||||
|
(( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )) && return 0
|
||||||
|
|
||||||
|
# Buffer is empty
|
||||||
|
(( ! $#BUFFER )) && return 0
|
||||||
|
|
||||||
|
# Buffer longer than max size
|
||||||
|
[[ -n "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] && (( $#BUFFER > $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )) && return 0
|
||||||
|
|
||||||
|
# Suggestions disabled
|
||||||
|
[[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]] && return 0
|
||||||
|
|
||||||
|
_zsh_autosuggest_fetch
|
||||||
|
}
|
||||||
|
|
||||||
|
() {
|
||||||
local action
|
local action
|
||||||
for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
|
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle redraw; do
|
||||||
eval "_zsh_autosuggest_widget_$action() {
|
eval "_zsh_autosuggest_widget_$action() {
|
||||||
local -i retval
|
local -i retval
|
||||||
|
|
||||||
@@ -225,7 +232,13 @@ _zsh_autosuggest_partial_accept() {
|
|||||||
}"
|
}"
|
||||||
done
|
done
|
||||||
|
|
||||||
for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
|
zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
|
||||||
zle -N autosuggest-$action _zsh_autosuggest_widget_$action
|
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
|
||||||
done
|
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
|
||||||
|
zle -N autosuggest-accept _zsh_autosuggest_widget_accept
|
||||||
|
zle -N autosuggest-clear _zsh_autosuggest_widget_clear
|
||||||
|
zle -N autosuggest-execute _zsh_autosuggest_widget_execute
|
||||||
|
zle -N autosuggest-enable _zsh_autosuggest_widget_enable
|
||||||
|
zle -N autosuggest-disable _zsh_autosuggest_widget_disable
|
||||||
|
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
# Fish-like fast/unobtrusive autosuggestions for zsh.
|
# Fish-like fast/unobtrusive autosuggestions for zsh.
|
||||||
# https://github.com/zsh-users/zsh-autosuggestions
|
# https://github.com/zsh-users/zsh-autosuggestions
|
||||||
# v0.7.0
|
# v0.5.0
|
||||||
# Copyright (c) 2013 Thiago de Arruda
|
# Copyright (c) 2013 Thiago de Arruda
|
||||||
# Copyright (c) 2016-2021 Eric Freese
|
# Copyright (c) 2016-2018 Eric Freese
|
||||||
#
|
#
|
||||||
# Permission is hereby granted, free of charge, to any person
|
# Permission is hereby granted, free of charge, to any person
|
||||||
# obtaining a copy of this software and associated documentation
|
# obtaining a copy of this software and associated documentation
|
||||||
@@ -25,6 +25,18 @@
|
|||||||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
# OTHER DEALINGS IN THE SOFTWARE.
|
# OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
# Setup #
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
|
# Precmd hooks for initializing the library and starting pty's
|
||||||
|
autoload -Uz add-zsh-hook
|
||||||
|
autoload -Uz add-zle-hook-widget
|
||||||
|
autoload -Uz is-at-least
|
||||||
|
|
||||||
|
# Asynchronous suggestions are generated in a pty
|
||||||
|
zmodload zsh/zpty
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
# Global Configuration Variables #
|
# Global Configuration Variables #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
@@ -61,7 +73,6 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
up-line-or-history
|
up-line-or-history
|
||||||
down-line-or-history
|
down-line-or-history
|
||||||
accept-line
|
accept-line
|
||||||
copy-earlier-word
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,6 +111,7 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Widgets that should be ignored (globbing supported but must be escaped)
|
# Widgets that should be ignored (globbing supported but must be escaped)
|
||||||
|
# Only relevant for zsh versions older than 5.4
|
||||||
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
|
(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
|
||||||
typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
|
ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
|
||||||
@@ -110,13 +122,16 @@ typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
|
|||||||
which-command
|
which-command
|
||||||
yank
|
yank
|
||||||
yank-pop
|
yank-pop
|
||||||
zle-\*
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Pty name for capturing completions for completion suggestion strategy
|
# Max size of buffer to trigger autosuggestion. Leave null for no upper bound.
|
||||||
(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
|
(( ! ${+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE} )) &&
|
||||||
typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
|
typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
|
||||||
|
|
||||||
|
# Pty name for calculating autosuggestions asynchronously
|
||||||
|
(( ! ${+ZSH_AUTOSUGGEST_ASYNC_PTY_NAME} )) &&
|
||||||
|
typeset -g ZSH_AUTOSUGGEST_ASYNC_PTY_NAME=zsh_autosuggest_pty
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
# Utility Functions #
|
# Utility Functions #
|
||||||
@@ -129,13 +144,45 @@ _zsh_autosuggest_escape_command() {
|
|||||||
echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
|
echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
# Feature Detection #
|
||||||
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
|
_zsh_autosuggest_feature_detect_zpty_returns_fd() {
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD
|
||||||
|
typeset -h REPLY
|
||||||
|
|
||||||
|
zpty zsh_autosuggest_feature_detect '{ zshexit() { kill -KILL $$; sleep 1 } }'
|
||||||
|
|
||||||
|
if (( REPLY )); then
|
||||||
|
_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD=1
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD=0
|
||||||
|
fi
|
||||||
|
|
||||||
|
zpty -d zsh_autosuggest_feature_detect
|
||||||
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
# Widget Helpers #
|
# Widget Helpers #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
_zsh_autosuggest_incr_bind_count() {
|
_zsh_autosuggest_incr_bind_count() {
|
||||||
typeset -gi bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]+1))
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
|
||||||
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=$bind_count
|
((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]++))
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_get_bind_count() {
|
||||||
|
if ((${+_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]})); then
|
||||||
|
typeset -gi bind_count=$_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]
|
||||||
|
else
|
||||||
|
typeset -gi bind_count=0
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Bind a single widget to an autosuggest widget, saving a reference to the original widget
|
# Bind a single widget to an autosuggest widget, saving a reference to the original widget
|
||||||
@@ -151,30 +198,30 @@ _zsh_autosuggest_bind_widget() {
|
|||||||
# Save a reference to the original widget
|
# Save a reference to the original widget
|
||||||
case $widgets[$widget] in
|
case $widgets[$widget] in
|
||||||
# Already bound
|
# Already bound
|
||||||
user:_zsh_autosuggest_(bound|orig)_*)
|
user:_zsh_autosuggest_(bound|orig)_*);;
|
||||||
bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$widget]))
|
|
||||||
;;
|
|
||||||
|
|
||||||
# User-defined widget
|
# User-defined widget
|
||||||
user:*)
|
user:*)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
zle -N $prefix$bind_count-$widget ${widgets[$widget]#*:}
|
zle -N $prefix${bind_count}-$widget ${widgets[$widget]#*:}
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Built-in widget
|
# Built-in widget
|
||||||
builtin)
|
builtin)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
|
eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
|
||||||
zle -N $prefix$bind_count-$widget _zsh_autosuggest_orig_$widget
|
zle -N $prefix${bind_count}-$widget _zsh_autosuggest_orig_$widget
|
||||||
;;
|
;;
|
||||||
|
|
||||||
# Completion widget
|
# Completion widget
|
||||||
completion:*)
|
completion:*)
|
||||||
_zsh_autosuggest_incr_bind_count $widget
|
_zsh_autosuggest_incr_bind_count $widget
|
||||||
eval "zle -C $prefix$bind_count-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
|
eval "zle -C $prefix${bind_count}-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
_zsh_autosuggest_get_bind_count $widget
|
||||||
|
|
||||||
# Pass the original widget's name explicitly into the autosuggest
|
# Pass the original widget's name explicitly into the autosuggest
|
||||||
# function. Use this passed in widget name to call the original
|
# function. Use this passed in widget name to call the original
|
||||||
# widget instead of relying on the $WIDGET variable being set
|
# widget instead of relying on the $WIDGET variable being set
|
||||||
@@ -189,35 +236,49 @@ _zsh_autosuggest_bind_widget() {
|
|||||||
zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
|
zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_bind_autosuggest_widgets() {
|
||||||
|
local widget
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_CLEAR_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget clear
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_ACCEPT_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget accept
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_EXECUTE_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget execute
|
||||||
|
done
|
||||||
|
|
||||||
|
for widget in $ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS; do
|
||||||
|
_zsh_autosuggest_bind_widget $widget partial_accept
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
# Map all configured widgets to the right autosuggest widgets
|
# Map all configured widgets to the right autosuggest widgets
|
||||||
_zsh_autosuggest_bind_widgets() {
|
_zsh_autosuggest_bind_modify_widgets() {
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
local widget
|
local widget
|
||||||
local ignore_widgets
|
local ignore_widgets
|
||||||
|
|
||||||
ignore_widgets=(
|
ignore_widgets=(
|
||||||
.\*
|
.\*
|
||||||
_\*
|
_\*
|
||||||
${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
|
zle-\*
|
||||||
|
autosuggest-\*
|
||||||
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
|
$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
|
||||||
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
|
||||||
)
|
)
|
||||||
|
|
||||||
# Find every widget we might want to bind and bind it appropriately
|
# Assume any widget omitted from the config arrays might modify the buffer
|
||||||
for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
|
for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
|
||||||
if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
|
_zsh_autosuggest_bind_widget $widget modify
|
||||||
_zsh_autosuggest_bind_widget $widget clear
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget accept
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget execute
|
|
||||||
elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
|
|
||||||
_zsh_autosuggest_bind_widget $widget partial_accept
|
|
||||||
else
|
|
||||||
# Assume any unspecified widget might modify the buffer
|
|
||||||
_zsh_autosuggest_bind_widget $widget modify
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,7 +343,7 @@ _zsh_autosuggest_enable() {
|
|||||||
|
|
||||||
# Toggle suggestions (enable/disable)
|
# Toggle suggestions (enable/disable)
|
||||||
_zsh_autosuggest_toggle() {
|
_zsh_autosuggest_toggle() {
|
||||||
if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
|
if [[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]]; then
|
||||||
_zsh_autosuggest_enable
|
_zsh_autosuggest_enable
|
||||||
else
|
else
|
||||||
_zsh_autosuggest_disable
|
_zsh_autosuggest_disable
|
||||||
@@ -301,52 +362,28 @@ _zsh_autosuggest_clear() {
|
|||||||
_zsh_autosuggest_modify() {
|
_zsh_autosuggest_modify() {
|
||||||
local -i retval
|
local -i retval
|
||||||
|
|
||||||
# Only available in zsh >= 5.4
|
# Save the contents of the postdisplay
|
||||||
local -i KEYS_QUEUED_COUNT
|
|
||||||
|
|
||||||
# Save the contents of the buffer/postdisplay
|
|
||||||
local orig_buffer="$BUFFER"
|
|
||||||
local orig_postdisplay="$POSTDISPLAY"
|
local orig_postdisplay="$POSTDISPLAY"
|
||||||
|
|
||||||
# Clear suggestion while waiting for next one
|
# Clear suggestion while original widget runs
|
||||||
unset POSTDISPLAY
|
unset POSTDISPLAY
|
||||||
|
|
||||||
# Original widget may modify the buffer
|
# Original widget may modify the buffer
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
_zsh_autosuggest_invoke_original_widget $@
|
||||||
retval=$?
|
retval=$?
|
||||||
|
|
||||||
emulate -L zsh
|
# Restore postdisplay to be used in redraw
|
||||||
|
POSTDISPLAY="$orig_postdisplay"
|
||||||
|
|
||||||
# Don't fetch a new suggestion if there's more input to be read immediately
|
# Run redraw to fetch a suggestion if needed
|
||||||
if (( $PENDING > 0 || $KEYS_QUEUED_COUNT > 0 )); then
|
_zsh_autosuggest_redraw
|
||||||
POSTDISPLAY="$orig_postdisplay"
|
|
||||||
return $retval
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Optimize if manually typing in the suggestion or if buffer hasn't changed
|
|
||||||
if [[ "$BUFFER" = "$orig_buffer"* && "$orig_postdisplay" = "${BUFFER:$#orig_buffer}"* ]]; then
|
|
||||||
POSTDISPLAY="${orig_postdisplay:$(($#BUFFER - $#orig_buffer))}"
|
|
||||||
return $retval
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Bail out if suggestions are disabled
|
|
||||||
if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
|
|
||||||
return $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get a new suggestion if the buffer is not empty after modification
|
|
||||||
if (( $#BUFFER > 0 )); then
|
|
||||||
if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
|
|
||||||
_zsh_autosuggest_fetch
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
return $retval
|
return $retval
|
||||||
}
|
}
|
||||||
|
|
||||||
# Fetch a new suggestion based on what's currently in the buffer
|
# Fetch a new suggestion based on what's currently in the buffer
|
||||||
_zsh_autosuggest_fetch() {
|
_zsh_autosuggest_fetch() {
|
||||||
if (( ${+ZSH_AUTOSUGGEST_USE_ASYNC} )); then
|
if zpty -t "$ZSH_AUTOSUGGEST_ASYNC_PTY_NAME" &>/dev/null; then
|
||||||
_zsh_autosuggest_async_request "$BUFFER"
|
_zsh_autosuggest_async_request "$BUFFER"
|
||||||
else
|
else
|
||||||
local suggestion
|
local suggestion
|
||||||
@@ -370,7 +407,7 @@ _zsh_autosuggest_suggest() {
|
|||||||
|
|
||||||
# Accept the entire suggestion
|
# Accept the entire suggestion
|
||||||
_zsh_autosuggest_accept() {
|
_zsh_autosuggest_accept() {
|
||||||
local -i retval max_cursor_pos=$#BUFFER
|
local -i max_cursor_pos=$#BUFFER
|
||||||
|
|
||||||
# When vicmd keymap is active, the cursor can't move all the way
|
# When vicmd keymap is active, the cursor can't move all the way
|
||||||
# to the end of the buffer
|
# to the end of the buffer
|
||||||
@@ -378,33 +415,19 @@ _zsh_autosuggest_accept() {
|
|||||||
max_cursor_pos=$((max_cursor_pos - 1))
|
max_cursor_pos=$((max_cursor_pos - 1))
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If we're not in a valid state to accept a suggestion, just run the
|
|
||||||
# original widget and bail out
|
|
||||||
if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
|
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Only accept if the cursor is at the end of the buffer
|
# Only accept if the cursor is at the end of the buffer
|
||||||
# Add the suggestion to the buffer
|
if [[ $CURSOR = $max_cursor_pos ]]; then
|
||||||
BUFFER="$BUFFER$POSTDISPLAY"
|
# Add the suggestion to the buffer
|
||||||
|
BUFFER="$BUFFER$POSTDISPLAY"
|
||||||
|
|
||||||
# Remove the suggestion
|
# Remove the suggestion
|
||||||
unset POSTDISPLAY
|
unset POSTDISPLAY
|
||||||
|
|
||||||
# Run the original widget before manually moving the cursor so that the
|
# Move the cursor to the end of the buffer
|
||||||
# cursor movement doesn't make the widget do something unexpected
|
CURSOR=${#BUFFER}
|
||||||
_zsh_autosuggest_invoke_original_widget $@
|
|
||||||
retval=$?
|
|
||||||
|
|
||||||
# Move the cursor to the end of the buffer
|
|
||||||
if [[ "$KEYMAP" = "vicmd" ]]; then
|
|
||||||
CURSOR=$(($#BUFFER - 1))
|
|
||||||
else
|
|
||||||
CURSOR=$#BUFFER
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
return $retval
|
_zsh_autosuggest_invoke_original_widget $@
|
||||||
}
|
}
|
||||||
|
|
||||||
# Accept the entire suggestion and execute it
|
# Accept the entire suggestion and execute it
|
||||||
@@ -455,22 +478,67 @@ _zsh_autosuggest_partial_accept() {
|
|||||||
return $retval
|
return $retval
|
||||||
}
|
}
|
||||||
|
|
||||||
() {
|
_zsh_autosuggest_redraw() {
|
||||||
typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
|
emulate -L zsh
|
||||||
|
|
||||||
_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
|
typeset -g _ZSH_AUTOSUGGEST_LAST_BUFFER
|
||||||
clear
|
|
||||||
fetch
|
# Only available in zsh >= 5.4
|
||||||
suggest
|
local -i KEYS_QUEUED_COUNT
|
||||||
accept
|
|
||||||
execute
|
local orig_buffer="$_ZSH_AUTOSUGGEST_LAST_BUFFER"
|
||||||
enable
|
local widget
|
||||||
disable
|
|
||||||
toggle
|
# Store the current state of the buffer for next time
|
||||||
|
_ZSH_AUTOSUGGEST_LAST_BUFFER="$BUFFER"
|
||||||
|
|
||||||
|
# Buffer hasn't changed
|
||||||
|
[[ "$BUFFER" = "$orig_buffer" ]] && return 0
|
||||||
|
|
||||||
|
local ignore_widgets
|
||||||
|
ignore_widgets=(
|
||||||
|
$ZSH_AUTOSUGGEST_CLEAR_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
|
||||||
|
$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Don't fetch a new suggestion after mapped widgets
|
||||||
|
for widget in $ignore_widgets; do
|
||||||
|
[[ "$LASTWIDGET" == "$widget" ]] && return 0
|
||||||
|
done
|
||||||
|
|
||||||
|
# Optimize if manually typing in the suggestion
|
||||||
|
if (( $#BUFFER > $#orig_buffer )); then
|
||||||
|
local added=${BUFFER#$orig_buffer}
|
||||||
|
|
||||||
|
# If the string added matches the beginning of the postdisplay
|
||||||
|
if [[ "$added" = "${POSTDISPLAY:0:$#added}" ]]; then
|
||||||
|
POSTDISPLAY="${POSTDISPLAY:$#added}"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
unset POSTDISPLAY
|
||||||
|
|
||||||
|
# Don't fetch a new suggestion if there's more input to be read immediately
|
||||||
|
(( $PENDING > 0 )) || (( $KEYS_QUEUED_COUNT > 0 )) && return 0
|
||||||
|
|
||||||
|
# Buffer is empty
|
||||||
|
(( ! $#BUFFER )) && return 0
|
||||||
|
|
||||||
|
# Buffer longer than max size
|
||||||
|
[[ -n "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] && (( $#BUFFER > $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )) && return 0
|
||||||
|
|
||||||
|
# Suggestions disabled
|
||||||
|
[[ -n "${_ZSH_AUTOSUGGEST_DISABLED+x}" ]] && return 0
|
||||||
|
|
||||||
|
_zsh_autosuggest_fetch
|
||||||
|
}
|
||||||
|
|
||||||
|
() {
|
||||||
local action
|
local action
|
||||||
for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
|
for action in clear modify fetch suggest accept partial_accept execute enable disable toggle redraw; do
|
||||||
eval "_zsh_autosuggest_widget_$action() {
|
eval "_zsh_autosuggest_widget_$action() {
|
||||||
local -i retval
|
local -i retval
|
||||||
|
|
||||||
@@ -487,146 +555,15 @@ _zsh_autosuggest_partial_accept() {
|
|||||||
}"
|
}"
|
||||||
done
|
done
|
||||||
|
|
||||||
for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
|
zle -N autosuggest-redraw _zsh_autosuggest_widget_redraw
|
||||||
zle -N autosuggest-$action _zsh_autosuggest_widget_$action
|
zle -N autosuggest-fetch _zsh_autosuggest_widget_fetch
|
||||||
done
|
zle -N autosuggest-suggest _zsh_autosuggest_widget_suggest
|
||||||
}
|
zle -N autosuggest-accept _zsh_autosuggest_widget_accept
|
||||||
|
zle -N autosuggest-clear _zsh_autosuggest_widget_clear
|
||||||
#--------------------------------------------------------------------#
|
zle -N autosuggest-execute _zsh_autosuggest_widget_execute
|
||||||
# Completion Suggestion Strategy #
|
zle -N autosuggest-enable _zsh_autosuggest_widget_enable
|
||||||
#--------------------------------------------------------------------#
|
zle -N autosuggest-disable _zsh_autosuggest_widget_disable
|
||||||
# Fetches a suggestion from the completion engine
|
zle -N autosuggest-toggle _zsh_autosuggest_widget_toggle
|
||||||
#
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_postcompletion() {
|
|
||||||
# Always insert the first completion into the buffer
|
|
||||||
compstate[insert]=1
|
|
||||||
|
|
||||||
# Don't list completions
|
|
||||||
unset 'compstate[list]'
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_widget() {
|
|
||||||
# Add a post-completion hook to be called after all completions have been
|
|
||||||
# gathered. The hook can modify compstate to affect what is done with the
|
|
||||||
# gathered completions.
|
|
||||||
local -a +h comppostfuncs
|
|
||||||
comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
|
|
||||||
|
|
||||||
# Only capture completions at the end of the buffer
|
|
||||||
CURSOR=$#BUFFER
|
|
||||||
|
|
||||||
# Run the original widget wrapping `.complete-word` so we don't
|
|
||||||
# recursively try to fetch suggestions, since our pty is forked
|
|
||||||
# after autosuggestions is initialized.
|
|
||||||
zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
|
|
||||||
|
|
||||||
if is-at-least 5.0.3; then
|
|
||||||
# Don't do any cr/lf transformations. We need to do this immediately before
|
|
||||||
# output because if we do it in setup, onlcr will be re-enabled when we enter
|
|
||||||
# vared in the async code path. There is a bug in zpty module in older versions
|
|
||||||
# where the tty is not properly attached to the pty slave, resulting in stty
|
|
||||||
# getting stopped with a SIGTTOU. See zsh-workers thread 31660 and upstream
|
|
||||||
# commit f75904a38
|
|
||||||
stty -onlcr -ocrnl -F /dev/tty
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The completion has been added, print the buffer as the suggestion
|
|
||||||
echo -nE - $'\0'$BUFFER$'\0'
|
|
||||||
}
|
|
||||||
|
|
||||||
zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_setup() {
|
|
||||||
# There is a bug in zpty module in older zsh versions by which a
|
|
||||||
# zpty that exits will kill all zpty processes that were forked
|
|
||||||
# before it. Here we set up a zsh exit hook to SIGKILL the zpty
|
|
||||||
# process immediately, before it has a chance to kill any other
|
|
||||||
# zpty processes.
|
|
||||||
if ! is-at-least 5.4; then
|
|
||||||
zshexit() {
|
|
||||||
# The zsh builtin `kill` fails sometimes in older versions
|
|
||||||
# https://unix.stackexchange.com/a/477647/156673
|
|
||||||
kill -KILL $$ 2>&- || command kill -KILL $$
|
|
||||||
|
|
||||||
# Block for long enough for the signal to come through
|
|
||||||
sleep 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to avoid any suggestions that wouldn't match the prefix
|
|
||||||
zstyle ':completion:*' matcher-list ''
|
|
||||||
zstyle ':completion:*' path-completion false
|
|
||||||
zstyle ':completion:*' max-errors 0 not-numeric
|
|
||||||
|
|
||||||
bindkey '^I' autosuggest-capture-completion
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_sync() {
|
|
||||||
_zsh_autosuggest_capture_setup
|
|
||||||
|
|
||||||
zle autosuggest-capture-completion
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_capture_completion_async() {
|
|
||||||
_zsh_autosuggest_capture_setup
|
|
||||||
|
|
||||||
zmodload zsh/parameter 2>/dev/null || return # For `$functions`
|
|
||||||
|
|
||||||
# Make vared completion work as if for a normal command line
|
|
||||||
# https://stackoverflow.com/a/7057118/154703
|
|
||||||
autoload +X _complete
|
|
||||||
functions[_original_complete]=$functions[_complete]
|
|
||||||
function _complete() {
|
|
||||||
unset 'compstate[vared]'
|
|
||||||
_original_complete "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Open zle with buffer set so we can capture completions for it
|
|
||||||
vared 1
|
|
||||||
}
|
|
||||||
|
|
||||||
_zsh_autosuggest_strategy_completion() {
|
|
||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
|
||||||
emulate -L zsh
|
|
||||||
|
|
||||||
# Enable extended glob for completion ignore pattern
|
|
||||||
setopt EXTENDED_GLOB
|
|
||||||
|
|
||||||
typeset -g suggestion
|
|
||||||
local line REPLY
|
|
||||||
|
|
||||||
# Exit if we don't have completions
|
|
||||||
whence compdef >/dev/null || return
|
|
||||||
|
|
||||||
# Exit if we don't have zpty
|
|
||||||
zmodload zsh/zpty 2>/dev/null || return
|
|
||||||
|
|
||||||
# Exit if our search string matches the ignore pattern
|
|
||||||
[[ -n "$ZSH_AUTOSUGGEST_COMPLETION_IGNORE" ]] && [[ "$1" == $~ZSH_AUTOSUGGEST_COMPLETION_IGNORE ]] && return
|
|
||||||
|
|
||||||
# Zle will be inactive if we are in async mode
|
|
||||||
if zle; then
|
|
||||||
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
|
|
||||||
else
|
|
||||||
zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
|
|
||||||
zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
|
|
||||||
fi
|
|
||||||
|
|
||||||
{
|
|
||||||
# The completion result is surrounded by null bytes, so read the
|
|
||||||
# content between the first two null bytes.
|
|
||||||
zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
|
|
||||||
|
|
||||||
# Extract the suggestion from between the null bytes. On older
|
|
||||||
# versions of zsh (older than 5.3), we sometimes get extra bytes after
|
|
||||||
# the second null byte, so trim those off the end.
|
|
||||||
# See http://www.zsh.org/mla/workers/2015/msg03290.html
|
|
||||||
suggestion="${${(@0)line}[2]}"
|
|
||||||
} always {
|
|
||||||
# Destroy the pty
|
|
||||||
zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
@@ -640,7 +577,7 @@ _zsh_autosuggest_strategy_history() {
|
|||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
# Reset options to defaults and enable LOCAL_OPTIONS
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m) and (x~y) glob operator
|
# Enable globbing flags so that we can use (#m)
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
# Escape backslashes and all of the glob operators so we can use
|
# Escape backslashes and all of the glob operators so we can use
|
||||||
@@ -649,16 +586,9 @@ _zsh_autosuggest_strategy_history() {
|
|||||||
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
||||||
|
|
||||||
# Get the history items that match the prefix, excluding those that match
|
# Get the history items that match
|
||||||
# the ignore pattern
|
|
||||||
local pattern="$prefix*"
|
|
||||||
if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
|
|
||||||
pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Give the first history item matching the pattern as the suggestion
|
|
||||||
# - (r) subscript flag makes the pattern match on values
|
# - (r) subscript flag makes the pattern match on values
|
||||||
typeset -g suggestion="${history[(r)$pattern]}"
|
typeset -g suggestion="${history[(r)${prefix}*]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
@@ -686,23 +616,16 @@ _zsh_autosuggest_strategy_match_prev_cmd() {
|
|||||||
# Reset options to defaults and enable LOCAL_OPTIONS
|
# Reset options to defaults and enable LOCAL_OPTIONS
|
||||||
emulate -L zsh
|
emulate -L zsh
|
||||||
|
|
||||||
# Enable globbing flags so that we can use (#m) and (x~y) glob operator
|
# Enable globbing flags so that we can use (#m)
|
||||||
setopt EXTENDED_GLOB
|
setopt EXTENDED_GLOB
|
||||||
|
|
||||||
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
|
||||||
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
|
||||||
|
|
||||||
# Get the history items that match the prefix, excluding those that match
|
|
||||||
# the ignore pattern
|
|
||||||
local pattern="$prefix*"
|
|
||||||
if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
|
|
||||||
pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Get all history event numbers that correspond to history
|
# Get all history event numbers that correspond to history
|
||||||
# entries that match the pattern
|
# entries that match pattern $prefix*
|
||||||
local history_match_keys
|
local history_match_keys
|
||||||
history_match_keys=(${(k)history[(R)$~pattern]})
|
history_match_keys=(${(k)history[(R)$prefix*]})
|
||||||
|
|
||||||
# By default we use the first history number (most recent history entry)
|
# By default we use the first history number (most recent history entry)
|
||||||
local histkey="${history_match_keys[1]}"
|
local histkey="${history_match_keys[1]}"
|
||||||
@@ -746,10 +669,7 @@ _zsh_autosuggest_fetch_suggestion() {
|
|||||||
# Try to get a suggestion from this strategy
|
# Try to get a suggestion from this strategy
|
||||||
_zsh_autosuggest_strategy_$strategy "$1"
|
_zsh_autosuggest_strategy_$strategy "$1"
|
||||||
|
|
||||||
# Ensure the suggestion matches the prefix
|
# Break once we've found a suggestion
|
||||||
[[ "$suggestion" != "$1"* ]] && unset suggestion
|
|
||||||
|
|
||||||
# Break once we've found a valid suggestion
|
|
||||||
[[ -n "$suggestion" ]] && break
|
[[ -n "$suggestion" ]] && break
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
@@ -758,76 +678,109 @@ _zsh_autosuggest_fetch_suggestion() {
|
|||||||
# Async #
|
# Async #
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
|
|
||||||
_zsh_autosuggest_async_request() {
|
# Zpty process is spawned running this function
|
||||||
zmodload zsh/system 2>/dev/null # For `$sysparams`
|
_zsh_autosuggest_async_server() {
|
||||||
|
emulate -R zsh
|
||||||
|
|
||||||
typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
|
# There is a bug in zpty module (fixed in zsh/master) by which a
|
||||||
|
# zpty that exits will kill all zpty processes that were forked
|
||||||
|
# before it. Here we set up a zsh exit hook to SIGKILL the zpty
|
||||||
|
# process immediately, before it has a chance to kill any other
|
||||||
|
# zpty processes.
|
||||||
|
zshexit() {
|
||||||
|
kill -KILL $$
|
||||||
|
sleep 1 # Block for long enough for the signal to come through
|
||||||
|
}
|
||||||
|
|
||||||
# If we've got a pending request, cancel it
|
# Don't add any extra carriage returns
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then
|
stty -onlcr
|
||||||
# Close the file descriptor and remove the handler
|
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
|
|
||||||
zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
|
|
||||||
|
|
||||||
# We won't know the pid unless the user has zsh/system module installed
|
# Don't translate carriage returns to newlines
|
||||||
if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
|
stty -icrnl
|
||||||
# Zsh will make a new process group for the child process only if job
|
|
||||||
# control is enabled (MONITOR option)
|
|
||||||
if [[ -o MONITOR ]]; then
|
|
||||||
# Send the signal to the process group to kill any processes that may
|
|
||||||
# have been forked by the suggestion strategy
|
|
||||||
kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
|
||||||
else
|
|
||||||
# Kill just the child process since it wasn't placed in a new process
|
|
||||||
# group. If the suggestion strategy forked any child processes they may
|
|
||||||
# be orphaned and left behind.
|
|
||||||
kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Fork a process to fetch a suggestion and open a pipe to read from it
|
# Silence any error messages
|
||||||
exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
|
exec 2>/dev/null
|
||||||
# Tell parent process our pid
|
|
||||||
echo $sysparams[pid]
|
|
||||||
|
|
||||||
# Fetch and print the suggestion
|
local last_pid
|
||||||
local suggestion
|
|
||||||
_zsh_autosuggest_fetch_suggestion "$1"
|
|
||||||
echo -nE "$suggestion"
|
|
||||||
)
|
|
||||||
|
|
||||||
# There's a weird bug here where ^C stops working unless we force a fork
|
while IFS='' read -r -d $'\0' query; do
|
||||||
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
|
# Kill last bg process
|
||||||
autoload -Uz is-at-least
|
kill -KILL $last_pid &>/dev/null
|
||||||
is-at-least 5.8 || command true
|
|
||||||
|
|
||||||
# Read the pid from the child process
|
# Run suggestion search in the background
|
||||||
read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
|
(
|
||||||
|
local suggestion
|
||||||
|
_zsh_autosuggest_fetch_suggestion "$query"
|
||||||
|
echo -n -E "$suggestion"$'\0'
|
||||||
|
) &
|
||||||
|
|
||||||
# When the fd is readable, call the response handler
|
last_pid=$!
|
||||||
zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
# Called when new data is ready to be read from the pipe
|
_zsh_autosuggest_async_request() {
|
||||||
|
# Write the query to the zpty process to fetch a suggestion
|
||||||
|
zpty -w -n $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME "${1}"$'\0'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Called when new data is ready to be read from the pty
|
||||||
# First arg will be fd ready for reading
|
# First arg will be fd ready for reading
|
||||||
# Second arg will be passed in case of error
|
# Second arg will be passed in case of error
|
||||||
_zsh_autosuggest_async_response() {
|
_zsh_autosuggest_async_response() {
|
||||||
emulate -L zsh
|
setopt LOCAL_OPTIONS EXTENDED_GLOB
|
||||||
|
|
||||||
local suggestion
|
local suggestion
|
||||||
|
|
||||||
if [[ -z "$2" || "$2" == "hup" ]]; then
|
zpty -rt $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME suggestion '*'$'\0' 2>/dev/null
|
||||||
# Read everything from the fd and give it as a suggestion
|
zle autosuggest-suggest -- "${suggestion%%$'\0'##}"
|
||||||
IFS='' read -rd '' -u $1 suggestion
|
}
|
||||||
zle autosuggest-suggest -- "$suggestion"
|
|
||||||
|
|
||||||
# Close the fd
|
_zsh_autosuggest_async_pty_create() {
|
||||||
exec {1}<&-
|
# With newer versions of zsh, REPLY stores the fd to read from
|
||||||
|
typeset -h REPLY
|
||||||
|
|
||||||
|
# If we won't get a fd back from zpty, try to guess it
|
||||||
|
if (( ! $_ZSH_AUTOSUGGEST_ZPTY_RETURNS_FD )); then
|
||||||
|
integer -l zptyfd
|
||||||
|
exec {zptyfd}>&1 # Open a new file descriptor (above 10).
|
||||||
|
exec {zptyfd}>&- # Close it so it's free to be used by zpty.
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Always remove the handler
|
# Fork a zpty process running the server function
|
||||||
zle -F "$1"
|
zpty -b $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME _zsh_autosuggest_async_server
|
||||||
|
|
||||||
|
# Store the fd so we can remove the handler later
|
||||||
|
if (( REPLY )); then
|
||||||
|
_ZSH_AUTOSUGGEST_PTY_FD=$REPLY
|
||||||
|
else
|
||||||
|
_ZSH_AUTOSUGGEST_PTY_FD=$zptyfd
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Set up input handler from the zpty
|
||||||
|
zle -F $_ZSH_AUTOSUGGEST_PTY_FD _zsh_autosuggest_async_response
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_pty_destroy() {
|
||||||
|
# Remove the input handler
|
||||||
|
zle -F $_ZSH_AUTOSUGGEST_PTY_FD &>/dev/null
|
||||||
|
|
||||||
|
# Destroy the zpty
|
||||||
|
zpty -d $ZSH_AUTOSUGGEST_ASYNC_PTY_NAME &>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_pty_recreate() {
|
||||||
|
_zsh_autosuggest_async_pty_destroy
|
||||||
|
_zsh_autosuggest_async_pty_create
|
||||||
|
}
|
||||||
|
|
||||||
|
_zsh_autosuggest_async_start() {
|
||||||
|
typeset -g _ZSH_AUTOSUGGEST_PTY_FD
|
||||||
|
|
||||||
|
_zsh_autosuggest_feature_detect_zpty_returns_fd
|
||||||
|
_zsh_autosuggest_async_pty_recreate
|
||||||
|
|
||||||
|
# We recreate the pty to get a fresh list of history events
|
||||||
|
add-zsh-hook precmd _zsh_autosuggest_async_pty_recreate
|
||||||
}
|
}
|
||||||
|
|
||||||
#--------------------------------------------------------------------#
|
#--------------------------------------------------------------------#
|
||||||
@@ -836,29 +789,29 @@ _zsh_autosuggest_async_response() {
|
|||||||
|
|
||||||
# Start the autosuggestion widgets
|
# Start the autosuggestion widgets
|
||||||
_zsh_autosuggest_start() {
|
_zsh_autosuggest_start() {
|
||||||
# By default we re-bind widgets on every precmd to ensure we wrap other
|
add-zsh-hook -d precmd _zsh_autosuggest_start
|
||||||
# wrappers. Specifically, highlighting breaks if our widgets are wrapped by
|
|
||||||
# zsh-syntax-highlighting widgets. This also allows modifications to the
|
# Re-bind widgets on every precmd to ensure we wrap other wrappers.
|
||||||
# widget list variables to take effect on the next precmd. However this has
|
# Specifically, highlighting breaks if our widgets are wrapped by
|
||||||
# a decent performance hit, so users can set ZSH_AUTOSUGGEST_MANUAL_REBIND
|
# zsh-syntax-highlighting widgets. This also allows modifications
|
||||||
# to disable the automatic re-binding.
|
# to the widget list variables to take effect on the next precmd.
|
||||||
if (( ${+ZSH_AUTOSUGGEST_MANUAL_REBIND} )); then
|
_zsh_autosuggest_bind_autosuggest_widgets
|
||||||
add-zsh-hook -d precmd _zsh_autosuggest_start
|
add-zsh-hook precmd _zsh_autosuggest_bind_autosuggest_widgets
|
||||||
|
|
||||||
|
# If available, use a ZLE redraw hook to trigger fetching suggestions.
|
||||||
|
# Otherwise, we need to wrap all widgets and fetch suggestions after
|
||||||
|
# running them.
|
||||||
|
if is-at-least 5.4; then
|
||||||
|
add-zle-hook-widget line-pre-redraw autosuggest-redraw
|
||||||
|
else
|
||||||
|
_zsh_autosuggest_bind_modify_widgets
|
||||||
|
add-zsh-hook precmd _zsh_autosuggest_bind_modify_widgets
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_zsh_autosuggest_bind_widgets
|
if [[ -n "${ZSH_AUTOSUGGEST_USE_ASYNC+x}" ]]; then
|
||||||
|
_zsh_autosuggest_async_start
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Mark for auto-loading the functions that we use
|
|
||||||
autoload -Uz add-zsh-hook is-at-least
|
|
||||||
|
|
||||||
# Automatically enable asynchronous mode in newer versions of zsh. Disable for
|
|
||||||
# older versions because there is a bug when using async mode where ^C does not
|
|
||||||
# work immediately after fetching a suggestion.
|
|
||||||
# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
|
|
||||||
if is-at-least 5.0.8; then
|
|
||||||
typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Start the autosuggestion widgets on the next precmd
|
# Start the autosuggestion widgets on the next precmd
|
||||||
add-zsh-hook precmd _zsh_autosuggest_start
|
add-zsh-hook precmd _zsh_autosuggest_start
|
||||||
|
|||||||
Reference in New Issue
Block a user