From 2232f5ebaaf9a567bea83bc0c577d0479c879dbe Mon Sep 17 00:00:00 2001 From: Wesley Wigham Date: Wed, 18 Sep 2019 13:25:01 -0700 Subject: [PATCH] Update comment --- .../twoGenericInterfacesWithDifferentConstraints.errors.txt | 2 +- .../reference/twoGenericInterfacesWithDifferentConstraints.js | 2 +- .../twoGenericInterfacesWithDifferentConstraints.symbols | 2 +- .../twoGenericInterfacesWithDifferentConstraints.types | 2 +- .../twoGenericInterfacesWithDifferentConstraints.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt index 7692d57b78f..edc33d6b1ba 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.errors.txt @@ -75,7 +75,7 @@ tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDi x: T; } - interface C { // error + interface C { // ok y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js index 5b1964b2891..7e62915cb54 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.js @@ -55,7 +55,7 @@ interface C { x: T; } -interface C { // error +interface C { // ok y: T; } diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols index a1ad41441bd..6dd5de33354 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.symbols @@ -137,7 +137,7 @@ interface C { >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 52, 12), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 56, 12)) } -interface C { // error +interface C { // ok >C : Symbol(C, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 50, 1), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 54, 1)) >T : Symbol(T, Decl(twoGenericInterfacesWithDifferentConstraints.ts, 52, 12), Decl(twoGenericInterfacesWithDifferentConstraints.ts, 56, 12)) diff --git a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types index 70a8be8cb3a..87877311b53 100644 --- a/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types +++ b/tests/baselines/reference/twoGenericInterfacesWithDifferentConstraints.types @@ -70,7 +70,7 @@ interface C { >x : T } -interface C { // error +interface C { // ok y: T; >y : T } diff --git a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts index 4c698626eb0..6963277915a 100644 --- a/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts +++ b/tests/cases/conformance/interfaces/declarationMerging/twoGenericInterfacesWithDifferentConstraints.ts @@ -54,7 +54,7 @@ interface C { x: T; } -interface C { // error +interface C { // ok y: T; }