Skip to content

Remove FoldingRangeRequest #482

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
SpaceManiac merged 1 commit into from
Sep 16, 2026
Merged

Remove FoldingRangeRequest #482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 0 additions & 49 deletions crates/dm-langserver/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,7 +1358,6 @@ impl Engine {
Completion;
SignatureHelpRequest;
DocumentSymbolRequest;
FoldingRangeRequest;
DocumentColor;
ColorPresentationRequest;
DocumentLinkRequest;
Expand Down Expand Up @@ -1438,7 +1437,6 @@ impl Engine {
work_done_progress_options: Default::default(),
}),
color_provider: Some(ColorProviderCapability::Simple(true)),
folding_range_provider: Some(FoldingRangeProviderCapability::Simple(true)),
..Default::default()
},
server_info: Some(ServerInfo {
Expand Down Expand Up @@ -2296,37 +2294,6 @@ impl Engine {
}
}

fn FoldingRangeRequest(&mut self, params: P<FoldingRangeRequest>) -> R<FoldingRangeRequest> {
let content = self
.docs
.get_contents(&params.text_document.uri)
.map_err(invalid_request)?;

let mut region_starts = Vec::new();
let mut ranges = Vec::new();

for (index, line) in content.lines().enumerate() {
let line = line.trim_start();
let line_number = index as u32;

if is_region_marker(line, "#region") {
region_starts.push(line_number);
} else if is_region_marker(line, "#endregion")
&& let Some(start_line) = region_starts.pop()
{
ranges.push(FoldingRange {
start_line,
end_line: line_number,
start_character: None,
end_character: None,
kind: Some(FoldingRangeKind::Region),
});
}
}

Ok(Some(ranges))
}

fn DocumentColor(&mut self, params: P<DocumentColor>) -> R<DocumentColor> {
let content = self
.docs
Expand Down Expand Up @@ -2589,22 +2556,6 @@ fn path_to_url(path: PathBuf) -> Result<Url, jsonrpc::Error> {
Url::from_file_path(path).map_err(|_| invalid_request(format!("bad file path: {formatted}")))
}

fn is_region_marker(line: &str, marker: &str) -> bool {
let Some(comment) = line.strip_prefix("//") else {
return false;
};

let rest = comment.strip_prefix(' ').unwrap_or(comment);
let Some(suffix) = rest.strip_prefix(marker) else {
return false;
};

match suffix.chars().next() {
None => true,
Some(ch) => ch.is_whitespace(),
}
}

fn convert_severity(severity: dm::Severity) -> lsp_types::DiagnosticSeverity {
match severity {
dm::Severity::Error => lsp_types::DiagnosticSeverity::ERROR,
Expand Down