typescript 5.1.1-rc → 5.1.5

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = "5.1.1-rc";
+var version = "5.1.5";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7704,6 +7704,7 @@ var Diagnostics = {
   Convert_typedef_to_TypeScript_type: diag(95176, 3 /* Message */, "Convert_typedef_to_TypeScript_type_95176", "Convert typedef to TypeScript type."),
   Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
   Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
+  Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -53984,7 +53985,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -56183,31 +56184,28 @@ function createTypeChecker(host) {
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
-    let first2;
+    let last2;
     const types = [];
     for (const sig of signatures) {
       const pred = getTypePredicateOfSignature(sig);
-      if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-        if (kind !== 2097152 /* Intersection */) {
-          continue;
-        } else {
-          return;
-        }
-      }
-      if (first2) {
-        if (!typePredicateKindsMatch(first2, pred)) {
+      if (pred) {
+        if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
           return void 0;
         }
+        last2 = pred;
+        types.push(pred.type);
       } else {
-        first2 = pred;
+        const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+        if (returnType !== falseType && returnType !== regularFalseType) {
+          return void 0;
+        }
       }
-      types.push(pred.type);
     }
-    if (!first2) {
+    if (!last2) {
       return void 0;
     }
     const compositeType = getUnionOrIntersectionType(types, kind);
-    return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+    return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
   }
   function typePredicateKindsMatch(a, b) {
     return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -58057,7 +58055,10 @@ function createTypeChecker(host) {
         const newMapper = createTypeMapper(typeParameters, typeArguments);
         result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
         if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-          result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+          const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+          if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+          }
         }
         target.instantiations.set(id, result);
       }
@@ -58088,18 +58089,19 @@ function createTypeChecker(host) {
         case 185 /* TypeQuery */:
           const entityName = node2.exprName;
           const firstIdentifier = getFirstIdentifier(entityName);
-          const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-          const tpDeclaration = tp.symbol.declarations[0];
-          let tpScope;
-          if (tpDeclaration.kind === 167 /* TypeParameter */) {
-            tpScope = tpDeclaration.parent;
-          } else if (tp.isThisType) {
-            tpScope = tpDeclaration;
-          } else {
-            return true;
-          }
-          if (firstIdentifierSymbol.declarations) {
-            return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+          if (!isThisIdentifier(firstIdentifier)) {
+            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+            const tpDeclaration = tp.symbol.declarations[0];
+            const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+              // Type parameter is a regular type parameter, e.g. foo<T>
+              tp.isThisType ? tpDeclaration : (
+                // Type parameter is the this type, and its declaration is the class declaration.
+                void 0
+              )
+            );
+            if (firstIdentifierSymbol.declarations && tpScope) {
+              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            }
           }
           return true;
         case 173 /* MethodDeclaration */:
@@ -60582,7 +60584,6 @@ function createTypeChecker(host) {
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
           if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-            instantiateType(source2.objectType, reportUnreliableMapper);
             result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
@@ -81638,7 +81639,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = resolveSymbol(getSymbol(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -95307,7 +95308,7 @@ function transformJsx(context) {
           continue;
         }
         finishObjectLiteralIfNeeded();
-        expressions.push(attr.expression);
+        expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
         continue;
       }
       properties.push(transformJsxAttributeToObjectLiteralElement(attr));

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = "5.1.1-rc";
+var version = "5.1.5";
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -11212,6 +11212,7 @@ var Diagnostics = {
   Convert_typedef_to_TypeScript_type: diag(95176, 3 /* Message */, "Convert_typedef_to_TypeScript_type_95176", "Convert typedef to TypeScript type."),
   Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
   Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
+  Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -58635,7 +58636,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -60834,31 +60835,28 @@ function createTypeChecker(host) {
     return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
   }
   function getUnionOrIntersectionTypePredicate(signatures, kind) {
-    let first2;
+    let last2;
     const types = [];
     for (const sig of signatures) {
       const pred = getTypePredicateOfSignature(sig);
-      if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-        if (kind !== 2097152 /* Intersection */) {
-          continue;
-        } else {
-          return;
-        }
-      }
-      if (first2) {
-        if (!typePredicateKindsMatch(first2, pred)) {
+      if (pred) {
+        if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
           return void 0;
         }
+        last2 = pred;
+        types.push(pred.type);
       } else {
-        first2 = pred;
+        const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+        if (returnType !== falseType && returnType !== regularFalseType) {
+          return void 0;
+        }
       }
-      types.push(pred.type);
     }
-    if (!first2) {
+    if (!last2) {
       return void 0;
     }
     const compositeType = getUnionOrIntersectionType(types, kind);
-    return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+    return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
   }
   function typePredicateKindsMatch(a, b) {
     return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -62708,7 +62706,10 @@ function createTypeChecker(host) {
         const newMapper = createTypeMapper(typeParameters, typeArguments);
         result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
         if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-          result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+          const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+          if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+          }
         }
         target.instantiations.set(id, result);
       }
@@ -62739,18 +62740,19 @@ function createTypeChecker(host) {
         case 185 /* TypeQuery */:
           const entityName = node2.exprName;
           const firstIdentifier = getFirstIdentifier(entityName);
-          const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-          const tpDeclaration = tp.symbol.declarations[0];
-          let tpScope;
-          if (tpDeclaration.kind === 167 /* TypeParameter */) {
-            tpScope = tpDeclaration.parent;
-          } else if (tp.isThisType) {
-            tpScope = tpDeclaration;
-          } else {
-            return true;
-          }
-          if (firstIdentifierSymbol.declarations) {
-            return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+          if (!isThisIdentifier(firstIdentifier)) {
+            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+            const tpDeclaration = tp.symbol.declarations[0];
+            const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+              // Type parameter is a regular type parameter, e.g. foo<T>
+              tp.isThisType ? tpDeclaration : (
+                // Type parameter is the this type, and its declaration is the class declaration.
+                void 0
+              )
+            );
+            if (firstIdentifierSymbol.declarations && tpScope) {
+              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            }
           }
           return true;
         case 173 /* MethodDeclaration */:
@@ -65233,7 +65235,6 @@ function createTypeChecker(host) {
       } else if (targetFlags & 8388608 /* IndexedAccess */) {
         if (sourceFlags & 8388608 /* IndexedAccess */) {
           if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-            instantiateType(source2.objectType, reportUnreliableMapper);
             result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
           }
           if (result2) {
@@ -86289,7 +86290,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol2(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                 if (!symbol) {
                   error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                 } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -100129,7 +100130,7 @@ function transformJsx(context) {
           continue;
         }
         finishObjectLiteralIfNeeded();
-        expressions.push(attr.expression);
+        expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
         continue;
       }
       properties.push(transformJsxAttributeToObjectLiteralElement(attr));
@@ -136456,15 +136457,18 @@ registerRefactor(refactorNameForMoveToFile, {
     Debug.assert(actionName2 === refactorNameForMoveToFile, "Wrong refactor invoked");
     const statements = Debug.checkDefined(getStatementsToMove(context));
     Debug.assert(interactiveRefactorArguments, "No interactive refactor arguments available");
-    const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
-    return { edits, renameFilename: void 0, renameLocation: void 0 };
+    const targetFile = interactiveRefactorArguments.targetFile;
+    if (hasJSFileExtension(targetFile) || hasTSFileExtension(targetFile)) {
+      const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
+      return { edits, renameFilename: void 0, renameLocation: void 0 };
+    }
+    return { edits: [], renameFilename: void 0, renameLocation: void 0, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid) };
   }
 });
 function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-  var _a;
   const checker = program.getTypeChecker();
   const usage = getUsageInfo(oldFile, toMove.all, checker);
-  if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+  if (!host.fileExists(targetFile)) {
     changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
     addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
   } else {
@@ -136502,6 +136506,13 @@ function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, chang
   if (typeof targetFile !== "string") {
     if (targetFile.statements.length > 0) {
       changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+    } else {
+      changes.insertNodesAtEndOfFile(
+        targetFile,
+        body,
+        /*blankLineBetween*/
+        false
+      );
     }
     if (imports.length > 0) {
       insertImports(
@@ -141839,7 +141850,11 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       onUnRecoverableConfigFileDiagnostic: noop
     };
     const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+    let releasedScriptKinds = /* @__PURE__ */ new Set();
     if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+      compilerHost = void 0;
+      parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       return;
     }
     const options = {
@@ -141852,6 +141867,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     program = createProgram(options);
     compilerHost = void 0;
     parsedCommandLines = void 0;
+    releasedScriptKinds = void 0;
     sourceMapper.clearCache();
     program.getTypeChecker();
     return;
@@ -141906,10 +141922,11 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       if (!shouldCreateNewSourceFile) {
         const oldSourceFile = program && program.getSourceFileByPath(path);
         if (oldSourceFile) {
-          if (scriptKind === oldSourceFile.scriptKind) {
+          if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
             return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
           } else {
             documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+            releasedScriptKinds.add(oldSourceFile.resolvedPath);
           }
         }
       }
@@ -156296,7 +156313,7 @@ function getSourceFromOrigin(origin) {
 }
 function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
   const start2 = timestamp();
-  const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken);
+  const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location);
   const useSemicolons = probablyUsesSemicolons(sourceFile);
   const typeChecker = program.getTypeChecker();
   const uniques = /* @__PURE__ */ new Map();
@@ -158475,11 +158492,12 @@ function isModuleSpecifierMissingOrEmpty(specifier) {
     return true;
   return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text);
 }
-function getVariableOrParameterDeclaration(contextToken) {
+function getVariableOrParameterDeclaration(contextToken, location) {
   if (!contextToken)
     return;
-  const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
-  return declaration;
+  const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
+  const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
+  return possiblyParameterDeclaration || possiblyVariableDeclaration;
 }
 function isArrowFunctionBody(node) {
   return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/;
@@ -158721,7 +158739,7 @@ function getStringLiteralCompletionEntries(sourceFile, node, position, typeCheck
     case 290 /* JsxAttribute */:
       if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
         const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-        return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+        return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */);
       }
     case 271 /* ImportDeclaration */:
     case 277 /* ExportDeclaration */:
@@ -165853,6 +165871,17 @@ var ChangeTracker = class {
       this.insertNodeAt(sourceFile, pos, insert, options);
     }
   }
+  insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+    this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+  }
+  insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+    const pos = sourceFile.end + 1;
+    const options = {
+      prefix: this.newLineCharacter,
+      suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+    };
+    this.insertNodesAt(sourceFile, pos, insert, options);
+  }
   insertStatementsInNewFile(fileName, statements, oldFile) {
     if (!this.newFileChanges) {
       this.newFileChanges = createMultiMap();
@@ -181964,7 +181993,8 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
       return {
         renameLocation: mappedRenameLocation,
         renameFilename,
-        edits: this.mapTextChangesToCodeEdits(edits)
+        edits: this.mapTextChangesToCodeEdits(edits),
+        notApplicableReason: result.notApplicableReason
       };
     }
     return result;

package/lib/tsserverlibrary.d.ts

@@ -619,6 +619,7 @@ declare namespace ts {
                  */
                 renameLocation?: Location;
                 renameFilename?: string;
+                notApplicableReason?: string;
             }
             /**
              * Organize imports by:
@@ -5445,7 +5446,6 @@ declare namespace ts {
     type JsxAttributeValue = StringLiteral | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
     interface JsxSpreadAttribute extends ObjectLiteralElement {
         readonly kind: SyntaxKind.JsxSpreadAttribute;
-        readonly name: PropertyName;
         readonly parent: JsxAttributes;
         readonly expression: Expression;
     }
@@ -10190,7 +10190,7 @@ declare namespace ts {
          * arguments for any interactive action before offering it.
          */
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
-        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, includeInteractiveActions?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, interactiveRefactorArguments?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
         getMoveToRefactoringFileSuggestions(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): {
             newFileName: string;
             files: string[];
@@ -10480,6 +10480,7 @@ declare namespace ts {
         renameFilename?: string;
         renameLocation?: number;
         commands?: CodeActionCommand[];
+        notApplicableReason?: string;
     }
     type RefactorTriggerReason = "implicit" | "invoked";
     interface TextInsertion {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = "5.1.1-rc";
+      version = "5.1.5";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9018,6 +9018,7 @@ ${lanes.join("\n")}
         Convert_typedef_to_TypeScript_type: diag(95176, 3 /* Message */, "Convert_typedef_to_TypeScript_type_95176", "Convert typedef to TypeScript type."),
         Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
         Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
+        Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -56426,7 +56427,7 @@ ${lanes.join("\n")}
         } else if (type !== firstType) {
           checkFlags |= 64 /* HasNonUniformType */;
         }
-        if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+        if (isLiteralType(type) || isPatternLiteralType(type)) {
           checkFlags |= 128 /* HasLiteralType */;
         }
         if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -58625,31 +58626,28 @@ ${lanes.join("\n")}
       return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
     }
     function getUnionOrIntersectionTypePredicate(signatures, kind) {
-      let first2;
+      let last2;
       const types = [];
       for (const sig of signatures) {
         const pred = getTypePredicateOfSignature(sig);
-        if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-          if (kind !== 2097152 /* Intersection */) {
-            continue;
-          } else {
-            return;
-          }
-        }
-        if (first2) {
-          if (!typePredicateKindsMatch(first2, pred)) {
+        if (pred) {
+          if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
             return void 0;
           }
+          last2 = pred;
+          types.push(pred.type);
         } else {
-          first2 = pred;
+          const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+          if (returnType !== falseType && returnType !== regularFalseType) {
+            return void 0;
+          }
         }
-        types.push(pred.type);
       }
-      if (!first2) {
+      if (!last2) {
         return void 0;
       }
       const compositeType = getUnionOrIntersectionType(types, kind);
-      return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+      return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
     }
     function typePredicateKindsMatch(a, b) {
       return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -60499,7 +60497,10 @@ ${lanes.join("\n")}
           const newMapper = createTypeMapper(typeParameters, typeArguments);
           result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
           if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+            const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+            if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+              result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+            }
           }
           target.instantiations.set(id, result);
         }
@@ -60530,18 +60531,19 @@ ${lanes.join("\n")}
           case 185 /* TypeQuery */:
             const entityName = node2.exprName;
             const firstIdentifier = getFirstIdentifier(entityName);
-            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-            const tpDeclaration = tp.symbol.declarations[0];
-            let tpScope;
-            if (tpDeclaration.kind === 167 /* TypeParameter */) {
-              tpScope = tpDeclaration.parent;
-            } else if (tp.isThisType) {
-              tpScope = tpDeclaration;
-            } else {
-              return true;
-            }
-            if (firstIdentifierSymbol.declarations) {
-              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            if (!isThisIdentifier(firstIdentifier)) {
+              const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+              const tpDeclaration = tp.symbol.declarations[0];
+              const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+                // Type parameter is a regular type parameter, e.g. foo<T>
+                tp.isThisType ? tpDeclaration : (
+                  // Type parameter is the this type, and its declaration is the class declaration.
+                  void 0
+                )
+              );
+              if (firstIdentifierSymbol.declarations && tpScope) {
+                return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+              }
             }
             return true;
           case 173 /* MethodDeclaration */:
@@ -63024,7 +63026,6 @@ ${lanes.join("\n")}
         } else if (targetFlags & 8388608 /* IndexedAccess */) {
           if (sourceFlags & 8388608 /* IndexedAccess */) {
             if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-              instantiateType(source2.objectType, reportUnreliableMapper);
               result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
             }
             if (result2) {
@@ -84080,7 +84081,7 @@ ${lanes.join("\n")}
                   if (requestedExternalEmitHelperNames.has(name))
                     continue;
                   requestedExternalEmitHelperNames.add(name);
-                  const symbol = getSymbol2(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                  const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                   if (!symbol) {
                     error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                   } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -98155,7 +98156,7 @@ ${lanes.join("\n")}
             continue;
           }
           finishObjectLiteralIfNeeded();
-          expressions.push(attr.expression);
+          expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
           continue;
         }
         properties.push(transformJsxAttributeToObjectLiteralElement(attr));
@@ -134844,10 +134845,9 @@ ${lanes.join("\n")}
 
   // src/services/refactors/moveToFile.ts
   function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-    var _a;
     const checker = program.getTypeChecker();
     const usage = getUsageInfo(oldFile, toMove.all, checker);
-    if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+    if (!host.fileExists(targetFile)) {
       changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
       addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
     } else {
@@ -134885,6 +134885,13 @@ ${lanes.join("\n")}
     if (typeof targetFile !== "string") {
       if (targetFile.statements.length > 0) {
         changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+      } else {
+        changes.insertNodesAtEndOfFile(
+          targetFile,
+          body,
+          /*blankLineBetween*/
+          false
+        );
       }
       if (imports.length > 0) {
         insertImports(
@@ -135703,8 +135710,12 @@ ${lanes.join("\n")}
           Debug.assert(actionName2 === refactorNameForMoveToFile, "Wrong refactor invoked");
           const statements = Debug.checkDefined(getStatementsToMove(context));
           Debug.assert(interactiveRefactorArguments, "No interactive refactor arguments available");
-          const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
-          return { edits, renameFilename: void 0, renameLocation: void 0 };
+          const targetFile = interactiveRefactorArguments.targetFile;
+          if (hasJSFileExtension(targetFile) || hasTSFileExtension(targetFile)) {
+            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
+            return { edits, renameFilename: void 0, renameLocation: void 0 };
+          }
+          return { edits: [], renameFilename: void 0, renameLocation: void 0, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid) };
         }
       });
     }
@@ -139783,7 +139794,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         onUnRecoverableConfigFileDiagnostic: noop
       };
       const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+      let releasedScriptKinds = /* @__PURE__ */ new Set();
       if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+        compilerHost = void 0;
+        parsedCommandLines = void 0;
+        releasedScriptKinds = void 0;
         return;
       }
       const options = {
@@ -139796,6 +139811,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       program = createProgram(options);
       compilerHost = void 0;
       parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       sourceMapper.clearCache();
       program.getTypeChecker();
       return;
@@ -139850,10 +139866,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!shouldCreateNewSourceFile) {
           const oldSourceFile = program && program.getSourceFileByPath(path);
           if (oldSourceFile) {
-            if (scriptKind === oldSourceFile.scriptKind) {
+            if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
               return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
             } else {
               documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+              releasedScriptKinds.add(oldSourceFile.resolvedPath);
             }
           }
         }
@@ -155528,7 +155545,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     const start = timestamp();
-    const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken);
+    const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location);
     const useSemicolons = probablyUsesSemicolons(sourceFile);
     const typeChecker = program.getTypeChecker();
     const uniques = /* @__PURE__ */ new Map();
