Skip to content
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

add config option insert_completion #2226

Closed
wants to merge 1 commit into from
+35 −6
Closed

add config option insert_completion #2226

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"type": "boolean",
"default": true
},
"insert_completions": {
"description": "Uses insertText completion items and lets the client handle filtering",
"type": "boolean",
"default": false
},
"enable_argument_placeholders": {
"description": "Whether to enable function argument placeholder completions",
"type": "boolean",
Expand Down
3 changes: 3 additions & 0 deletions src/Config.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
/// Enables snippet completions when the client also supports them
enable_snippets: bool = true,

/// Uses insertText completion items and lets the client handle filtering
insert_completions: bool = false,

/// Whether to enable function argument placeholder completions
enable_argument_placeholders: bool = true,

Expand Down
27 changes: 21 additions & 6 deletions src/features/completions.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,13 +938,28 @@ pub fn completionAtIndex(
const replace_range = offsets.locToRange(source, .{ .start = start_index, .end = end_index }, server.offset_encoding);

for (completions) |*item| {
if (item.textEdit == null) {
item.textEdit = if (server.client_capabilities.supports_completion_insert_replace_support)
.{ .InsertReplaceEdit = .{ .newText = item.insertText orelse item.label, .insert = insert_range, .replace = replace_range } }
else
.{ .TextEdit = .{ .newText = item.insertText orelse item.label, .range = insert_range } };
switch (builder.server.config.insert_completions) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uh, why switch

false => {
if (item.textEdit == null) {
item.textEdit = if (server.client_capabilities.supports_completion_insert_replace_support)
.{ .InsertReplaceEdit = .{ .newText = item.insertText orelse item.label, .insert = insert_range, .replace = replace_range } }
else
.{ .TextEdit = .{ .newText = item.insertText orelse item.label, .range = insert_range } };
}
item.insertText = null;
},
true => {
if (item.insertText == null) {
if (item.textEdit != null) {
item.insertText = item.textEdit.?.TextEdit.newText;
}
else {
item.insertText = item.label;
}
}
item.textEdit = null;
}
}
item.insertText = null;

if (item.detail) |det| {
if (det.len > server.client_capabilities.max_detail_length) {
Expand Down
6 changes: 6 additions & 0 deletions src/tools/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
"type": "bool",
"default": true
},
{
"name": "insert_completions",
"description": "Uses insertText completion items and lets the client handle filtering",
"type": "bool",
"default": false
},
{
"name": "enable_argument_placeholders",
"description": "Whether to enable function argument placeholder completions",
Expand Down
Loading