Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16124,7 +16124,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}

function removeStringLiteralsMatchedByTemplateLiterals(types: Type[]) {
const templates = filter(types, isPatternLiteralType) as TemplateLiteralType[];
const templates = filter(types, t => !!(t.flags & TypeFlags.TemplateLiteral) && isPatternLiteralType(t)) as TemplateLiteralType[];
if (templates.length) {
let i = types.length;
while (i > 0) {
Expand Down
4 changes: 4 additions & 0 deletions tests/baselines/reference/templateLiteralTypes3.errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,8 @@ tests/cases/conformance/types/literal/templateLiteralTypes3.ts(141,9): error TS2
spread(`1.${u}.3`, `1.${u}.4`);
spread(u1, u2);
}

// Repro from #52685

type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;

5 changes: 5 additions & 0 deletions tests/baselines/reference/templateLiteralTypes3.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,10 @@ function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>,
spread(`1.${u}.3`, `1.${u}.4`);
spread(u1, u2);
}

// Repro from #52685

type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;


//// [templateLiteralTypes3.js]
Expand Down Expand Up @@ -356,3 +360,4 @@ type DotString = `${string}.${string}.${string}`;
declare function noSpread<P extends DotString>(args: P[]): P;
declare function spread<P extends DotString>(...args: P[]): P;
declare function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>, u2: Uppercase<`1.${T}.4`>): void;
type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;
6 changes: 6 additions & 0 deletions tests/baselines/reference/templateLiteralTypes3.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -580,3 +580,9 @@ function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>,
>u2 : Symbol(u2, Decl(templateLiteralTypes3.ts, 185, 80))
}

// Repro from #52685

type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;
>Boom : Symbol(Boom, Decl(templateLiteralTypes3.ts, 189, 1))
>Lowercase : Symbol(Lowercase, Decl(lib.es5.d.ts, --, --))

5 changes: 5 additions & 0 deletions tests/baselines/reference/templateLiteralTypes3.types
Original file line number Diff line number Diff line change
Expand Up @@ -594,3 +594,8 @@ function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>,
>u2 : `1.${Uppercase<T>}.4`
}

// Repro from #52685

type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;
>Boom : `a${string}` | Lowercase<string> | "def"

Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,7 @@ function ft1<T extends string>(t: T, u: Uppercase<T>, u1: Uppercase<`1.${T}.3`>,
spread(`1.${u}.3`, `1.${u}.4`);
spread(u1, u2);
}

// Repro from #52685

type Boom = 'abc' | 'def' | `a${string}` | Lowercase<string>;