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 assets/settings/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,17 @@
// The delay in milliseconds that must elapse before drag and drop is allowed. Otherwise, a new text selection is created.
"delay": 300,
},
// Whether and how to display code lenses from language servers.
//
// Possible values:
//
// 1. Do not display code lenses.
// "code_lens": "off",
// 2. Display code lenses from language servers above code elements.
// "code_lens": "on",
// 3. Display code lenses in the code action menu.
// "code_lens": "menu",
"code_lens": "off",
// What to do when go to definition yields no results.
//
// 1. Do nothing: `none`
Expand Down
7 changes: 7 additions & 0 deletions crates/collab/tests/integration/editor_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1203,6 +1203,13 @@ async fn test_slow_lsp_server(cx_a: &mut TestAppContext, cx_b: &mut TestAppConte
.await;
let active_call_a = cx_a.read(ActiveCall::global);
cx_b.update(editor::init);
cx_b.update(|cx| {
SettingsStore::update_global(cx, |store, cx| {
store.update_user_settings(cx, |settings| {
settings.editor.code_lens = Some(settings::CodeLens::Menu);
});
});
});

let command_name = "test_command";
let capabilities = lsp::ServerCapabilities {
Expand Down
2 changes: 2 additions & 0 deletions crates/editor/src/actions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -849,6 +849,8 @@ actions!(
ToggleIndentGuides,
/// Toggles inlay hints display.
ToggleInlayHints,
/// Toggles code lens display.
ToggleCodeLens,
/// Toggles semantic highlights display.
ToggleSemanticHighlights,
/// Toggles inline values display.
Expand Down
Loading
Loading