Skip to content

Simplify completion result handling #103

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
merged 1 commit into from
Apr 9, 2021
Merged

Simplify completion result handling #103

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: 3 additions & 2 deletions server/src/RescriptEditorSupport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { fileURLToPath } from "url";
import { RequestMessage } from "vscode-languageserver";
import { CompletionItem } from "vscode-languageserver-protocol";
import * as utils from "./utils";
import * as path from "path";
import { execFileSync } from "child_process";
Expand Down Expand Up @@ -60,11 +61,11 @@ export function runDumpCommand(msg: RequestMessage): dumpCommandResult | null {
}
}

type completionCommandResult = [{ label: string }];
// TODO: the result will never be null soon when the updated binary syncs
export function runCompletionCommand(
msg: RequestMessage,
code: string
): completionCommandResult | null {
): CompletionItem[] | null {
let executable = findExecutable(msg.params.textDocument.uri);
if (executable == null) {
return null;
Expand Down
17 changes: 4 additions & 13 deletions server/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,22 +385,13 @@ function onMessage(msg: m.Message) {
send(emptyDefinitionResponse);
}
} else if (msg.method === p.CompletionRequest.method) {
let emptyCompletionResponse: m.ResponseMessage = {
let code = getOpenedFileContent(msg.params.textDocument.uri);
let completionResponse: m.ResponseMessage = {
jsonrpc: c.jsonrpcVersion,
id: msg.id,
result: null,
result: runCompletionCommand(msg, code),
};
let code = getOpenedFileContent(msg.params.textDocument.uri);
let result = runCompletionCommand(msg, code);
if (result === null) {
send(emptyCompletionResponse);
} else {
let definitionResponse: m.ResponseMessage = {
...emptyCompletionResponse,
result: result,
};
send(definitionResponse);
}
send(completionResponse);
} else if (msg.method === p.DocumentFormattingRequest.method) {
// technically, a formatting failure should reply with the error. Sadly
// the LSP alert box for these error replies sucks (e.g. doesn't actually
Expand Down