@@ -157685,11 +157702,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return true;
     return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text);
   }
-  function getVariableOrParameterDeclaration(contextToken) {
+  function getVariableOrParameterDeclaration(contextToken, location) {
     if (!contextToken)
       return;
-    const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
-    return declaration;
+    const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
+    const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
+    return possiblyParameterDeclaration || possiblyVariableDeclaration;
   }
   function isArrowFunctionBody(node) {
     return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/;
@@ -157996,7 +158014,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 290 /* JsxAttribute */:
         if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
           const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */);
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -165722,6 +165740,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             this.insertNodeAt(sourceFile, pos, insert, options);
           }
         }
+        insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+          this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+        }
+        insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+          const pos = sourceFile.end + 1;
+          const options = {
+            prefix: this.newLineCharacter,
+            suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+          };
+          this.insertNodesAt(sourceFile, pos, insert, options);
+        }
         insertStatementsInNewFile(fileName, statements, oldFile) {
           if (!this.newFileChanges) {
             this.newFileChanges = createMultiMap();
@@ -179401,7 +179430,8 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
             return {
               renameLocation: mappedRenameLocation,
               renameFilename,
-              edits: this.mapTextChangesToCodeEdits(edits)
+              edits: this.mapTextChangesToCodeEdits(edits),
+              notApplicableReason: result.notApplicableReason
             };
           }
           return result;

package/lib/typescript.d.ts

@@ -1398,7 +1398,6 @@ declare namespace ts {
     type JsxAttributeValue = StringLiteral | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
     interface JsxSpreadAttribute extends ObjectLiteralElement {
         readonly kind: SyntaxKind.JsxSpreadAttribute;
-        readonly name: PropertyName;
         readonly parent: JsxAttributes;
         readonly expression: Expression;
     }
@@ -6227,7 +6226,7 @@ declare namespace ts {
          * arguments for any interactive action before offering it.
          */
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string, includeInteractiveActions?: boolean): ApplicableRefactorInfo[];
-        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, includeInteractiveActions?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
+        getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined, interactiveRefactorArguments?: InteractiveRefactorArguments): RefactorEditInfo | undefined;
         getMoveToRefactoringFileSuggestions(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): {
             newFileName: string;
             files: string[];
@@ -6517,6 +6516,7 @@ declare namespace ts {
         renameFilename?: string;
         renameLocation?: number;
         commands?: CodeActionCommand[];
+        notApplicableReason?: string;
     }
     type RefactorTriggerReason = "implicit" | "invoked";
     interface TextInsertion {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = "5.1.1-rc";
+      version = "5.1.5";
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -9018,6 +9018,7 @@ ${lanes.join("\n")}
         Convert_typedef_to_TypeScript_type: diag(95176, 3 /* Message */, "Convert_typedef_to_TypeScript_type_95176", "Convert typedef to TypeScript type."),
         Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
         Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
+        Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
         No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
         Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
         JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),
@@ -56426,7 +56427,7 @@ ${lanes.join("\n")}
         } else if (type !== firstType) {
           checkFlags |= 64 /* HasNonUniformType */;
         }
-        if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+        if (isLiteralType(type) || isPatternLiteralType(type)) {
           checkFlags |= 128 /* HasLiteralType */;
         }
         if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -58625,31 +58626,28 @@ ${lanes.join("\n")}
       return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
     }
     function getUnionOrIntersectionTypePredicate(signatures, kind) {
-      let first2;
+      let last2;
       const types = [];
       for (const sig of signatures) {
         const pred = getTypePredicateOfSignature(sig);
-        if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-          if (kind !== 2097152 /* Intersection */) {
-            continue;
-          } else {
-            return;
-          }
-        }
-        if (first2) {
-          if (!typePredicateKindsMatch(first2, pred)) {
+        if (pred) {
+          if (pred.kind !== 0 /* This */ && pred.kind !== 1 /* Identifier */ || last2 && !typePredicateKindsMatch(last2, pred)) {
             return void 0;
           }
+          last2 = pred;
+          types.push(pred.type);
         } else {
-          first2 = pred;
+          const returnType = kind !== 2097152 /* Intersection */ ? getReturnTypeOfSignature(sig) : void 0;
+          if (returnType !== falseType && returnType !== regularFalseType) {
+            return void 0;
+          }
         }
-        types.push(pred.type);
       }
-      if (!first2) {
+      if (!last2) {
         return void 0;
       }
       const compositeType = getUnionOrIntersectionType(types, kind);
-      return createTypePredicate(first2.kind, first2.parameterName, first2.parameterIndex, compositeType);
+      return createTypePredicate(last2.kind, last2.parameterName, last2.parameterIndex, compositeType);
     }
     function typePredicateKindsMatch(a, b) {
       return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -60499,7 +60497,10 @@ ${lanes.join("\n")}
           const newMapper = createTypeMapper(typeParameters, typeArguments);
           result = target.objectFlags & 4 /* Reference */ ? createDeferredTypeReference(type.target, type.node, newMapper, newAliasSymbol, newAliasTypeArguments) : target.objectFlags & 32 /* Mapped */ ? instantiateMappedType(target, newMapper, newAliasSymbol, newAliasTypeArguments) : instantiateAnonymousType(target, newMapper, newAliasSymbol, newAliasTypeArguments);
           if (result.flags & 138117121 /* ObjectFlagsType */ && !(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
-            result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (some(typeArguments, couldContainTypeVariables) ? 1048576 /* CouldContainTypeVariables */ : 0);
+            const resultCouldContainTypeVariables = some(typeArguments, couldContainTypeVariables);
+            if (!(result.objectFlags & 524288 /* CouldContainTypeVariablesComputed */)) {
+              result.objectFlags |= 524288 /* CouldContainTypeVariablesComputed */ | (resultCouldContainTypeVariables ? 1048576 /* CouldContainTypeVariables */ : 0);
+            }
           }
           target.instantiations.set(id, result);
         }
@@ -60530,18 +60531,19 @@ ${lanes.join("\n")}
           case 185 /* TypeQuery */:
             const entityName = node2.exprName;
             const firstIdentifier = getFirstIdentifier(entityName);
-            const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
-            const tpDeclaration = tp.symbol.declarations[0];
-            let tpScope;
-            if (tpDeclaration.kind === 167 /* TypeParameter */) {
-              tpScope = tpDeclaration.parent;
-            } else if (tp.isThisType) {
-              tpScope = tpDeclaration;
-            } else {
-              return true;
-            }
-            if (firstIdentifierSymbol.declarations) {
-              return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+            if (!isThisIdentifier(firstIdentifier)) {
+              const firstIdentifierSymbol = getResolvedSymbol(firstIdentifier);
+              const tpDeclaration = tp.symbol.declarations[0];
+              const tpScope = tpDeclaration.kind === 167 /* TypeParameter */ ? tpDeclaration.parent : (
+                // Type parameter is a regular type parameter, e.g. foo<T>
+                tp.isThisType ? tpDeclaration : (
+                  // Type parameter is the this type, and its declaration is the class declaration.
+                  void 0
+                )
+              );
+              if (firstIdentifierSymbol.declarations && tpScope) {
+                return some(firstIdentifierSymbol.declarations, (idDecl) => isNodeDescendantOf(idDecl, tpScope)) || some(node2.typeArguments, containsReference);
+              }
             }
             return true;
           case 173 /* MethodDeclaration */:
@@ -63024,7 +63026,6 @@ ${lanes.join("\n")}
         } else if (targetFlags & 8388608 /* IndexedAccess */) {
           if (sourceFlags & 8388608 /* IndexedAccess */) {
             if (result2 = isRelatedTo(source2.objectType, target2.objectType, 3 /* Both */, reportErrors2)) {
-              instantiateType(source2.objectType, reportUnreliableMapper);
               result2 &= isRelatedTo(source2.indexType, target2.indexType, 3 /* Both */, reportErrors2);
             }
             if (result2) {
@@ -84080,7 +84081,7 @@ ${lanes.join("\n")}
                   if (requestedExternalEmitHelperNames.has(name))
                     continue;
                   requestedExternalEmitHelperNames.add(name);
-                  const symbol = getSymbol2(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                  const symbol = resolveSymbol(getSymbol2(getExportsOfModule(helpersModule), escapeLeadingUnderscores(name), 111551 /* Value */));
                   if (!symbol) {
                     error(location, Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, externalHelpersModuleNameText, name);
                   } else if (helper & 524288 /* ClassPrivateFieldGet */) {
@@ -98155,7 +98156,7 @@ ${lanes.join("\n")}
             continue;
           }
           finishObjectLiteralIfNeeded();
-          expressions.push(attr.expression);
+          expressions.push(Debug.checkDefined(visitNode(attr.expression, visitor, isExpression)));
           continue;
         }
         properties.push(transformJsxAttributeToObjectLiteralElement(attr));
@@ -134859,10 +134860,9 @@ ${lanes.join("\n")}
 
   // src/services/refactors/moveToFile.ts
   function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
-    var _a;
     const checker = program.getTypeChecker();
     const usage = getUsageInfo(oldFile, toMove.all, checker);
-    if (!host.fileExists(targetFile) || host.fileExists(targetFile) && ((_a = program.getSourceFile(targetFile)) == null ? void 0 : _a.statements.length) === 0) {
+    if (!host.fileExists(targetFile)) {
       changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
       addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
     } else {
@@ -134900,6 +134900,13 @@ ${lanes.join("\n")}
     if (typeof targetFile !== "string") {
       if (targetFile.statements.length > 0) {
         changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+      } else {
+        changes.insertNodesAtEndOfFile(
+          targetFile,
+          body,
+          /*blankLineBetween*/
+          false
+        );
       }
       if (imports.length > 0) {
         insertImports(
@@ -135718,8 +135725,12 @@ ${lanes.join("\n")}
           Debug.assert(actionName2 === refactorNameForMoveToFile, "Wrong refactor invoked");
           const statements = Debug.checkDefined(getStatementsToMove(context));
           Debug.assert(interactiveRefactorArguments, "No interactive refactor arguments available");
-          const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
-          return { edits, renameFilename: void 0, renameLocation: void 0 };
+          const targetFile = interactiveRefactorArguments.targetFile;
+          if (hasJSFileExtension(targetFile) || hasTSFileExtension(targetFile)) {
+            const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
+            return { edits, renameFilename: void 0, renameLocation: void 0 };
+          }
+          return { edits: [], renameFilename: void 0, renameLocation: void 0, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid) };
         }
       });
     }
@@ -139798,7 +139809,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         onUnRecoverableConfigFileDiagnostic: noop
       };
       const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
+      let releasedScriptKinds = /* @__PURE__ */ new Set();
       if (isProgramUptoDate(program, rootFileNames, newSettings, (_path, fileName) => host.getScriptVersion(fileName), (fileName) => compilerHost.fileExists(fileName), hasInvalidatedResolutions, hasInvalidatedLibResolutions, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+        compilerHost = void 0;
+        parsedCommandLines = void 0;
+        releasedScriptKinds = void 0;
         return;
       }
       const options = {
@@ -139811,6 +139826,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       program = createProgram(options);
       compilerHost = void 0;
       parsedCommandLines = void 0;
+      releasedScriptKinds = void 0;
       sourceMapper.clearCache();
       program.getTypeChecker();
       return;
@@ -139865,10 +139881,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (!shouldCreateNewSourceFile) {
           const oldSourceFile = program && program.getSourceFileByPath(path);
           if (oldSourceFile) {
-            if (scriptKind === oldSourceFile.scriptKind) {
+            if (scriptKind === oldSourceFile.scriptKind || releasedScriptKinds.has(oldSourceFile.resolvedPath)) {
               return documentRegistry.updateDocumentWithKey(fileName, path, host, documentRegistryBucketKey, scriptSnapshot, scriptVersion, scriptKind, languageVersionOrOptions);
             } else {
               documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind, oldSourceFile.impliedNodeFormat);
+              releasedScriptKinds.add(oldSourceFile.resolvedPath);
             }
           }
         }
@@ -155543,7 +155560,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program, target, log, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
     const start = timestamp();
-    const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken);
+    const variableOrParameterDeclaration = getVariableOrParameterDeclaration(contextToken, location);
     const useSemicolons = probablyUsesSemicolons(sourceFile);
     const typeChecker = program.getTypeChecker();
     const uniques = /* @__PURE__ */ new Map();
@@ -157700,11 +157717,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return true;
     return !((_a = tryCast(isExternalModuleReference(specifier) ? specifier.expression : specifier, isStringLiteralLike)) == null ? void 0 : _a.text);
   }
-  function getVariableOrParameterDeclaration(contextToken) {
+  function getVariableOrParameterDeclaration(contextToken, location) {
     if (!contextToken)
       return;
-    const declaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node) || (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
-    return declaration;
+    const possiblyParameterDeclaration = findAncestor(contextToken, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : (isParameter(node) || isTypeParameterDeclaration(node)) && !isIndexSignatureDeclaration(node.parent));
+    const possiblyVariableDeclaration = findAncestor(location, (node) => isFunctionBlock(node) || isArrowFunctionBody(node) || isBindingPattern(node) ? "quit" : isVariableDeclaration(node));
+    return possiblyParameterDeclaration || possiblyVariableDeclaration;
   }
   function isArrowFunctionBody(node) {
     return node.parent && isArrowFunction(node.parent) && (node.parent.body === node || // const a = () => /**/;
@@ -158011,7 +158029,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       case 290 /* JsxAttribute */:
         if (!isRequireCallArgument(node) && !isImportCall(parent2)) {
           const argumentInfo = ts_SignatureHelp_exports.getArgumentInfoForCompletions(parent2.kind === 290 /* JsxAttribute */ ? parent2.parent : node, position, sourceFile);
-          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType();
+          return argumentInfo && getStringLiteralCompletionsFromSignature(argumentInfo.invocation, node, argumentInfo, typeChecker) || fromContextualType(0 /* None */);
         }
       case 271 /* ImportDeclaration */:
       case 277 /* ExportDeclaration */:
@@ -165737,6 +165755,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             this.insertNodeAt(sourceFile, pos, insert, options);
           }
         }
+        insertNodesAtEndOfFile(sourceFile, newNodes, blankLineBetween) {
+          this.insertAtEndOfFile(sourceFile, newNodes, blankLineBetween);
+        }
+        insertAtEndOfFile(sourceFile, insert, blankLineBetween) {
+          const pos = sourceFile.end + 1;
+          const options = {
+            prefix: this.newLineCharacter,
+            suffix: this.newLineCharacter + (blankLineBetween ? this.newLineCharacter : "")
+          };
+          this.insertNodesAt(sourceFile, pos, insert, options);
+        }
         insertStatementsInNewFile(fileName, statements, oldFile) {
           if (!this.newFileChanges) {
             this.newFileChanges = createMultiMap();

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = "5.1.1-rc";
+var version = "5.1.5";
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7078,6 +7078,7 @@ var Diagnostics = {
   Convert_typedef_to_TypeScript_type: diag(95176, 3 /* Message */, "Convert_typedef_to_TypeScript_type_95176", "Convert typedef to TypeScript type."),
   Convert_all_typedef_to_TypeScript_types: diag(95177, 3 /* Message */, "Convert_all_typedef_to_TypeScript_types_95177", "Convert all typedef to TypeScript types."),
   Move_to_file: diag(95178, 3 /* Message */, "Move_to_file_95178", "Move to file"),
+  Cannot_move_to_file_selected_file_is_invalid: diag(95179, 3 /* Message */, "Cannot_move_to_file_selected_file_is_invalid_95179", "Cannot move to file, selected file is invalid"),
   No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer: diag(18004, 1 /* Error */, "No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer_18004", "No value exists in scope for the shorthand property '{0}'. Either declare one or provide an initializer."),
   Classes_may_not_have_a_field_named_constructor: diag(18006, 1 /* Error */, "Classes_may_not_have_a_field_named_constructor_18006", "Classes may not have a field named 'constructor'."),
   JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array: diag(18007, 1 /* Error */, "JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array_18007", "JSX expressions may not use the comma operator. Did you mean to write an array?"),

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.1-rc",
+    "version": "5.1.5",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [