Skip to content

feat: LSP lightweight mode #9869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asterite merged 4 commits into from
Sep 16, 2025
Merged

feat: LSP lightweight mode #9869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f54503
No need to type-check to compute document symbol
asterite Sep 16, 2025
9de5f7d
Inline settings
asterite Sep 16, 2025
99fb929
Allow disabling some LSP features
asterite Sep 16, 2025
48c4aff
then_some
asterite Sep 16, 2025
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
5 changes: 2 additions & 3 deletions tooling/lsp/src/requests/document_symbol.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ use noirc_frontend::{
};

use crate::LspState;

use super::process_request;
use crate::requests::process_request_no_type_check;

pub(crate) fn on_document_symbol_request(
state: &mut LspState,
Expand All @@ -30,7 +29,7 @@ pub(crate) fn on_document_symbol_request(
position: Position { line: 0, character: 0 },
};

let result = process_request(state, text_document_position_params, |args| {
let result = process_request_no_type_check(state, text_document_position_params, |args| {
let file_id = args.location.file;
let file = args.files.get_file(file_id).unwrap();
let source = file.source();
Expand Down
166 changes: 121 additions & 45 deletions tooling/lsp/src/requests/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,22 @@ pub(crate) struct LspInitializationOptions {
#[serde(rename = "enableCodeLens", default = "default_enable_code_lens")]
pub(crate) enable_code_lens: bool,

#[serde(rename = "enableInlayHints", default = "default_enable_inlay_hints")]
pub(crate) enable_inlay_hints: bool,

#[serde(rename = "enableCompletions", default = "default_enable_completions")]
pub(crate) enable_completions: bool,

#[serde(rename = "enableSignatureHelp", default = "default_enable_signature_help")]
pub(crate) enable_signature_help: bool,

#[serde(rename = "enableCodeActions", default = "default_enable_code_actions")]
pub(crate) enable_code_actions: bool,

/// Lightweight mode disables code lens, inlay hints, completions, signature help and code actions
#[serde(rename = "enableLightweightMode", default = "default_enable_lightweight_mode")]
pub(crate) enable_lightweight_mode: bool,

#[serde(rename = "enableParsingCache", default = "default_enable_parsing_cache")]
pub(crate) enable_parsing_cache: bool,

Expand All @@ -108,7 +124,7 @@ pub(crate) struct InlayHintsOptions {
#[serde(rename = "closingBraceHints", default = "default_closing_brace_hints")]
pub(crate) closing_brace_hints: ClosingBraceHintsOptions,

#[serde(rename = "ChainingHints", default = "default_chaining_hints")]
#[serde(rename = "chainingHints", default = "default_chaining_hints")]
pub(crate) chaining_hints: ChainingHintsOptions,
}

Expand Down Expand Up @@ -143,10 +159,30 @@ fn default_enable_code_lens() -> bool {
true
}

fn default_enable_inlay_hints() -> bool {
true
}

fn default_enable_completions() -> bool {
true
}

fn default_enable_signature_help() -> bool {
true
}

fn default_enable_code_actions() -> bool {
true
}

fn default_enable_parsing_cache() -> bool {
true
}

fn default_enable_lightweight_mode() -> bool {
false
}

fn default_inlay_hints() -> InlayHintsOptions {
InlayHintsOptions {
type_hints: default_type_hints(),
Expand Down Expand Up @@ -201,6 +237,11 @@ impl Default for LspInitializationOptions {
enable_code_lens: default_enable_code_lens(),
enable_parsing_cache: default_enable_parsing_cache(),
inlay_hints: default_inlay_hints(),
enable_inlay_hints: default_enable_inlay_hints(),
enable_completions: default_enable_completions(),
enable_signature_help: default_enable_signature_help(),
enable_code_actions: default_enable_code_actions(),
enable_lightweight_mode: default_enable_lightweight_mode(),
}
}
}
Expand All @@ -217,29 +258,33 @@ pub(crate) fn on_initialize(
.unwrap_or_default();
state.options = initialization_options;

async move {
let text_document_sync = TextDocumentSyncCapability::Kind(TextDocumentSyncKind::FULL);

let code_lens = if initialization_options.enable_code_lens {
Some(CodeLensOptions { resolve_provider: Some(false) })
} else {
None
};

let nargo = NargoCapability {
tests: Some(NargoTestsOptions {
fetch: Some(true),
run: Some(true),
update: Some(true),
}),
};
let enable_code_lens =
!initialization_options.enable_lightweight_mode && initialization_options.enable_code_lens;
let enable_inlay_hints = !initialization_options.enable_lightweight_mode
&& initialization_options.enable_inlay_hints;
let enable_completions = !initialization_options.enable_lightweight_mode
&& initialization_options.enable_completions;
let enable_signature_help = !initialization_options.enable_lightweight_mode
&& initialization_options.enable_signature_help;
let enable_code_actions = !initialization_options.enable_lightweight_mode
&& initialization_options.enable_code_actions;

async move {
Ok(InitializeResult {
capabilities: ServerCapabilities {
text_document_sync: Some(text_document_sync),
code_lens_provider: code_lens,
text_document_sync: Some(TextDocumentSyncCapability::Kind(
TextDocumentSyncKind::FULL,
)),
code_lens_provider: enable_code_lens
.then_some(CodeLensOptions { resolve_provider: Some(false) }),
document_formatting_provider: true,
nargo: Some(nargo),
nargo: Some(NargoCapability {
tests: Some(NargoTestsOptions {
fetch: Some(true),
run: Some(true),
update: Some(true),
}),
}),
definition_provider: Some(lsp_types::OneOf::Left(true)),
declaration_provider: Some(DeclarationCapability::Simple(true)),
type_definition_provider: Some(TypeDefinitionProviderCapability::Simple(true)),
Expand All @@ -259,12 +304,14 @@ pub(crate) fn on_initialize(
work_done_progress: None,
},
})),
inlay_hint_provider: Some(lsp_types::OneOf::Right(lsp_types::InlayHintOptions {
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
inlay_hint_provider: enable_inlay_hints.then_some(lsp_types::OneOf::Right(
lsp_types::InlayHintOptions {
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
},
resolve_provider: None,
},
resolve_provider: None,
})),
)),
document_symbol_provider: Some(lsp_types::OneOf::Right(
lsp_types::DocumentSymbolOptions {
work_done_progress_options: WorkDoneProgressOptions {
Expand All @@ -273,20 +320,22 @@ pub(crate) fn on_initialize(
label: Some("Noir".to_string()),
},
)),
completion_provider: Some(lsp_types::OneOf::Right(lsp_types::CompletionOptions {
resolve_provider: None,
trigger_characters: Some(vec![
".".to_string(), // For method calls
":".to_string(), // For paths
"$".to_string(), // For $var inside `quote { ... }`
]),
all_commit_characters: None,
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
completion_provider: enable_completions.then_some(lsp_types::OneOf::Right(
lsp_types::CompletionOptions {
resolve_provider: None,
trigger_characters: Some(vec![
".".to_string(), // For method calls
":".to_string(), // For paths
"$".to_string(), // For $var inside `quote { ... }`
]),
all_commit_characters: None,
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
},
completion_item: None,
},
completion_item: None,
})),
signature_help_provider: Some(lsp_types::OneOf::Right(
)),
signature_help_provider: enable_signature_help.then_some(lsp_types::OneOf::Right(
lsp_types::SignatureHelpOptions {
trigger_characters: Some(vec!["(".to_string(), ",".to_string()]),
retrigger_characters: None,
Expand All @@ -295,13 +344,15 @@ pub(crate) fn on_initialize(
},
},
)),
code_action_provider: Some(lsp_types::OneOf::Right(lsp_types::CodeActionOptions {
code_action_kinds: Some(vec![CodeActionKind::QUICKFIX]),
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
code_action_provider: enable_code_actions.then_some(lsp_types::OneOf::Right(
lsp_types::CodeActionOptions {
code_action_kinds: Some(vec![CodeActionKind::QUICKFIX]),
work_done_progress_options: WorkDoneProgressOptions {
work_done_progress: None,
},
resolve_provider: None,
},
resolve_provider: None,
})),
)),
workspace_symbol_provider: Some(lsp_types::OneOf::Right(
lsp_types::WorkspaceSymbolOptions {
work_done_progress_options: WorkDoneProgressOptions {
Expand Down Expand Up @@ -492,6 +543,31 @@ pub(crate) fn process_request<F, T>(
text_document_position_params: TextDocumentPositionParams,
callback: F,
) -> Result<T, ResponseError>
where
F: FnOnce(ProcessRequestCallbackArgs) -> T,
{
let type_check = true;
process_request_impl(state, text_document_position_params, type_check, callback)
}

pub(crate) fn process_request_no_type_check<F, T>(
state: &mut LspState,
text_document_position_params: TextDocumentPositionParams,
callback: F,
) -> Result<T, ResponseError>
where
F: FnOnce(ProcessRequestCallbackArgs) -> T,
{
let type_check = false;
process_request_impl(state, text_document_position_params, type_check, callback)
}

fn process_request_impl<F, T>(
state: &mut LspState,
text_document_position_params: TextDocumentPositionParams,
type_check: bool,
callback: F,
) -> Result<T, ResponseError>
where
F: FnOnce(ProcessRequestCallbackArgs) -> T,
{
Expand All @@ -512,7 +588,7 @@ where
};

// First type-check the workspace if needed
if state.workspaces_to_process.remove(&workspace.root_dir) {
if type_check && state.workspaces_to_process.remove(&workspace.root_dir) {
let _ = process_workspace(state, &workspace, false);
}

Expand Down
Loading