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 @@ -30648,7 +30648,7 @@ namespace ts {

let typeArguments: NodeArray<TypeNode> | undefined;

if (!isDecorator) {
if (!isDecorator && !isSuperCall(node)) {
typeArguments = (node as CallExpression).typeArguments;

// We already perform checking on the type arguments on the class declaration itself.
Expand Down
5 changes: 4 additions & 1 deletion src/compiler/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5285,12 +5285,15 @@ namespace ts {

function parseSuperExpression(): MemberExpression {
const pos = getNodePos();
const expression = parseTokenNode<PrimaryExpression>();
let expression = parseTokenNode<MemberExpression>();
if (token() === SyntaxKind.LessThanToken) {
const startPos = getNodePos();
const typeArguments = tryParse(parseTypeArgumentsInExpression);
if (typeArguments !== undefined) {
parseErrorAt(startPos, getNodePos(), Diagnostics.super_may_not_use_type_arguments);
if (!isTemplateStartOfTaggedTemplate()) {
expression = factory.createExpressionWithTypeArguments(expression, typeArguments);
}
}
}

Expand Down
1 change: 1 addition & 0 deletions tests/baselines/reference/parserSuperExpression2.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ class C {
>M : Symbol(C.M, Decl(parserSuperExpression2.ts, 0, 9))

super<T>(0);
>T : Symbol(T)
}
}
1 change: 1 addition & 0 deletions tests/baselines/reference/superWithTypeArgument.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ class D<T> extends C {
constructor() {
super<T>();
>super : Symbol(C, Decl(superWithTypeArgument.ts, 0, 0))
>T : Symbol(T, Decl(superWithTypeArgument.ts, 4, 8))
}
}
1 change: 1 addition & 0 deletions tests/baselines/reference/superWithTypeArgument2.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class D<T> extends C<T> {

super<T>(x);
>super : Symbol(C, Decl(superWithTypeArgument2.ts, 0, 0))
>T : Symbol(T, Decl(superWithTypeArgument2.ts, 4, 8))
>x : Symbol(x, Decl(superWithTypeArgument2.ts, 5, 16))
}
}
1 change: 1 addition & 0 deletions tests/baselines/reference/superWithTypeArgument3.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class D<T> extends C<T> {
constructor() {
super<T>();
>super : Symbol(C, Decl(superWithTypeArgument3.ts, 0, 0))
>T : Symbol(T, Decl(superWithTypeArgument3.ts, 5, 8))
}
bar() {
>bar : Symbol(D.bar, Decl(superWithTypeArgument3.ts, 8, 5))
Expand Down
11 changes: 10 additions & 1 deletion tests/cases/fourslash/getOutliningSpans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@
//// 2
//// ]|]
////)|];

////
////class C<T>[| {
//// foo: T;
////}|]
////
////class D<T> extends C<T>[| {
//// constructor(x)[| {
//// super<T>(x);
//// }|]
////}|]

verify.outliningSpansInCurrentFile(test.ranges(), "code");