Skip to content

Commit

Permalink
Add an option to disable display of progress in status bar
Browse files Browse the repository at this point in the history
  • Loading branch information
vv9k authored and archseer committed Jun 18, 2021
1 parent d095ec1 commit bbefc1d
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 2 deletions.
8 changes: 8 additions & 0 deletions book/src/configuration.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Configuration

## LSP

To disable language server progress report from being displayed in the status bar add this option to your `config.toml`:
```toml
lsp_progress = false
```

## Theme

Use a custom theme by placing a theme.toml in your config directory (i.e ~/.config/helix/theme.toml). The default theme.toml can be found [here](https://github.com/helix-editor/helix/blob/master/theme.toml), and user submitted themes [here](https://github.com/helix-editor/helix/blob/master/contrib/themes).
Expand Down Expand Up @@ -87,3 +94,4 @@ Possible keys:
These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme). We half-follow the common scopes from [macromates language grammars](https://macromates.com/manual/en/language_grammars) with some differences.

For a given highlight produced, styling will be determined based on the longest matching theme key. So it's enough to provide function to highlight `function.macro` and `function.builtin` as well, but you can use more specific scopes to highlight specific cases differently.

8 changes: 6 additions & 2 deletions helix-term/src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pub struct Application {
callbacks: LspCallbacks,

lsp_progress: LspProgressMap,
lsp_progress_enabled: bool,
}

impl Application {
Expand Down Expand Up @@ -77,6 +78,7 @@ impl Application {

callbacks: FuturesUnordered::new(),
lsp_progress: LspProgressMap::new(),
lsp_progress_enabled: config.global.lsp_progress,
};

Ok(app)
Expand Down Expand Up @@ -310,8 +312,10 @@ impl Application {
self.lsp_progress.update(server_id, token, work);
}

self.editor.set_status(status);
self.render();
if self.lsp_progress_enabled {
self.editor.set_status(status);
self.render();
}
}
_ => unreachable!(),
}
Expand Down
10 changes: 10 additions & 0 deletions helix-term/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@ use serde::{de::Error as SerdeError, Deserialize, Serialize};

use crate::keymap::{parse_keymaps, Keymaps};

#[derive(Default)]
pub struct GlobalConfig {
pub lsp_progress: bool,
}

#[derive(Default)]
pub struct Config {
pub global: GlobalConfig,
pub keymaps: Keymaps,
}

#[derive(Serialize, Deserialize)]
struct TomlConfig {
lsp_progress: Option<bool>,
keys: Option<HashMap<String, HashMap<String, String>>>,
}

Expand All @@ -22,6 +29,9 @@ impl<'de> Deserialize<'de> for Config {
{
let config = TomlConfig::deserialize(deserializer)?;
Ok(Self {
global: GlobalConfig {
lsp_progress: config.lsp_progress.unwrap_or(true),
},
keymaps: config
.keys
.map(|r| parse_keymaps(&r))
Expand Down

0 comments on commit bbefc1d

Please sign in to comment.