Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ Codebook is the most popular spell checker for Zed! To install, go to the Extens

**Note**: The version that Zed displays in the extension menus is for the [Zed Extension](https://github.com/blopker/codebook-zed), and not the LSP version (this repo). The extension will automatically update the LSP. If that updater is broken for some reason, try uninstalling the extension and reinstalling.

If quickfix code actions are not showing up for specific languages, ensure your `settings.json` file incudes the special `"..."` value in any `language_servers` values defined:

```json
"languages": {
"Python": {
"language_servers": ["pyright", "ruff", "..."],
"format_on_save": "on"
}
},
```

To enable DEBUG logs, add this to your settings.json:

```json
Expand Down
19 changes: 17 additions & 2 deletions crates/codebook-lsp/src/lsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use codebook::parser::TextRange;
use codebook::parser::WordLocation;
use codebook::parser::get_word_from_string;
use codebook::queries::LanguageType;

use log::LevelFilter;
use log::error;
use serde_json::Value;
Expand Down Expand Up @@ -90,7 +91,21 @@ impl LanguageServer for Backend {
],
work_done_progress_options: Default::default(),
}),
code_action_provider: Some(CodeActionProviderCapability::Simple(true)),
code_action_provider: Some(CodeActionProviderCapability::Options(
CodeActionOptions {
code_action_kinds: Some(vec![CodeActionKind::QUICKFIX]),
resolve_provider: None,
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
},
},
)),
diagnostic_provider: Some(DiagnosticServerCapabilities::Options(
DiagnosticOptions {
identifier: Some(SOURCE_NAME.to_string()),
..DiagnosticOptions::default()
},
)),
..ServerCapabilities::default()
},
server_info: Some(ServerInfo {
Expand Down Expand Up @@ -422,7 +437,7 @@ impl Backend {
let lang_type = doc
.language_id
.as_deref()
.map(|lang| LanguageType::from_str(lang).unwrap());
.and_then(|lang| LanguageType::from_str(lang).ok());

let cb = self.codebook.clone();
let fp = file_path.clone();
Expand Down
1 change: 0 additions & 1 deletion crates/codebook/src/queries.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ impl LanguageType {
}
}

// Use https://intmainreturn0.com/ts-visualizer/ to help with writing grammar queries
// Language ids documented at https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem
pub static LANGUAGE_SETTINGS: &[LanguageSetting] = &[
LanguageSetting {
Expand Down