Skip to content

Commit e863a8c

Browse files
mysterywolfmysterywolf
committed
update clink
1 parent 7eedfd9 commit e863a8c

File tree

12 files changed

+1100
-913
lines changed

12 files changed

+1100
-913
lines changed

‎tools/ConEmu/ConEmu/clink/CHANGES‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22

33
### Releases from [chrisant996/clink](https://github.com/chrisant996/clink) fork
44

5+
#### v1.5.4
6+
- Further contrast improvements for default colors to be readable in both Dark and Light terminal themes.
7+
- Added `arginfo` field in `builder:addmatches()` and in match display filtering.
8+
- Auto-suggestions are no longer shown while searching history; it was too distracting and confusing.
9+
- Fixed updating the input line display after using `clink-popup-history` or `win-popup-history` (regression introduced in v1.5.3).
10+
- Fixed `old-menu-complete` and `menu-complete` when there's only one match. The first time it should insert the match, and subsequent times should ding instead of cycling through the same match over and over and requiring an equal number of `undo` to undo.
11+
- Fixed match display filtering to support the `match.substring` setting.
12+
- Fixed match display filtering to support the `files.system` setting.
13+
- Fixed the cursor position if match display filtering happens the first time `clink-select-complete` is used in a session.
14+
- Fixed a case where two `undo` were required to fully undo what `menu-complete` inserted.
15+
- Fixed <kbd>Esc</kbd> during incremental history search mode so it cancels the search.
16+
- Fixed input line coloring after `non-incremental-reverse-search-history` or `non-incremental-forward-search-history` finds an exact match for the search text (since v1.1.5).
17+
- Internal changes and optimizations.
18+
19+
#### v1.5.3
20+
- Added `builder:setfullyqualified()` to force completions to be inserted as fully qualified path names.
21+
- Completions for <code>clink set <span class="arg">setting_name</span> <span class="arg">input</span></code> use fully qualified path names for <span class="arg">input</span>. This helps avoid accidentally setting relative paths in global settings; since the current directory changes frequently, setting relative paths usually leads to unintended consequences.
22+
- Only load a script from a `completions\` directory if the associated command exists in the file system. Also, pass the fully qualified file name as input to the script (in Lua, use `...` to get script arguments, e.g. `local command = ...`).
23+
- `clink info` now reports whether Clink is injected.
24+
- Improve efficiency of updating the input line display. This eliminates some redundant processing in the Readline library and in Clink.
25+
- Fixed input line parsing and coloring when the `doskey.enhanced` setting is off or when doskey macro expansion is suppressed.
26+
- Fixed `line_state:getwordinfo()` to accurately set the `.alias` field when the `doskey.enhanced` setting is off or when doskey macro expansion is suppressed.
27+
- Fixed coloring the command word in the command line when queued keys select and accept a command line from history instantly (it could accidentally continue without applying the appropriate coloring).
28+
- Fixed script error in `clink.filematches(nil)` and `clink.dirmatches(nil)`; they were meant to behave the same as passing an empty string.
29+
530
#### v1.5.2
631
- Adjusted the colors in "Use enhanced defaults" to have sufficient contrast to be readable in both Dark and Light terminal themes.
732
- More reliably detect whether hosted in Windows Terminal, and even when Windows Terminal is set as the default terminal application.

‎tools/ConEmu/ConEmu/clink/LICENSE‎

Lines changed: 675 additions & 675 deletions
Large diffs are not rendered by default.

‎tools/ConEmu/ConEmu/clink/_default_inputrc‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
# When this file is named "default_inputrc" and is in the binaries
2-
# directory or profile directory, it provides enhanced default settings.
3-
4-
# Override the built-in Readline defaults with ones that provide a more
5-
# enhanced Clink experience.
6-
7-
colored-completion-prefix on
8-
colored-stats on
9-
mark-symlinked-directories on
10-
completion-auto-query-items on
11-
history-point-at-end-of-anchored-search on
12-
search-ignore-case on
13-
1+
# When this file is named "default_inputrc" and is in the binaries
2+
# directory or profile directory, it provides enhanced default settings.
3+
4+
# Override the built-in Readline defaults with ones that provide a more
5+
# enhanced Clink experience.
6+
7+
colored-completion-prefix on
8+
colored-stats on
9+
mark-symlinked-directories on
10+
completion-auto-query-items on
11+
history-point-at-end-of-anchored-search on
12+
search-ignore-case on
13+

‎tools/ConEmu/ConEmu/clink/_default_settings‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,33 @@
1-
# When this file is named "default_settings" and is in the binaries
2-
# directory or profile directory, it provides enhanced default settings.
3-
4-
# Override built-in default settings with ones that provide a more
5-
# enhanced Clink experience.
6-
7-
autosuggest.enable = True
8-
clink.default_bindings = windows
9-
cmd.ctrld_exits = False
10-
color.arginfo = sgr 38;5;172
11-
color.argmatcher = sgr 1;38;5;40
12-
color.cmd = bold
13-
color.cmdredir = sgr 38;5;172
14-
color.cmdsep = sgr 38;5;214
15-
color.comment_row = sgr 38;5;87;48;5;18
16-
color.description = sgr 38;5;39
17-
color.doskey = sgr 1;38;5;75
18-
color.executable = sgr 1;38;5;33
19-
color.filtered = bold
20-
color.flag = sgr 38;5;117
21-
color.hidden = sgr 38;5;160
22-
color.histexpand = sgr 97;48;5;55
23-
color.horizscroll = sgr 38;5;16;48;5;30
24-
color.input = sgr 38;5;222
25-
color.readonly = sgr 38;5;28
26-
color.selected_completion = sgr 7
27-
color.selection = sgr 38;5;16;48;5;179
28-
color.suggestion = sgr 38;5;239
29-
color.unrecognized = sgr 38;5;203
30-
history.max_lines = 25000
31-
history.time_stamp = show
32-
match.expand_envvars = True
33-
match.substring = True
34-
1+
# When this file is named "default_settings" and is in the binaries
2+
# directory or profile directory, it provides enhanced default settings.
3+
4+
# Override built-in default settings with ones that provide a more
5+
# enhanced Clink experience.
6+
7+
autosuggest.enable = True
8+
clink.default_bindings = windows
9+
cmd.ctrld_exits = False
10+
color.arginfo = sgr 38;5;172
11+
color.argmatcher = sgr 1;38;5;40
12+
color.cmd = bold
13+
color.cmdredir = sgr 38;5;172
14+
color.cmdsep = sgr 38;5;135
15+
color.comment_row = sgr 38;5;87;48;5;18
16+
color.description = sgr 38;5;39
17+
color.doskey = sgr 1;38;5;75
18+
color.executable = sgr 1;38;5;33
19+
color.filtered = bold
20+
color.flag = sgr 38;5;117
21+
color.hidden = sgr 38;5;160
22+
color.histexpand = sgr 97;48;5;55
23+
color.horizscroll = sgr 38;5;16;48;5;30
24+
color.input = sgr 38;5;214
25+
color.readonly = sgr 38;5;28
26+
color.selected_completion = sgr 7
27+
color.selection = sgr 38;5;16;48;5;179
28+
color.unrecognized = sgr 38;5;203
29+
history.max_lines = 25000
30+
history.time_stamp = show
31+
match.expand_envvars = True
32+
match.substring = True
33+

0 commit comments

Comments
 (0)