Skip to content

Commit b995be0

Browse files
committed
Fix SelectAll and UI colors (#604)
- SelectAll will not unselect the existing paths. Same for ToggleSelectAll. - Fixed UI bug causing random bold characters (deps).
1 parent c791757 commit b995be0

File tree

5 files changed

+65
-72
lines changed

5 files changed

+65
-72
lines changed

Cargo.lock

Lines changed: 47 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ path = './benches/criterion.rs'
88

99
[package]
1010
name = 'xplr'
11-
version = '0.21.0'
11+
version = '0.21.1'
1212
authors = ['Arijit Basu <[email protected]>']
1313
edition = '2021'
1414
description = 'A hackable, minimal, fast TUI file explorer'
@@ -29,8 +29,8 @@ anyhow = "1.0.70"
2929
serde_yaml = "0.9.19"
3030
crossterm = "0.26.1"
3131
dirs = "5.0.0"
32-
ansi-to-tui-forked = "3.0.0-ratatui"
33-
regex = "1.7.1"
32+
ansi-to-tui = "3.0.0"
33+
regex = "1.7.3"
3434
gethostname = "0.4.1"
3535
serde_json = "1.0.94"
3636
path-absolutize = "3.0.14"
@@ -55,25 +55,25 @@ version = "2.0.4"
5555
features = ["rev-mappings"]
5656

5757
[dependencies.tui]
58-
version = "0.20.0"
58+
version = "0.20.1"
5959
default-features = false
6060
features = ['crossterm', 'serde']
6161
package = 'ratatui'
6262

6363
[dependencies.serde]
64-
version = "1.0.157"
64+
version = "1.0.158"
6565
features = ['derive']
6666

6767
[dependencies.indexmap]
68-
version = "1.9.2"
68+
version = "1.9.3"
6969
features = ['serde']
7070

7171
[dependencies.mlua]
7272
version = "0.8.8"
7373
features = ['luajit', 'vendored', 'serialize', 'send']
7474

7575
[dependencies.tui-input]
76-
version = "0.6.1"
76+
version = "0.7.0"
7777
features = ['serde']
7878

7979
[dev-dependencies]

docs/en/src/upgrade-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ compatibility.
4545

4646
### Instructions
4747

48-
#### [v0.20.2][48] -> [v0.21.0][49]
48+
#### [v0.20.2][48] -> [v0.21.1][49]
4949

5050
- Some plugins might stop rendering colors. Wait for them to update.
5151
- Rename `xplr.config.general.sort_and_filter_ui.search_identifier` to
@@ -516,5 +516,5 @@ Else do the following:
516516
[46]: https://github.com/sayanarijit/xplr/releases/tag/v0.18.0
517517
[47]: https://github.com/sayanarijit/xplr/releases/tag/v0.19.4
518518
[48]: https://github.com/sayanarijit/xplr/releases/tag/v0.20.2
519-
[49]: https://github.com/sayanarijit/xplr/releases/tag/v0.21.0
519+
[49]: https://github.com/sayanarijit/xplr/releases/tag/v0.21.1
520520
[50]: https://github.com/lotabout/skim#search-syntax

src/lua/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,24 +160,24 @@ mod tests {
160160
assert!(check_version(VERSION, "foo path").is_ok());
161161

162162
// Current release if OK
163-
assert!(check_version("0.21.0", "foo path").is_ok());
163+
assert!(check_version("0.21.1", "foo path").is_ok());
164164

165165
// Prev major release is ERR
166166
// - Not yet
167167

168168
// Prev minor release is ERR (Change when we get to v1)
169-
assert!(check_version("0.20.0", "foo path").is_err());
169+
assert!(check_version("0.20.1", "foo path").is_err());
170170

171171
// Prev bugfix release is OK
172-
// assert!(check_version("0.21.-1", "foo path").is_ok());
172+
assert!(check_version("0.21.0", "foo path").is_ok());
173173

174174
// Next major release is ERR
175-
assert!(check_version("1.20.0", "foo path").is_err());
175+
assert!(check_version("1.20.1", "foo path").is_err());
176176

177177
// Next minor release is ERR
178-
assert!(check_version("0.22.0", "foo path").is_err());
178+
assert!(check_version("0.22.1", "foo path").is_err());
179179

180180
// Next bugfix release is ERR (Change when we get to v1)
181-
assert!(check_version("0.21.1", "foo path").is_err());
181+
assert!(check_version("0.21.2", "foo path").is_err());
182182
}
183183
}

src/ui.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::config::PanelUiConfig;
55
use crate::lua;
66
use crate::permissions::Permissions;
77
use crate::{app, path};
8-
use ansi_to_tui_forked::IntoText;
8+
use ansi_to_tui::IntoText;
99
use indexmap::IndexSet;
1010
use lazy_static::lazy_static;
1111
use lscolors::{Color as LsColorsColor, Style as LsColorsStyle};
@@ -258,7 +258,7 @@ pub enum Modifier {
258258
}
259259

260260
impl Modifier {
261-
pub fn bits(self) -> u8 {
261+
pub fn bits(self) -> u16 {
262262
match self {
263263
Self::Bold => TuiModifier::BOLD.bits(),
264264
Self::Dim => TuiModifier::DIM.bits(),
@@ -315,7 +315,7 @@ impl Style {
315315

316316
impl Into<TuiStyle> for Style {
317317
fn into(self) -> TuiStyle {
318-
fn xor(modifiers: Option<IndexSet<Modifier>>) -> u8 {
318+
fn xor(modifiers: Option<IndexSet<Modifier>>) -> u16 {
319319
modifiers
320320
.unwrap_or_default()
321321
.into_iter()

0 commit comments

Comments
 (0)