From c372ac90235fee715a8fb504b944a1426ec9472c Mon Sep 17 00:00:00 2001 From: Orta Therox Date: Fri, 13 Sep 2019 10:51:22 -0400 Subject: [PATCH] Fix master with 3.6 --- source/lib/compiler.ts | 3 ++- source/lib/interfaces.ts | 3 ++- source/test/test.ts | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/lib/compiler.ts b/source/lib/compiler.ts index 04e746a5..d20bc95f 100644 --- a/source/lib/compiler.ts +++ b/source/lib/compiler.ts @@ -22,7 +22,8 @@ const diagnosticCodesToIgnore = new Set([ DiagnosticCode.CannotAssignToReadOnlyProperty, DiagnosticCode.TypeIsNotAssignableToOtherType, DiagnosticCode.GenericTypeRequiresTypeArguments, - DiagnosticCode.ExpectedArgumentsButGotOther + DiagnosticCode.ExpectedArgumentsButGotOther, + DiagnosticCode.NoOverloadMatches ]); /** diff --git a/source/lib/interfaces.ts b/source/lib/interfaces.ts index 686945bc..0dd85430 100644 --- a/source/lib/interfaces.ts +++ b/source/lib/interfaces.ts @@ -26,7 +26,8 @@ export enum DiagnosticCode { PropertyDoesNotExistOnType = 2339, ArgumentTypeIsNotAssignableToParameterType = 2345, CannotAssignToReadOnlyProperty = 2540, - ExpectedArgumentsButGotOther = 2554 + ExpectedArgumentsButGotOther = 2554, + NoOverloadMatches = 2769 } export interface Diagnostic { diff --git a/source/test/test.ts b/source/test/test.ts index f9f164d6..750f6543 100644 --- a/source/test/test.ts +++ b/source/test/test.ts @@ -189,7 +189,7 @@ test('support setting a custom test directory', async t => { test('expectError for functions', async t => { const diagnostics = await m({cwd: path.join(__dirname, 'fixtures/expect-error/functions')}); - t.true(diagnostics.length === 1); + t.true(diagnostics.length === 1, `Diagnostics: ${diagnostics.map(d => d.message)}`); t.true(diagnostics[0].column === 0); t.true(diagnostics[0].line === 5);