diff --git a/book/src/editor.md b/book/src/editor.md index 06f8800c2..624bdff23 100644 --- a/book/src/editor.md +++ b/book/src/editor.md @@ -151,7 +151,7 @@ ### `[editor.lsp]` Section [^1]: By default, a progress spinner is shown in the statusline beside the file path. -[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them! +[^2]: You may also have to activate them in the language server config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them! ### `[editor.cursor-shape]` Section diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md index 31d1c563e..081225632 100644 --- a/book/src/generated/lang-support.md +++ b/book/src/generated/lang-support.md @@ -1,4 +1,4 @@ -| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP | +| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default language servers | | --- | --- | --- | --- | --- | | ada | ✓ | ✓ | | `ada_language_server` | | adl | ✓ | ✓ | ✓ | | diff --git a/book/src/generated/typable-cmd.md b/book/src/generated/typable-cmd.md index 7d3622256..f0d9a0f49 100644 --- a/book/src/generated/typable-cmd.md +++ b/book/src/generated/typable-cmd.md @@ -16,7 +16,7 @@ | `:write-buffer-close`, `:wbc` | Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt) | | `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) | | `:new`, `:n` | Create a new scratch buffer. | -| `:format`, `:fmt` | Format the file using the LSP formatter. | +| `:format`, `:fmt` | Format the file using an external formatter or language server. | | `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) | | `:line-ending` | Set the document's default line ending. Options: crlf, lf. | | `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. | diff --git a/book/src/languages.md b/book/src/languages.md index 2a1c6d652..a70b47891 100644 --- a/book/src/languages.md +++ b/book/src/languages.md @@ -13,7 +13,7 @@ ## `languages.toml` files 2. In your [configuration directory](./configuration.md). This overrides values from the built-in language configuration. For example, to disable - auto-LSP-formatting in Rust: + auto-formatting for Rust: ```toml # in /helix/languages.toml @@ -128,7 +128,7 @@ ## Language Server configuration | ---- | ----------- | | `command` | The name or path of the language server binary to execute. Binaries must be in `$PATH` | | `args` | A list of arguments to pass to the language server binary | -| `config` | LSP initialization options | +| `config` | Language server initialization options | | `timeout` | The maximum time a request to the language server may take, in seconds. Defaults to `20` | | `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` | | `required-root-patterns` | A list of `glob` patterns to look for in the working directory. The language server is started if at least one of them is found. | diff --git a/book/src/pickers.md b/book/src/pickers.md index 4149e560b..67a195a65 100644 --- a/book/src/pickers.md +++ b/book/src/pickers.md @@ -4,7 +4,7 @@ ## Using pickers ### Filtering Picker Results -Most pickers perform fuzzy matching using [fzf syntax](https://github.com/junegunn/fzf?tab=readme-ov-file#search-syntax). Two exceptions are the global search picker, which uses regex, and the workspace symbol picker, which passes search terms to the LSP. Note that OR operations (`|`) are not currently supported. +Most pickers perform fuzzy matching using [fzf syntax](https://github.com/junegunn/fzf?tab=readme-ov-file#search-syntax). Two exceptions are the global search picker, which uses regex, and the workspace symbol picker, which passes search terms to the language server. Note that OR operations (`|`) are not currently supported. If a picker shows multiple columns, you may apply the filter to a specific column by prefixing the column name with `%`. Column names can be shortened to any prefix, so `%p`, `%pa` or `%pat` all mean the same as `%path`. For example, a query of `helix %p .toml !lang` in the global search picker searches for the term "helix" within files with paths ending in ".toml" but not including "lang". diff --git a/book/src/themes.md b/book/src/themes.md index 4e0142ddd..40e12330e 100644 --- a/book/src/themes.md +++ b/book/src/themes.md @@ -309,8 +309,8 @@ #### Interface | `ui.virtual.whitespace` | Visible whitespace characters | | `ui.virtual.indent-guide` | Vertical indent width guides | | `ui.virtual.inlay-hint` | Default style for inlay hints of all kinds | -| `ui.virtual.inlay-hint.parameter` | Style for inlay hints of kind `parameter` (LSPs are not required to set a kind) | -| `ui.virtual.inlay-hint.type` | Style for inlay hints of kind `type` (LSPs are not required to set a kind) | +| `ui.virtual.inlay-hint.parameter` | Style for inlay hints of kind `parameter` (language servers are not required to set a kind) | +| `ui.virtual.inlay-hint.type` | Style for inlay hints of kind `type` (language servers are not required to set a kind) | | `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) | | `ui.virtual.jump-label` | Style for virtual jump labels | | `ui.menu` | Code and command completion menus | diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs index 7402a06f3..3fd86ffda 100644 --- a/helix-term/src/commands/typed.rs +++ b/helix-term/src/commands/typed.rs @@ -2636,7 +2636,7 @@ fn read(cx: &mut compositor::Context, args: &[Cow], event: PromptEvent) -> TypableCommand { name: "format", aliases: &["fmt"], - doc: "Format the file using the LSP formatter.", + doc: "Format the file using an external formatter or language server.", fun: format, signature: CommandSignature::none(), }, diff --git a/helix-term/src/health.rs b/helix-term/src/health.rs index e59fd74dc..54789b899 100644 --- a/helix-term/src/health.rs +++ b/helix-term/src/health.rs @@ -154,7 +154,7 @@ pub fn languages_all() -> std::io::Result<()> { } }; - let mut headings = vec!["Language", "LSP", "DAP", "Formatter"]; + let mut headings = vec!["Language", "Language servers", "Debug adapter", "Formatter"]; for feat in TsFeature::all() { headings.push(feat.short_title()) diff --git a/xtask/src/docgen.rs b/xtask/src/docgen.rs index 18c145d50..6658e876b 100644 --- a/xtask/src/docgen.rs +++ b/xtask/src/docgen.rs @@ -59,7 +59,7 @@ pub fn lang_features() -> Result { .map(|t| t.long_title().to_string()) .collect::>(), ); - cols.push("Default LSP".to_owned()); + cols.push("Default language servers".to_owned()); md.push_str(&md_table_heading(&cols)); let config = helpers::lang_config();