TudbuT/helix-mods
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move top level lsp config to editor.lsp (#1868)

Browse source 
* Move top level lsp config to editor.lsp

This is mainly done to accomodate the new lsp.signature-help config
option that will be introduced in https://github.com/helix-editor/helix/pull/1755
which will have to be accessed by commands. The top level config
struct is split and moved to different places, making the relocation
necessary

* Revert rebase slipup
This commit is contained in:
Gokul Soumya 2022-03-28 06:41:52 +05:30 • committed by GitHub
parent bee05dd32a
commit 7b3a3d562c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
book/src/configuration.md
View file

@ -43,6 +43,14 @@ hidden = false
| `auto-info` | Whether to display infoboxes | `true` |
| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
### `[editor.lsp]` Section
| Key | Description | Default |
| --- | ----------- | ------- |
| `display-messages` | Display LSP progress messages below statusline[^1] | `false` |
[^1]: A progress spinner is always shown in the statusline beside the file path.
### `[editor.cursor-shape]` Section
Defines the shape of cursor in each mode. Note that due to limitations
@ -126,13 +134,3 @@ Search specific options.
|--|--|---------|
| `smart-case` | Enable smart case regex searching (case insensitive unless pattern contains upper case characters) | `true` |
| `wrap-around`| Whether the search should wrap after depleting the matches | `true` |
## LSP
To display all language server messages in the status line add the following to your `config.toml`:
```toml
[lsp]
display-messages = true
```

2
helix-term/src/application.rs
View file

@ -760,7 +760,7 @@ impl Application {
self.lsp_progress.update(server_id, token, work);
}
if self.config.load().lsp.display_messages {
if self.config.load().editor.lsp.display_messages {
self.editor.set_status(status);
}
}

9
helix-term/src/config.rs
View file

@ -11,8 +11,6 @@ use toml::de::Error as TomlError;
#[serde(deny_unknown_fields)]
pub struct Config {
pub theme: Option<String>,
#[serde(default)]
pub lsp: LspConfig,
#[serde(default = "default")]
pub keys: HashMap<Mode, Keymap>,
#[serde(default)]
@ -23,7 +21,6 @@ impl Default for Config {
fn default() -> Config {
Config {
theme: None,
lsp: LspConfig::default(),
keys: default(),
editor: helix_view::editor::Config::default(),
}
@ -45,12 +42,6 @@ impl Display for ConfigLoadError {
}
}
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct LspConfig {
pub display_messages: bool,
}
impl Config {
pub fn load(config_path: PathBuf) -> Result<Config, ConfigLoadError> {
match std::fs::read_to_string(config_path) {

8
helix-view/src/editor.rs
View file

@ -143,6 +143,13 @@ pub struct Config {
/// Search configuration.
#[serde(default)]
pub search: SearchConfig,
pub lsp: LspConfig,
}
#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct LspConfig {
pub display_messages: bool,
}
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@ -253,6 +260,7 @@ impl Default for Config {
cursor_shape: CursorShapeConfig::default(),
true_color: false,
search: SearchConfig::default(),
lsp: LspConfig::default(),
}
}
}