m/fzf
1
0
mirror of https://github.com/junegunn/fzf.git synced 2025-11-15 06:43:47 -05:00

Compare commits

...

6 Commits

Author SHA1 Message Date
Junegunn Choi
b55f555487 0.35.1 2022-11-18 20:42:56 +09:00
Junegunn Choi
a38b63be18 Fix mouse event above fzf finder
Fix #2949
2022-11-18 20:32:59 +09:00
Junegunn Choi
1bebd6f4f5 Fix panic on inverse match query with --tiebreak=chunk
Fix #3055
2022-11-18 20:16:43 +09:00
Bruno Heridet
3da63f394d doc(man): complete the definition of what --no-unicode impacts (#3054) 2022-11-18 10:23:21 +09:00
Zhizhen He
2a54e3d770 Fix typos in the source code (#3048) 2022-11-18 10:23:04 +09:00
dependabot[bot]
06b02ba46e Bump actions/dependency-review-action from 2 to 3 (#3046)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 2 to 3.
- [Release notes](https://github.com/actions/dependency-review-action/releases)
- [Commits](https://github.com/actions/dependency-review-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/dependency-review-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-18 10:22:08 +09:00
11 changed files with 32 additions and 21 deletions

View File

@@ -11,4 +11,4 @@ jobs:
- name: 'Checkout Repository' - name: 'Checkout Repository'
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: 'Dependency Review' - name: 'Dependency Review'
uses: actions/dependency-review-action@v2 uses: actions/dependency-review-action@v3

View File

@@ -1,6 +1,11 @@
CHANGELOG CHANGELOG
========= =========
0.35.1
------
- Fixed a bug where fzf with `--tiebreak=chunk` crashes on inverse match query
- Fixed a bug where clicking above fzf would paste escape sequences
0.35.0 0.35.0
------ ------
- Added `start` event that is triggered only once when fzf finder starts. - Added `start` event that is triggered only once when fzf finder starts.

View File

@@ -180,8 +180,8 @@ trap 'cleanup' EXIT
envs="export TERM=$TERM " envs="export TERM=$TERM "
if [[ "$opt" =~ "-E" ]]; then if [[ "$opt" =~ "-E" ]]; then
FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS" FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS"
tmux_verson=$(tmux -V) tmux_version=$(tmux -V)
if [[ ! $tmux_verson =~ 3\.2 ]]; then if [[ ! $tmux_version =~ 3\.2 ]]; then
FZF_DEFAULT_OPTS="--border $FZF_DEFAULT_OPTS" FZF_DEFAULT_OPTS="--border $FZF_DEFAULT_OPTS"
opt="-B $opt" opt="-B $opt"
fi fi

View File

@@ -2,7 +2,7 @@
set -u set -u
version=0.35.0 version=0.35.1
auto_completion= auto_completion=
key_bindings= key_bindings=
update_config=2 update_config=2

View File

@@ -1,4 +1,4 @@
$version="0.35.0" $version="0.35.1"
$fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition $fzf_base=Split-Path -Parent $MyInvocation.MyCommand.Definition

View File

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
.. ..
.TH fzf-tmux 1 "Nov 2022" "fzf 0.35.0" "fzf-tmux - open fzf in tmux split pane" .TH fzf-tmux 1 "Nov 2022" "fzf 0.35.1" "fzf-tmux - open fzf in tmux split pane"
.SH NAME .SH NAME
fzf-tmux - open fzf in tmux split pane fzf-tmux - open fzf in tmux split pane

View File

@@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
.. ..
.TH fzf 1 "Nov 2022" "fzf 0.35.0" "fzf - a command-line fuzzy finder" .TH fzf 1 "Nov 2022" "fzf 0.35.1" "fzf - a command-line fuzzy finder"
.SH NAME .SH NAME
fzf - a command-line fuzzy finder fzf - a command-line fuzzy finder
@@ -276,7 +276,8 @@ the label. Label is printed on the top border line by default, add
.TP .TP
.B "--no-unicode" .B "--no-unicode"
Use ASCII characters instead of Unicode box drawing characters to draw border Use ASCII characters instead of Unicode drawing characters to draw borders,
the spinner and the horizontal separator.
.TP .TP
.BI "--margin=" MARGIN .BI "--margin=" MARGIN

View File

@@ -50,20 +50,21 @@ func buildResult(item *Item, offsets []Offset, score int) Result {
// Higher is better // Higher is better
val = math.MaxUint16 - util.AsUint16(score) val = math.MaxUint16 - util.AsUint16(score)
case byChunk: case byChunk:
b := minBegin if validOffsetFound {
e := maxEnd b := minBegin
l := item.text.Length() e := maxEnd
for ; b >= 1; b-- { for ; b >= 1; b-- {
if unicode.IsSpace(item.text.Get(b - 1)) { if unicode.IsSpace(item.text.Get(b - 1)) {
break break
}
} }
} for ; e < numChars; e++ {
for ; e < l; e++ { if unicode.IsSpace(item.text.Get(e)) {
if unicode.IsSpace(item.text.Get(e)) { break
break }
} }
val = util.AsUint16(e - b)
} }
val = util.AsUint16(e - b)
case byLength: case byLength:
val = item.TrimLength() val = item.TrimLength()
case byBegin, byEnd: case byBegin, byEnd:

View File

@@ -30,7 +30,7 @@ strings. Acts as input validation for parsePlaceholder function.
Describes the syntax, but it is fairly lenient. Describes the syntax, but it is fairly lenient.
The following pseudo regex has been reverse engineered from the The following pseudo regex has been reverse engineered from the
implementation. It is overly strict, but better describes whats possible. implementation. It is overly strict, but better describes what's possible.
As such it is not useful for validation, but rather to generate test As such it is not useful for validation, but rather to generate test
cases for example. cases for example.

View File

@@ -545,7 +545,7 @@ func (r *LightRenderer) mouseSequence(sz *int) Event {
t := atoi(elems[0], -1) t := atoi(elems[0], -1)
x := atoi(elems[1], -1) - 1 x := atoi(elems[1], -1) - 1
y := atoi(elems[2], -1) - 1 - r.yoffset y := atoi(elems[2], -1) - 1 - r.yoffset
if t < 0 || x < 0 || y < 0 { if t < 0 || x < 0 {
return Event{Invalid, 0, nil} return Event{Invalid, 0, nil}
} }
*sz += end + 1 *sz += end + 1

View File

@@ -779,6 +779,10 @@ class TestGoFZF < TestBase
'2 foobar baz', '2 foobar baz',
'3 foo barbaz' '3 foo barbaz'
], `#{FZF} -fba --tiebreak=chunk < #{tempname}`.lines(chomp: true) ], `#{FZF} -fba --tiebreak=chunk < #{tempname}`.lines(chomp: true)
assert_equal [
'3 foo barbaz'
], `#{FZF} -f'!foobar' --tiebreak=chunk < #{tempname}`.lines(chomp: true)
end end
def test_invalid_cache def test_invalid_cache