Skip to content

Don't try to read if file doesn't exist #143

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
fdncred merged 2 commits into from
Jul 25, 2023
Merged

Don't try to read if file doesn't exist #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6915ebb
Don't try to read if file doesn't exist (#134)
gaetschwartz Jul 10, 2023
0e1752f
Merge branch 'main' into proper-error-handling-goto-def-no-file
fdncred Jul 13, 2023
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
16 changes: 14 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 27 additions & 24 deletions server/src/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ function createLabel(name: string): string {
}
async function durationLogWrapper<T>(
name: string,
fn: () => Promise<T>
fn: (label: string) => Promise<T>
): Promise<T> {
console.log("Triggered " + name + ": ...");
const label = createLabel(name);
console.time(label);
const result = await fn();
const result = await fn(label);

// This purposefully has the same prefix length as the "Triggered " log above,
// also does not add a newline at the end.
Expand Down Expand Up @@ -244,7 +244,7 @@ async function validateTextDocument(
): Promise<void> {
return await durationLogWrapper(
`validateTextDocument ${textDocument.uri}`,
async () => {
async (label) => {
if (!hasDiagnosticRelatedInformationCapability) {
console.error(
"Trying to validate a document with no diagnostic capability"
Expand All @@ -263,7 +263,8 @@ async function validateTextDocument(
text,
"--ide-check",
settings,
textDocument.uri
textDocument.uri,
{ label: label }
);

textDocument.nuInlayHints = [];
Expand Down Expand Up @@ -403,7 +404,7 @@ async function runCompiler(
flags: string,
settings: NushellIDESettings,
uri: string,
options: { allowErrors?: boolean } = {}
options: { allowErrors?: boolean, label: string } = { label: "runCompiler" },
): Promise<string> {
const allowErrors =
options.allowErrors === undefined ? true : options.allowErrors;
Expand All @@ -412,7 +413,7 @@ async function runCompiler(
fs.writeFileSync(tmpFile.name, text);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (e: any) {
// connection.console.log(e);
connection.console.error(`[${options.label}] error writing to tmp file: ${e}`);
}

let stdout = "";
Expand All @@ -430,8 +431,7 @@ async function runCompiler(
}

connection.console.log(
"running: " +
`${settings.nushellExecutablePath} ${flags} ${script_path_flag} ${tmpFile.name}`
`[${options.label}] running: ${settings.nushellExecutablePath} ${flags} ${script_path_flag} ${tmpFile.name}`
);

const output = await exec(
Expand All @@ -441,17 +441,12 @@ async function runCompiler(
}
);
stdout = output.stdout;
console.log("stdout: " + stdout);
console.log(`[${options.label}] stdout: ${stdout}`);
// eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (e: any) {
stdout = e.stdout;
connection.console.log(`[${options.label}] compile failed: ` + e);
if (!allowErrors) {
if (e.signal != null) {
connection.console.log("compile failed: ");
connection.console.log(e);
} else {
connection.console.log("Error:" + e);
}
throw e;
}
}
Expand Down Expand Up @@ -568,21 +563,21 @@ connection.onCompletion(
);

connection.onDefinition(async (request) => {
return await durationLogWrapper(`onDefinition`, async () => {
return await durationLogWrapper(`onDefinition`, async (label) => {
const document = documents.get(request.textDocument.uri);
if (!document) return;
const settings = await getDocumentSettings(request.textDocument.uri);

const text = document.getText();

// connection.console.log("request: ");
// connection.console.log(request.textDocument.uri);
// connection.console.log(`[${label}] request: ${request.textDocument.uri}`);
// connection.console.log("index: " + convertPosition(request.position, text));
const stdout = await runCompiler(
text,
"--ide-goto-def " + convertPosition(request.position, text),
settings,
request.textDocument.uri
request.textDocument.uri,
{ label: label }
);
return goToDefinition(document, stdout);
});
Expand All @@ -605,11 +600,19 @@ async function goToDefinition(
// connection.console.log(obj);
if (obj.file === "" || obj.file === "__prelude__") return;

const lineBreaks = findLineBreaks(
obj.file
? (await fs.promises.readFile(obj.file)).toString()
: document.getText() ?? ""
);
let documentText: string;
if (obj.file) {
if (fs.existsSync(obj.file)) {
documentText = await fs.promises.readFile(obj.file).then((b) => b.toString());
} else {
connection.console.log(`File ${obj.file} does not exist`);
return;
}
} else {
documentText = document.getText();
}

const lineBreaks: number[] = findLineBreaks(documentText);

let uri = "";
if (obj.file == tmpFile.name) {
Expand Down