Skip to content

Add code action for organizing imports #881

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

Closed
Techatrix wants to merge 1 commit into from
Closed

Add code action for organizing imports #881

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
35 changes: 17 additions & 18 deletions src/Server.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,18 +521,20 @@ pub fn autofix(server: *Server, allocator: std.mem.Allocator, handle: *const Doc
.offset_encoding = server.offset_encoding,
};

var actions = std.ArrayListUnmanaged(types.CodeAction){};
for (diagnostics.items) |diagnostic| {
try builder.generateCodeAction(diagnostic, &actions);
}
try builder.generateCodeActions(diagnostics.items);

var text_edits = std.ArrayListUnmanaged(types.TextEdit){};
for (actions.items) |action| {
for (builder.actions.items) |action| {
std.debug.assert(action.kind != null);
std.debug.assert(action.edit != null);
std.debug.assert(action.edit.?.changes != null);

if (action.kind.? != .@"source.fixAll") continue;
switch (action.kind.?) {
.@"source.organizeImports",
.@"source.fixAll",
=> {},
else => continue,
}

const changes = action.edit.?.changes.?;
if (changes.count() != 1) continue;
Expand Down Expand Up @@ -1450,13 +1452,6 @@ fn inlayHintHandler(server: *Server, request: types.InlayHintParams) Error!?[]ty
fn codeActionHandler(server: *Server, request: types.CodeActionParams) Error!?[]types.CodeAction {
const handle = server.document_store.getHandle(request.textDocument.uri) orelse return null;

var builder = code_actions.Builder{
.arena = server.arena.allocator(),
.analyser = &server.analyser,
.handle = handle,
.offset_encoding = server.offset_encoding,
};

// as of right now, only ast-check errors may get a code action
var diagnostics = std.ArrayListUnmanaged(types.Diagnostic){};
if (server.config.enable_ast_check_diagnostics and handle.tree.errors.len == 0) blk: {
Expand All @@ -1467,12 +1462,16 @@ fn codeActionHandler(server: *Server, request: types.CodeActionParams) Error!?[]
};
}

var actions = std.ArrayListUnmanaged(types.CodeAction){};
for (diagnostics.items) |diagnostic| {
try builder.generateCodeAction(diagnostic, &actions);
}
var builder = code_actions.Builder{
.arena = server.arena.allocator(),
.analyser = &server.analyser,
.handle = handle,
.offset_encoding = server.offset_encoding,
};

try builder.generateCodeActions(diagnostics.items);

return actions.items;
return builder.actions.items;
}

fn foldingRangeHandler(server: *Server, request: types.FoldingRangeParams) Error!?[]types.FoldingRange {
Expand Down
Loading