Merge branch 'tree_explore'

book/src/configuration.md

@@ -214,6 +214,18 @@ tab = "→"
 newline = "⏎"
 tabpad = "·" # Tabs will look like "→···" (depending on tab width)
 ```
+<<<<<<< HEAD
+
+### `[editor.explorer]` Section
+Sets explorer side width and style.
+
+ | Key            | Description                                                                              | Default |
+ | ---            | -----------                                                                              | ------- |
+ | `column-width` | explorer side width                                                                      | 30      |
+ | `style`        | explorer item style, tree or list                                                        | tree    |
+ | `position`     | explorer widget position, embed or overlay                                               | overlay |
+||||||| 43027d91
+=======
 
 ### `[editor.indent-guides]` Section
 
@@ -240,3 +252,4 @@ Sets explorer side width and style.
  | `column-width` | explorer side width                                                                      | 30      |
  | `style`        | explorer item style, tree or list                                                        | tree    |
  | `position`     | explorer widget position, embed or overlay                                               | overlay |
+>>>>>>> 0e04c4c93caadb704c11a72bcf626b1f10ff2d98

contrib/themes

@@ -1 +0,0 @@
-../runtime/themes

helix-core/tests/data/indent/indent.rs

@@ -1 +0,0 @@
-../../../src/indent.rs

helix-term/src/ui/explore.rs

@@ -5,10 +5,10 @@ use crate::{
 };
 use anyhow::{bail, ensure, Result};
 use helix_core::Position;
-use helix_view::input::{Event, KeyEvent};
 use helix_view::{
     editor::Action,
     graphics::{CursorKind, Modifier, Rect},
+    input::{Event, KeyEvent},
     Editor,
 };
 use std::borrow::Cow;

helix-term/src/ui/tree.rs

@@ -8,8 +8,10 @@ use crate::{
     ctrl, key, shift,
 };
 use helix_core::unicode::width::UnicodeWidthStr;
-use helix_view::input::Event;
+use helix_view::{
-use helix_view::{graphics::Rect, input::KeyEvent};
+    graphics::Rect,
+    input::{Event, KeyEvent},
+};
 use tui::{buffer::Buffer as Surface, text::Spans};
 
 pub trait TreeItem: Sized {

runtime/themes/onedark.toml

@@ -84,6 +84,12 @@ diagnostic = { modifiers = ["underlined"] }
 "ui.explorer.focus" = { modifiers = ["reversed"] }
 "ui.explorer.unfocus" = { bg = "light-gray" }
 
+"ui.explorer.file" = { fg = "white" }
+"ui.explorer.dir" = { fg = "blue" }
+"ui.explorer.exe" = { fg = "white" }
+"ui.explorer.focus" = { modifiers = ["reversed"] }
+"ui.explorer.unfocus" = { bg = "light-gray" }
+
 [palette]
 
 yellow = "#E5C07B"

runtime/themes/serika-dark.toml

@@ -76,6 +76,12 @@
 "ui.explorer.focus" = { modifiers = ["reversed"] }
 "ui.explorer.unfocus" = { bg = "bg3" }
 
+"ui.explorer.file" = { fg = "fg" }
+"ui.explorer.dir" = { fg = "blue" }
+"ui.explorer.exe" = { fg = "fg" }
+"ui.explorer.focus" = { modifiers = ["reversed"] }
+"ui.explorer.unfocus" = { bg = "bg3" }
+
 [palette]
 
 bg0 = "#323437"