Skip to content

Commit

Permalink
introduce dependency mechanism to recovery_codes to prevent erroneous…
Browse files Browse the repository at this point in the history
… suppression
  • Loading branch information
cspotcode committed Mar 5, 2022
1 parent da07227 commit 43b91bf
Showing 1 changed file with 22 additions and 11 deletions.
33 changes: 22 additions & 11 deletions src/repl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -671,17 +671,22 @@ function lineCount(value: string) {
/**
* TS diagnostic codes which are recoverable, meaning that the user likely entered and incomplete line of code
* and should be prompted for the next. For example, starting a multi-line for() loop and not finishing it.
* null value means code is always recoverable. `Set` means code is only recoverable when occurring alongside at least one
* of the other codes.
*/
const RECOVERY_CODES: Set<number> = new Set([
1003, // "Identifier expected."
1005, // "')' expected."
1109, // "Expression expected."
1126, // "Unexpected end of text."
1160, // "Unterminated template literal."
1161, // "Unterminated regular expression literal."
2355, // "A function whose declared type is neither 'void' nor 'any' must return a value."
2391, // "Function implementation is missing or not immediately following the declaration."
7010, // "Function, which lacks return-type annotation, implicitly has an 'any' return type."
const RECOVERY_CODES: Map<number, Set<number> | null> = new Map([
[1003, null], // "Identifier expected."
[1005, null], // "')' expected.", "'}' expected."
[1109, null], // "Expression expected."
[1126, null], // "Unexpected end of text."
[1160, null], // "Unterminated template literal."
[1161, null], // "Unterminated regular expression literal."
[2355, null], // "A function whose declared type is neither 'void' nor 'any' must return a value."
[2391, null], // "Function implementation is missing or not immediately following the declaration."
[
7010, // "Function, which lacks return-type annotation, implicitly has an 'any' return type."
new Set([1005]), // happens when fn signature spread across multiple lines: 'function a(\nb: any\n) {'
],
]);

/**
Expand All @@ -700,7 +705,13 @@ const topLevelAwaitDiagnosticCodes = [
* Check if a function can recover gracefully.
*/
function isRecoverable(error: TSError) {
return error.diagnosticCodes.every((code) => RECOVERY_CODES.has(code));
return error.diagnosticCodes.every((code) => {
const deps = RECOVERY_CODES.get(code);
return (
deps === null ||
(deps && error.diagnosticCodes.some((code) => deps.has(code)))
);
});
}

/**
Expand Down

0 comments on commit 43b91bf

Please sign in to comment.