@typescript-deploys/pr-build 5.1.0-pr-53225-3 → 5.1.0-pr-53549-16

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230327`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -43383,6 +43383,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -50583,7 +50585,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -61619,6 +61621,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -61647,6 +61654,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -91324,10 +91335,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/

package/lib/tsserver.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230327`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -48025,6 +48025,8 @@ function createTypeChecker(host) {
   var resolutionTargets = [];
   var resolutionResults = [];
   var resolutionPropertyNames = [];
+  var resolutionStart = 0;
+  var inVarianceComputation = false;
   var suggestionCount = 0;
   var maximumSuggestionCount = 10;
   var mergedSymbols = [];
@@ -55225,7 +55227,7 @@ function createTypeChecker(host) {
     return true;
   }
   function findResolutionCycleStartIndex(target, propertyName) {
-    for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+    for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
       if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
         return -1;
       }
@@ -66261,6 +66263,11 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links.variances) {
       (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+      const oldVarianceComputation = inVarianceComputation;
+      if (!inVarianceComputation) {
+        inVarianceComputation = true;
+        resolutionStart = resolutionTargets.length;
+      }
       links.variances = emptyArray;
       const variances = [];
       for (const tp of typeParameters) {
@@ -66289,6 +66296,10 @@ function createTypeChecker(host) {
         }
         variances.push(variance);
       }
+      if (!oldVarianceComputation) {
+        inVarianceComputation = false;
+        resolutionStart = 0;
+      }
       links.variances = variances;
       (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
     }
@@ -96137,10 +96148,14 @@ function transformESDecorators(context) {
           visitor
         );
         const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-        const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-        addRange(statements, initializerStatements);
-        addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+        if (superStatementIndex >= 0) {
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+        } else {
+          addRange(statements, initializerStatements);
+          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+        }
         body = factory2.createBlock(
           statements,
           /*multiLine*/
@@ -152471,10 +152486,34 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
   switch (parent2.kind) {
     case 199 /* LiteralType */: {
       const grandParent = walkUpParentheses(parent2.parent);
-      if (grandParent.kind === 203 /* ImportType */) {
-        return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+      switch (grandParent.kind) {
+        case 231 /* ExpressionWithTypeArguments */:
+        case 181 /* TypeReference */: {
+          const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
+          if (typeArgument) {
+            return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
+          }
+          return void 0;
+        }
+        case 197 /* IndexedAccessType */:
+          const { indexType, objectType } = grandParent;
+          if (!rangeContainsPosition(indexType, position)) {
+            return void 0;
+          }
+          return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
+        case 203 /* ImportType */:
+          return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+        case 190 /* UnionType */: {
+          if (!isTypeReferenceNode(grandParent.parent)) {
+            return void 0;
+          }
+          const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
+          const types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter((t) => !contains(alreadyUsedTypes, t.value));
+          return { kind: 2 /* Types */, types, isNewIdentifier: false };
+        }
+        default:
+          return void 0;
       }
-      return fromUnionableLiteralType(grandParent);
     }
     case 300 /* PropertyAssignment */:
       if (isObjectLiteralExpression(parent2.parent) && parent2.name === node) {
@@ -152508,38 +152547,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
       const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
       return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
     default:
-      return fromContextualType();
-  }
-  function fromUnionableLiteralType(grandParent) {
-    switch (grandParent.kind) {
-      case 231 /* ExpressionWithTypeArguments */:
-      case 181 /* TypeReference */: {
-        const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
-        if (typeArgument) {
-          return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
-        }
-        return void 0;
-      }
-      case 197 /* IndexedAccessType */:
-        const { indexType, objectType } = grandParent;
-        if (!rangeContainsPosition(indexType, position)) {
-          return void 0;
-        }
-        return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
-      case 190 /* UnionType */: {
-        const result = fromUnionableLiteralType(walkUpParentheses(grandParent.parent));
-        if (!result) {
-          return void 0;
-        }
-        const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
-        if (result.kind === 1 /* Properties */) {
-          return { kind: 1 /* Properties */, symbols: result.symbols.filter((sym) => !contains(alreadyUsedTypes, sym.name)), hasIndexSignature: result.hasIndexSignature };
-        }
-        return { kind: 2 /* Types */, types: result.types.filter((t) => !contains(alreadyUsedTypes, t.value)), isNewIdentifier: false };
-      }
-      default:
-        return void 0;
-    }
+      return fromContextualType() || fromContextualType(0 /* None */);
   }
   function fromContextualType(contextFlags = 4 /* Completions */) {
     const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -161604,9 +161612,9 @@ function extractFunctionInScope(node, scope, { usages: usagesInScope, typeParame
     }
     callArguments.push(factory.createIdentifier(name));
   });
-  const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+  const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
   const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-  const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+  const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
   const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
     decl.name,
     /*typeArguments*/
@@ -162083,12 +162091,12 @@ function getContainingVariableDeclarationIfInList(node, scope) {
     node = node.parent;
   }
 }
-function getFirstDeclaration(type) {
+function getFirstDeclarationBeforePosition(type, position) {
   let firstDeclaration;
   const symbol = type.symbol;
   if (symbol && symbol.declarations) {
     for (const declaration of symbol.declarations) {
-      if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+      if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
         firstDeclaration = declaration;
       }
     }

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230327`;
+      version = `${versionMajorMinor}.0-insiders.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45833,6 +45833,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -53033,7 +53035,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -64069,6 +64071,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64097,6 +64104,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -94138,10 +94149,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -151568,10 +151583,34 @@ ${lanes.join("\n")}
     switch (parent2.kind) {
       case 199 /* LiteralType */: {
         const grandParent = walkUpParentheses(parent2.parent);
-        if (grandParent.kind === 203 /* ImportType */) {
-          return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+        switch (grandParent.kind) {
+          case 231 /* ExpressionWithTypeArguments */:
+          case 181 /* TypeReference */: {
+            const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
+            if (typeArgument) {
+              return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
+            }
+            return void 0;
+          }
+          case 197 /* IndexedAccessType */:
+            const { indexType, objectType } = grandParent;
+            if (!rangeContainsPosition(indexType, position)) {
+              return void 0;
+            }
+            return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
+          case 203 /* ImportType */:
+            return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+          case 190 /* UnionType */: {
+            if (!isTypeReferenceNode(grandParent.parent)) {
+              return void 0;
+            }
+            const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
+            const types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter((t) => !contains(alreadyUsedTypes, t.value));
+            return { kind: 2 /* Types */, types, isNewIdentifier: false };
+          }
+          default:
+            return void 0;
         }
-        return fromUnionableLiteralType(grandParent);
       }
       case 300 /* PropertyAssignment */:
         if (isObjectLiteralExpression(parent2.parent) && parent2.name === node) {
@@ -151605,38 +151644,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
-    }
-    function fromUnionableLiteralType(grandParent) {
-      switch (grandParent.kind) {
-        case 231 /* ExpressionWithTypeArguments */:
-        case 181 /* TypeReference */: {
-          const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
-          if (typeArgument) {
-            return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
-          }
-          return void 0;
-        }
-        case 197 /* IndexedAccessType */:
-          const { indexType, objectType } = grandParent;
-          if (!rangeContainsPosition(indexType, position)) {
-            return void 0;
-          }
-          return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
-        case 190 /* UnionType */: {
-          const result = fromUnionableLiteralType(walkUpParentheses(grandParent.parent));
-          if (!result) {
-            return void 0;
-          }
-          const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
-          if (result.kind === 1 /* Properties */) {
-            return { kind: 1 /* Properties */, symbols: result.symbols.filter((sym) => !contains(alreadyUsedTypes, sym.name)), hasIndexSignature: result.hasIndexSignature };
-          }
-          return { kind: 2 /* Types */, types: result.types.filter((t) => !contains(alreadyUsedTypes, t.value)), isNewIdentifier: false };
-        }
-        default:
-          return void 0;
-      }
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -160874,9 +160882,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       callArguments.push(factory.createIdentifier(name));
     });
-    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
     const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
     const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
       decl.name,
       /*typeArguments*/
@@ -161353,12 +161361,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       node = node.parent;
     }
   }
-  function getFirstDeclaration(type) {
+  function getFirstDeclarationBeforePosition(type, position) {
     let firstDeclaration;
     const symbol = type.symbol;
     if (symbol && symbol.declarations) {
       for (const declaration of symbol.declarations) {
-        if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+        if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
           firstDeclaration = declaration;
         }
       }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230327`;
+      version = `${versionMajorMinor}.0-insiders.20230328`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45833,6 +45833,8 @@ ${lanes.join("\n")}
     var resolutionTargets = [];
     var resolutionResults = [];
     var resolutionPropertyNames = [];
+    var resolutionStart = 0;
+    var inVarianceComputation = false;
     var suggestionCount = 0;
     var maximumSuggestionCount = 10;
     var mergedSymbols = [];
@@ -53033,7 +53035,7 @@ ${lanes.join("\n")}
       return true;
     }
     function findResolutionCycleStartIndex(target, propertyName) {
-      for (let i = resolutionTargets.length - 1; i >= 0; i--) {
+      for (let i = resolutionTargets.length - 1; i >= resolutionStart; i--) {
         if (resolutionTargetHasProperty(resolutionTargets[i], resolutionPropertyNames[i])) {
           return -1;
         }
@@ -64069,6 +64071,11 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links.variances) {
         (_a2 = tracing) == null ? void 0 : _a2.push(tracing.Phase.CheckTypes, "getVariancesWorker", { arity: typeParameters.length, id: getTypeId(getDeclaredTypeOfSymbol(symbol)) });
+        const oldVarianceComputation = inVarianceComputation;
+        if (!inVarianceComputation) {
+          inVarianceComputation = true;
+          resolutionStart = resolutionTargets.length;
+        }
         links.variances = emptyArray;
         const variances = [];
         for (const tp of typeParameters) {
@@ -64097,6 +64104,10 @@ ${lanes.join("\n")}
           }
           variances.push(variance);
         }
+        if (!oldVarianceComputation) {
+          inVarianceComputation = false;
+          resolutionStart = 0;
+        }
         links.variances = variances;
         (_b = tracing) == null ? void 0 : _b.pop({ variances: variances.map(Debug.formatVariance) });
       }
@@ -94138,10 +94149,14 @@ ${lanes.join("\n")}
             visitor
           );
           const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
-          const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : void 0;
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : void 0));
-          addRange(statements, initializerStatements);
-          addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
+          if (superStatementIndex >= 0) {
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, nonPrologueStart, superStatementIndex + 1 - nonPrologueStart));
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement, superStatementIndex + 1));
+          } else {
+            addRange(statements, initializerStatements);
+            addRange(statements, visitNodes2(node.body.statements, visitor, isStatement));
+          }
           body = factory2.createBlock(
             statements,
             /*multiLine*/
@@ -151582,10 +151597,34 @@ ${lanes.join("\n")}
     switch (parent2.kind) {
       case 199 /* LiteralType */: {
         const grandParent = walkUpParentheses(parent2.parent);
-        if (grandParent.kind === 203 /* ImportType */) {
-          return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+        switch (grandParent.kind) {
+          case 231 /* ExpressionWithTypeArguments */:
+          case 181 /* TypeReference */: {
+            const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
+            if (typeArgument) {
+              return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
+            }
+            return void 0;
+          }
+          case 197 /* IndexedAccessType */:
+            const { indexType, objectType } = grandParent;
+            if (!rangeContainsPosition(indexType, position)) {
+              return void 0;
+            }
+            return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
+          case 203 /* ImportType */:
+            return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+          case 190 /* UnionType */: {
+            if (!isTypeReferenceNode(grandParent.parent)) {
+              return void 0;
+            }
+            const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
+            const types = getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(grandParent)).filter((t) => !contains(alreadyUsedTypes, t.value));
+            return { kind: 2 /* Types */, types, isNewIdentifier: false };
+          }
+          default:
+            return void 0;
         }
-        return fromUnionableLiteralType(grandParent);
       }
       case 300 /* PropertyAssignment */:
         if (isObjectLiteralExpression(parent2.parent) && parent2.name === node) {
@@ -151619,38 +151658,7 @@ ${lanes.join("\n")}
         const literals = contextualTypes.types.filter((literal) => !tracker.hasValue(literal.value));
         return { kind: 2 /* Types */, types: literals, isNewIdentifier: false };
       default:
-        return fromContextualType();
-    }
-    function fromUnionableLiteralType(grandParent) {
-      switch (grandParent.kind) {
-        case 231 /* ExpressionWithTypeArguments */:
-        case 181 /* TypeReference */: {
-          const typeArgument = findAncestor(parent2, (n) => n.parent === grandParent);
-          if (typeArgument) {
-            return { kind: 2 /* Types */, types: getStringLiteralTypes(typeChecker.getTypeArgumentConstraint(typeArgument)), isNewIdentifier: false };
-          }
-          return void 0;
-        }
-        case 197 /* IndexedAccessType */:
-          const { indexType, objectType } = grandParent;
-          if (!rangeContainsPosition(indexType, position)) {
-            return void 0;
-          }
-          return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
-        case 190 /* UnionType */: {
-          const result = fromUnionableLiteralType(walkUpParentheses(grandParent.parent));
-          if (!result) {
-            return void 0;
-          }
-          const alreadyUsedTypes = getAlreadyUsedTypesInStringLiteralUnion(grandParent, parent2);
-          if (result.kind === 1 /* Properties */) {
-            return { kind: 1 /* Properties */, symbols: result.symbols.filter((sym) => !contains(alreadyUsedTypes, sym.name)), hasIndexSignature: result.hasIndexSignature };
-          }
-          return { kind: 2 /* Types */, types: result.types.filter((t) => !contains(alreadyUsedTypes, t.value)), isNewIdentifier: false };
-        }
-        default:
-          return void 0;
-      }
+        return fromContextualType() || fromContextualType(0 /* None */);
     }
     function fromContextualType(contextFlags = 4 /* Completions */) {
       const types = getStringLiteralTypes(getContextualTypeFromParent(node, typeChecker, contextFlags));
@@ -160888,9 +160896,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
       callArguments.push(factory.createIdentifier(name));
     });
-    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclaration(type) }));
+    const typeParametersAndDeclarations = arrayFrom(typeParameterUsages.values(), (type) => ({ type, declaration: getFirstDeclarationBeforePosition(type, context.startPosition) }));
     const sortedTypeParametersAndDeclarations = typeParametersAndDeclarations.sort(compareTypesByDeclarationOrder);
-    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : sortedTypeParametersAndDeclarations.map((t) => t.declaration);
+    const typeParameters = sortedTypeParametersAndDeclarations.length === 0 ? void 0 : mapDefined(sortedTypeParametersAndDeclarations, ({ declaration }) => declaration);
     const callTypeArguments = typeParameters !== void 0 ? typeParameters.map((decl) => factory.createTypeReferenceNode(
       decl.name,
       /*typeArguments*/
@@ -161367,12 +161375,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       node = node.parent;
     }
   }
-  function getFirstDeclaration(type) {
+  function getFirstDeclarationBeforePosition(type, position) {
     let firstDeclaration;
     const symbol = type.symbol;
     if (symbol && symbol.declarations) {
       for (const declaration of symbol.declarations) {
-        if (firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) {
+        if ((firstDeclaration === void 0 || declaration.pos < firstDeclaration.pos) && declaration.pos < position) {
           firstDeclaration = declaration;
         }
       }

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230327`;
+var version = `${versionMajorMinor}.0-insiders.20230328`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-53225-3",
+  "version": "5.1.0-pr-53549-16",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "40752246a29a1d9984ce52601e401eb72bbec8bb"
+  "gitHead": "80b6b038e269d5c218bfde672c663dbadc5b1525"
 }