>(
&mut self,
path: Option,
@@ -811,7 +826,8 @@ impl Document {
if self.savepoint.is_some() {
take_with(&mut self.savepoint, |prev_revert| {
let revert = transaction.invert(&old_doc);
- Some(revert.compose(prev_revert.unwrap()))
+ let (version, prev_revert) = prev_revert.unwrap();
+ Some((version, revert.compose(prev_revert)))
});
}
@@ -906,11 +922,11 @@ impl Document {
}
pub fn savepoint(&mut self) {
- self.savepoint = Some(Transaction::new(self.text()));
+ self.savepoint = Some((self.version, Transaction::new(self.text())));
}
pub fn restore(&mut self, view: &mut View) {
- if let Some(revert) = self.savepoint.take() {
+ if let Some((_, revert)) = self.savepoint.take() {
apply_transaction(&revert, self, view);
}
}
diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 547a4ffb..b5f4b34a 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs
@@ -115,6 +115,57 @@ impl Default for FilePickerConfig {
}
}
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum ExplorerStyle {
+ Tree,
+ List,
+}
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum ExplorerPosition {
+ Embed,
+ Overlay,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
+pub struct ExplorerConfig {
+ pub style: ExplorerStyle,
+ pub position: ExplorerPosition,
+ /// explorer column width
+ pub column_width: usize,
+}
+
+impl ExplorerConfig {
+ pub fn is_embed(&self) -> bool {
+ return self.position == ExplorerPosition::Embed;
+ }
+
+ pub fn is_overlay(&self) -> bool {
+ return self.position == ExplorerPosition::Overlay;
+ }
+
+ pub fn is_list(&self) -> bool {
+ return self.style == ExplorerStyle::List;
+ }
+
+ pub fn is_tree(&self) -> bool {
+ return self.style == ExplorerStyle::Tree;
+ }
+}
+
+impl Default for ExplorerConfig {
+ fn default() -> Self {
+ Self {
+ style: ExplorerStyle::Tree,
+ position: ExplorerPosition::Embed,
+ column_width: 30,
+ }
+ }
+}
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case", default, deny_unknown_fields)]
pub struct Config {
@@ -154,6 +205,7 @@ pub struct Config {
)]
pub idle_timeout: Duration,
pub completion_trigger_len: u8,
+ pub completion_trigger_chars: Vec,
/// Whether to display infoboxes. Defaults to true.
pub auto_info: bool,
pub file_picker: FilePickerConfig,
@@ -178,6 +230,8 @@ pub struct Config {
pub indent_guides: IndentGuidesConfig,
/// Whether to color modes with different colors. Defaults to `false`.
pub color_modes: bool,
+ /// explore config
+ pub explorer: ExplorerConfig,
}
#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -280,7 +334,16 @@ impl Default for StatusLineConfig {
Self {
left: vec![E::Mode, E::Spinner, E::FileName],
center: vec![],
- right: vec![E::Diagnostics, E::Selections, E::Position, E::FileEncoding],
+ right: vec![
+ E::Diagnostics,
+ E::Selections,
+ E::Position,
+ E::PositionPercentage,
+ E::Separator,
+ E::FileEncoding,
+ E::FileLineEnding,
+ E::FileType,
+ ],
separator: String::from("│"),
mode: ModeConfig::default(),
}
@@ -407,7 +470,7 @@ impl std::ops::Deref for CursorShapeConfig {
impl Default for CursorShapeConfig {
fn default() -> Self {
- Self([CursorKind::Block; 3])
+ Self([CursorKind::Block, CursorKind::Underline, CursorKind::Bar])
}
}
@@ -574,20 +637,30 @@ impl Default for WhitespaceCharacters {
}
}
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+pub enum RainbowIndentOptions {
+ None,
+ Dim,
+ Normal,
+}
+
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(default, rename_all = "kebab-case")]
pub struct IndentGuidesConfig {
pub render: bool,
pub character: char,
+ pub rainbow: RainbowIndentOptions,
pub skip_levels: u8,
}
impl Default for IndentGuidesConfig {
fn default() -> Self {
Self {
+ render: true,
skip_levels: 0,
- render: false,
character: '│',
+ rainbow: RainbowIndentOptions::None,
}
}
}
@@ -604,7 +677,7 @@ impl Default for Config {
vec!["sh".to_owned(), "-c".to_owned()]
},
line_number: LineNumber::Absolute,
- cursorline: false,
+ cursorline: true,
cursorcolumn: false,
gutters: vec![
GutterType::Diagnostics,
@@ -628,11 +701,13 @@ impl Default for Config {
search: SearchConfig::default(),
lsp: LspConfig::default(),
terminal: get_terminal_provider(),
- rulers: Vec::new(),
+ rulers: vec![120],
whitespace: WhitespaceConfig::default(),
bufferline: BufferLine::default(),
indent_guides: IndentGuidesConfig::default(),
- color_modes: false,
+ color_modes: true,
+ explorer: ExplorerConfig::default(),
+ completion_trigger_chars: vec!['.'],
}
}
}
@@ -768,6 +843,7 @@ pub enum Action {
}
/// Error thrown on failed document closed
+#[derive(Debug)]
pub enum CloseError {
/// Document doesn't exist
DoesNotExist,
@@ -777,6 +853,18 @@ pub enum CloseError {
SaveError(anyhow::Error),
}
+impl std::error::Error for CloseError {}
+
+impl std::fmt::Display for CloseError {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ CloseError::DoesNotExist => "Buffer does not exist".fmt(f),
+ CloseError::BufferModified(s) => write!(f, "The buffer {s} has been modified"),
+ CloseError::SaveError(e) => write!(f, "Failed to save document {e}"),
+ }
+ }
+}
+
impl Editor {
pub fn new(
mut area: Rect,
@@ -860,6 +948,10 @@ impl Editor {
.reset(Instant::now() + config.idle_timeout);
}
+ pub fn reset_idle_timer_zero(&mut self) {
+ self.idle_timer.as_mut().reset(Instant::now());
+ }
+
pub fn clear_status(&mut self) {
self.status_msg = None;
}
@@ -938,6 +1030,27 @@ impl Editor {
Self::launch_language_server(&mut self.language_servers, doc)
}
+ /// Restarts a language server for a given document
+ pub fn restart_language_server(&mut self, doc_id: DocumentId) -> Option<()> {
+ let doc = self.documents.get_mut(&doc_id)?;
+ if let Some(language) = doc.language.as_ref() {
+ if let Ok(client) = self
+ .language_servers
+ .restart(&*language, doc.path())
+ .map_err(|e| {
+ log::error!(
+ "Failed to restart the LSP for `{}` {{ {} }}",
+ language.scope(),
+ e
+ )
+ })
+ {
+ doc.set_language_server(client);
+ }
+ };
+ Some(())
+ }
+
/// Launch a language server for a given document
fn launch_language_server(ls: &mut helix_lsp::Registry, doc: &mut Document) -> Option<()> {
// if doc doesn't have a URL it's a scratch buffer, ignore it
diff --git a/helix-view/src/theme.rs b/helix-view/src/theme.rs
index cb0d3ac4..662c5a5b 100644
--- a/helix-view/src/theme.rs
+++ b/helix-view/src/theme.rs
@@ -202,6 +202,7 @@ pub struct Theme {
styles: HashMap,
// tree-sitter highlight styles are stored in a Vec to optimize lookups
scopes: Vec,
+ rainbow_length: usize,
highlights: Vec
-