@typescript-deploys/pr-build 5.2.0-pr-54290-7 → 5.2.0-pr-54377-7

package/lib/tsserver.js

@@ -2304,7 +2304,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230517`;
+var version = `${versionMajorMinor}.0-insiders.20230524`;
 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?"),
@@ -22754,7 +22755,8 @@ function createNodeFactory(flags, baseFactory2) {
     ensureUseStrict,
     liftToBlock,
     mergeLexicalEnvironment,
-    updateModifiers
+    updateModifiers,
+    updateModifierLike
   };
   forEach(nodeFactoryPatchers, (fn) => fn(factory2));
   return factory2;
@@ -26236,6 +26238,9 @@ function createNodeFactory(flags, baseFactory2) {
     }
     return isTypeParameterDeclaration(node) ? updateTypeParameterDeclaration(node, modifierArray, node.name, node.constraint, node.default) : isParameter(node) ? updateParameterDeclaration(node, modifierArray, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer) : isConstructorTypeNode(node) ? updateConstructorTypeNode1(node, modifierArray, node.typeParameters, node.parameters, node.type) : isPropertySignature(node) ? updatePropertySignature(node, modifierArray, node.name, node.questionToken, node.type) : isPropertyDeclaration(node) ? updatePropertyDeclaration2(node, modifierArray, node.name, node.questionToken ?? node.exclamationToken, node.type, node.initializer) : isMethodSignature(node) ? updateMethodSignature(node, modifierArray, node.name, node.questionToken, node.typeParameters, node.parameters, node.type) : isMethodDeclaration(node) ? updateMethodDeclaration(node, modifierArray, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body) : isConstructorDeclaration(node) ? updateConstructorDeclaration(node, modifierArray, node.parameters, node.body) : isGetAccessorDeclaration(node) ? updateGetAccessorDeclaration(node, modifierArray, node.name, node.parameters, node.type, node.body) : isSetAccessorDeclaration(node) ? updateSetAccessorDeclaration(node, modifierArray, node.name, node.parameters, node.body) : isIndexSignatureDeclaration(node) ? updateIndexSignature(node, modifierArray, node.parameters, node.type) : isFunctionExpression(node) ? updateFunctionExpression(node, modifierArray, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body) : isArrowFunction(node) ? updateArrowFunction(node, modifierArray, node.typeParameters, node.parameters, node.type, node.equalsGreaterThanToken, node.body) : isClassExpression(node) ? updateClassExpression(node, modifierArray, node.name, node.typeParameters, node.heritageClauses, node.members) : isVariableStatement(node) ? updateVariableStatement(node, modifierArray, node.declarationList) : isFunctionDeclaration(node) ? updateFunctionDeclaration(node, modifierArray, node.asteriskToken, node.name, node.typeParameters, node.parameters, node.type, node.body) : isClassDeclaration(node) ? updateClassDeclaration(node, modifierArray, node.name, node.typeParameters, node.heritageClauses, node.members) : isInterfaceDeclaration(node) ? updateInterfaceDeclaration(node, modifierArray, node.name, node.typeParameters, node.heritageClauses, node.members) : isTypeAliasDeclaration(node) ? updateTypeAliasDeclaration(node, modifierArray, node.name, node.typeParameters, node.type) : isEnumDeclaration(node) ? updateEnumDeclaration(node, modifierArray, node.name, node.members) : isModuleDeclaration(node) ? updateModuleDeclaration(node, modifierArray, node.name, node.body) : isImportEqualsDeclaration(node) ? updateImportEqualsDeclaration(node, modifierArray, node.isTypeOnly, node.name, node.moduleReference) : isImportDeclaration(node) ? updateImportDeclaration(node, modifierArray, node.importClause, node.moduleSpecifier, node.assertClause) : isExportAssignment(node) ? updateExportAssignment(node, modifierArray, node.expression) : isExportDeclaration(node) ? updateExportDeclaration(node, modifierArray, node.isTypeOnly, node.exportClause, node.moduleSpecifier, node.assertClause) : Debug.assertNever(node);
   }
+  function updateModifierLike(node, modifierArray) {
+    return isParameter(node) ? updateParameterDeclaration(node, modifierArray, node.dotDotDotToken, node.name, node.questionToken, node.type, node.initializer) : isPropertyDeclaration(node) ? updatePropertyDeclaration2(node, modifierArray, node.name, node.questionToken ?? node.exclamationToken, node.type, node.initializer) : isMethodDeclaration(node) ? updateMethodDeclaration(node, modifierArray, node.asteriskToken, node.name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body) : isGetAccessorDeclaration(node) ? updateGetAccessorDeclaration(node, modifierArray, node.name, node.parameters, node.type, node.body) : isSetAccessorDeclaration(node) ? updateSetAccessorDeclaration(node, modifierArray, node.name, node.parameters, node.body) : isClassExpression(node) ? updateClassExpression(node, modifierArray, node.name, node.typeParameters, node.heritageClauses, node.members) : isClassDeclaration(node) ? updateClassDeclaration(node, modifierArray, node.name, node.typeParameters, node.heritageClauses, node.members) : Debug.assertNever(node);
+  }
   function asNodeArray(array) {
     return array ? createNodeArray(array) : void 0;
   }
@@ -27617,10 +27622,10 @@ var esDecorateHelper = {
                     if (result === null || typeof result !== "object") throw new TypeError("Object expected");
                     if (_ = accept(result.get)) descriptor.get = _;
                     if (_ = accept(result.set)) descriptor.set = _;
-                    if (_ = accept(result.init)) initializers.push(_);
+                    if (_ = accept(result.init)) initializers.unshift(_);
                 }
                 else if (_ = accept(result)) {
-                    if (kind === "field") initializers.push(_);
+                    if (kind === "field") initializers.unshift(_);
                     else descriptor[key] = _;
                 }
             }
@@ -37748,6 +37753,7 @@ var libEntries = [
   ["es2015.symbol", "lib.es2015.symbol.d.ts"],
   ["es2015.symbol.wellknown", "lib.es2015.symbol.wellknown.d.ts"],
   ["es2016.array.include", "lib.es2016.array.include.d.ts"],
+  ["es2017.date", "lib.es2017.date.d.ts"],
   ["es2017.object", "lib.es2017.object.d.ts"],
   ["es2017.sharedmemory", "lib.es2017.sharedmemory.d.ts"],
   ["es2017.string", "lib.es2017.string.d.ts"],
@@ -52547,32 +52553,34 @@ function createTypeChecker(host) {
           const methodDeclaration = signatureToSignatureDeclarationHelper(signature, 172 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
           typeElements.push(preserveCommentsOn(methodDeclaration));
         }
+        if (signatures.length || !optionalToken) {
+          return;
+        }
+      }
+      let propertyTypeNode;
+      if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
+        propertyTypeNode = createElidedInformationPlaceholder(context);
       } else {
-        let propertyTypeNode;
-        if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
-          propertyTypeNode = createElidedInformationPlaceholder(context);
-        } else {
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack || (context.reverseMappedStack = []);
-            context.reverseMappedStack.push(propertySymbol);
-          }
-          propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
-          if (propertyIsReverseMapped) {
-            context.reverseMappedStack.pop();
-          }
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack || (context.reverseMappedStack = []);
+          context.reverseMappedStack.push(propertySymbol);
         }
-        const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
-        if (modifiers) {
-          context.approximateLength += 9;
+        propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : factory.createKeywordTypeNode(133 /* AnyKeyword */);
+        if (propertyIsReverseMapped) {
+          context.reverseMappedStack.pop();
         }
-        const propertySignature = factory.createPropertySignature(
-          modifiers,
-          propertyName,
-          optionalToken,
-          propertyTypeNode
-        );
-        typeElements.push(preserveCommentsOn(propertySignature));
       }
+      const modifiers = isReadonlySymbol(propertySymbol) ? [factory.createToken(148 /* ReadonlyKeyword */)] : void 0;
+      if (modifiers) {
+        context.approximateLength += 9;
+      }
+      const propertySignature = factory.createPropertySignature(
+        modifiers,
+        propertyName,
+        optionalToken,
+        propertyTypeNode
+      );
+      typeElements.push(preserveCommentsOn(propertySignature));
       function preserveCommentsOn(node) {
         var _a2;
         if (some(propertySymbol.declarations, (d) => d.kind === 354 /* JSDocPropertyTag */)) {
@@ -58635,7 +58643,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) {
@@ -60862,31 +60870,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;
@@ -61928,9 +61933,9 @@ function createTypeChecker(host) {
         );
         if (freshMapper) {
           const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (const p of freshParams) {
-            if (root.inferTypeParameters.indexOf(p) === -1) {
-              p.mapper = freshCombinedMapper;
+          for (let i = 0; i < freshParams.length; i++) {
+            if (freshParams[i] !== root.inferTypeParameters[i]) {
+              freshParams[i].mapper = freshCombinedMapper;
             }
           }
         }
@@ -62767,18 +62772,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 */:
@@ -62832,6 +62838,9 @@ function createTypeChecker(host) {
     const elementFlags = tupleType.target.elementFlags;
     const elementTypes = map(getElementTypes(tupleType), (t, i) => {
       const singleton = elementFlags[i] & 8 /* Variadic */ ? t : elementFlags[i] & 4 /* Rest */ ? createArrayType(t) : createTupleType([t], [elementFlags[i]]);
+      if (singleton === typeVariable) {
+        return mappedType;
+      }
       return instantiateMappedType(mappedType, prependTypeMapping(typeVariable, singleton, mapper));
     });
     const newReadonly = getModifiedReadonlyState(tupleType.target.readonly, getMappedTypeModifiers(mappedType));
@@ -66620,7 +66629,7 @@ function createTypeChecker(host) {
   }
   function getRecursionIdentity(type) {
     if (type.flags & 524288 /* Object */ && !isObjectOrArrayLiteralType(type)) {
-      if (getObjectFlags(type) && 4 /* Reference */ && type.node) {
+      if (getObjectFlags(type) & 4 /* Reference */ && type.node) {
         return type.node;
       }
       if (type.symbol && !(getObjectFlags(type) & 16 /* Anonymous */ && type.symbol.flags & 32 /* Class */)) {
@@ -67395,6 +67404,8 @@ function createTypeChecker(host) {
     return context && context.mapper;
   }
   function couldContainTypeVariables(type) {
+    if (type.flags & 67359327 /* Intrinsic */)
+      return false;
     const objectFlags = getObjectFlags(type);
     if (objectFlags & 524288 /* CouldContainTypeVariablesComputed */) {
       return !!(objectFlags & 1048576 /* CouldContainTypeVariables */);
@@ -74322,7 +74333,7 @@ function createTypeChecker(host) {
         }
         const typeArgument = typeArgumentTypes[i];
         if (!checkTypeAssignableTo(
-          getTypeWithThisArgument(typeArgument, typeArgument),
+          typeArgument,
           getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument),
           reportErrors2 ? typeArgumentNodes[i] : void 0,
           typeArgumentHeadMessage,
@@ -78888,7 +78899,7 @@ function createTypeChecker(host) {
     if (getIsolatedModules(compilerOptions)) {
       Debug.assert(!!(type.symbol.flags & 128 /* ConstEnum */));
       const constEnumDeclaration = type.symbol.valueDeclaration;
-      if (constEnumDeclaration.flags & 16777216 /* Ambient */) {
+      if (constEnumDeclaration.flags & 16777216 /* Ambient */ && !isValidTypeOnlyAliasUseSite(node)) {
         error(node, Diagnostics.Cannot_access_ambient_const_enums_when_0_is_enabled, isolatedModulesLikeFlagName);
       }
     }
@@ -79317,6 +79328,9 @@ function createTypeChecker(host) {
           case "length":
           case "caller":
           case "arguments":
+            if (compilerOptions.useDefineForClassFields) {
+              break;
+            }
           case "prototype":
             const message = Diagnostics.Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1;
             const className = getNameOfSymbolAsWritten(getSymbolOfDeclaration(node));
@@ -86323,7 +86337,7 @@ function createTypeChecker(host) {
                 if (requestedExternalEmitHelperNames.has(name))
                   continue;
                 requestedExternalEmitHelperNames.add(name);
-                const symbol = getSymbol2(helpersModule.exports, escapeLeadingUnderscores(name), 111551 /* Value */);
+                const symbol = 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 */) {
@@ -136490,15 +136504,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 {
@@ -136536,6 +136553,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(
@@ -153173,7 +153197,8 @@ function addNewNodeForMemberSymbol(symbol, enclosingDeclaration, sourceFile, con
     false
   );
   const effectiveModifierFlags = declaration ? getEffectiveModifierFlags(declaration) : 0 /* None */;
-  let modifierFlags = effectiveModifierFlags & 4 /* Public */ ? 4 /* Public */ : effectiveModifierFlags & 16 /* Protected */ ? 16 /* Protected */ : 0 /* None */;
+  let modifierFlags = effectiveModifierFlags & 32 /* Static */;
+  modifierFlags |= effectiveModifierFlags & 4 /* Public */ ? 4 /* Public */ : effectiveModifierFlags & 16 /* Protected */ ? 16 /* Protected */ : 0 /* None */;
   if (declaration && isAutoAccessorPropertyDeclaration(declaration)) {
     modifierFlags |= 128 /* Accessor */;
   }
@@ -155745,6 +155770,7 @@ function createCompletionEntryForLiteral(sourceFile, preferences, literal) {
 }
 function createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, position, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importStatementCompletion, useSemicolons, options, preferences, completionKind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol) {
   let insertText;
+  let filterText;
   let replacementSpan = getReplacementSpanForContextToken(replacementToken);
   let data;
   let isSnippet;
@@ -155803,11 +155829,15 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
   }
   if (preferences.includeCompletionsWithClassMemberSnippets && preferences.includeCompletionsWithInsertText && completionKind === 3 /* MemberLike */ && isClassLikeMemberCompletion(symbol, location, sourceFile)) {
     let importAdder;
-    ({ insertText, isSnippet, importAdder, replacementSpan } = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext));
-    sortText = SortText.ClassMemberSnippets;
-    if (importAdder == null ? void 0 : importAdder.hasFixes()) {
-      hasAction = true;
-      source = "ClassMemberSnippet/" /* ClassMemberSnippet */;
+    const memberCompletionEntry = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext);
+    if (memberCompletionEntry) {
+      ({ insertText, filterText, isSnippet, importAdder } = memberCompletionEntry);
+      if (importAdder == null ? void 0 : importAdder.hasFixes()) {
+        hasAction = true;
+        source = "ClassMemberSnippet/" /* ClassMemberSnippet */;
+      }
+    } else {
+      return void 0;
     }
   }
   if (origin && originIsObjectLiteralMethod(origin)) {
@@ -155851,6 +155881,7 @@ function createCompletionEntry(symbol, sortText, replacementToken, contextToken,
     hasAction: hasAction ? true : void 0,
     isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || void 0,
     insertText,
+    filterText,
     replacementSpan,
     sourceDisplay,
     labelDetails,
@@ -155871,11 +155902,11 @@ function isClassLikeMemberCompletion(symbol, location, sourceFile) {
 function getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, position, contextToken, formatContext) {
   const classLikeDeclaration = findAncestor(location, isClassLike);
   if (!classLikeDeclaration) {
-    return { insertText: name };
+    return void 0;
   }
   let isSnippet;
-  let replacementSpan;
   let insertText = name;
+  const filterText = name;
   const checker = program.getTypeChecker();
   const sourceFile = location.getSourceFile();
   const printer = createSnippetPrinter({
@@ -155904,9 +155935,9 @@ function getEntryForMemberCompletion(host, program, options, preferences, name,
     );
   }
   let modifiers = 0 /* None */;
-  const { modifiers: presentModifiers, span: modifiersSpan } = getPresentModifiers(contextToken, sourceFile, position);
-  const isAbstract = !!(presentModifiers & 256 /* Abstract */);
-  const completionNodes = [];
+  const { modifiers: presentModifiers, range: eraseRange, decorators: presentDecorators } = getPresentModifiers(contextToken, sourceFile, position);
+  const isAbstract = presentModifiers & 256 /* Abstract */ && classLikeDeclaration.modifierFlagsCache & 256 /* Abstract */;
+  let completionNodes = [];
   ts_codefix_exports.addNewNodeForMemberSymbol(
     symbol,
     classLikeDeclaration,
@@ -155930,18 +155961,42 @@ function getEntryForMemberCompletion(host, program, options, preferences, name,
         requiredModifiers |= 16384 /* Override */;
       }
       if (!completionNodes.length) {
-        modifiers = node.modifierFlagsCache | requiredModifiers | presentModifiers;
+        modifiers = node.modifierFlagsCache | requiredModifiers;
       }
       node = factory.updateModifiers(node, modifiers);
       completionNodes.push(node);
     },
     body,
     ts_codefix_exports.PreserveOptionalFlags.Property,
-    isAbstract
+    !!isAbstract
   );
   if (completionNodes.length) {
+    const isMethod = symbol.flags & 8192 /* Method */;
+    let allowedModifiers = modifiers | 16384 /* Override */ | 4 /* Public */;
+    if (!isMethod) {
+      allowedModifiers |= 2 /* Ambient */ | 64 /* Readonly */;
+    } else {
+      allowedModifiers |= 512 /* Async */;
+    }
+    const allowedAndPresent = presentModifiers & allowedModifiers;
+    if (presentModifiers & ~allowedModifiers) {
+      return void 0;
+    }
+    if (modifiers & 16 /* Protected */ && allowedAndPresent & 4 /* Public */) {
+      modifiers &= ~16 /* Protected */;
+    }
+    if (allowedAndPresent !== 0 /* None */ && !(allowedAndPresent & 4 /* Public */)) {
+      modifiers &= ~4 /* Public */;
+    }
+    modifiers |= allowedAndPresent;
+    completionNodes = completionNodes.map((node) => factory.updateModifiers(node, modifiers));
+    if (presentDecorators == null ? void 0 : presentDecorators.length) {
+      const lastNode = completionNodes[completionNodes.length - 1];
+      if (canHaveDecorators(lastNode)) {
+        completionNodes[completionNodes.length - 1] = factory.updateModifierLike(lastNode, presentDecorators.concat(getModifiers(lastNode) || []));
+      }
+    }
     const format = 1 /* MultiLine */ | 131072 /* NoTrailingNewLine */;
-    replacementSpan = modifiersSpan;
     if (formatContext) {
       insertText = printer.printAndFormatSnippetList(
         format,
@@ -155957,24 +156012,29 @@ function getEntryForMemberCompletion(host, program, options, preferences, name,
       );
     }
   }
-  return { insertText, isSnippet, importAdder, replacementSpan };
+  return { insertText, filterText, isSnippet, importAdder, eraseRange };
 }
 function getPresentModifiers(contextToken, sourceFile, position) {
   if (!contextToken || getLineAndCharacterOfPosition(sourceFile, position).line > getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line) {
     return { modifiers: 0 /* None */ };
   }
   let modifiers = 0 /* None */;
-  let span;
+  let decorators;
   let contextMod;
-  if (contextMod = isModifierLike2(contextToken)) {
-    modifiers |= modifierToFlag(contextMod);
-    span = createTextSpanFromNode(contextToken);
-  }
-  if (isPropertyDeclaration(contextToken.parent)) {
+  const range = { pos: position, end: position };
+  if (isPropertyDeclaration(contextToken.parent) && contextToken.parent.modifiers) {
     modifiers |= modifiersToFlags(contextToken.parent.modifiers) & 126975 /* Modifier */;
-    span = createTextSpanFromNode(contextToken.parent);
+    decorators = contextToken.parent.modifiers.filter(isDecorator) || [];
+    range.pos = Math.min(range.pos, contextToken.parent.modifiers.pos);
   }
-  return { modifiers, span };
+  if (contextMod = isModifierLike2(contextToken)) {
+    const contextModifierFlag = modifierToFlag(contextMod);
+    if (!(modifiers & contextModifierFlag)) {
+      modifiers |= contextModifierFlag;
+      range.pos = Math.min(range.pos, contextToken.pos);
+    }
+  }
+  return { modifiers, decorators, range: range.pos !== position ? range : void 0 };
 }
 function isModifierLike2(node) {
   if (isModifier(node)) {
@@ -156597,7 +156657,7 @@ function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextTo
     }
   }
   if (source === "ClassMemberSnippet/" /* ClassMemberSnippet */) {
-    const { importAdder } = getEntryForMemberCompletion(
+    const { importAdder, eraseRange } = getEntryForMemberCompletion(
       host,
       program,
       compilerOptions,
@@ -156609,10 +156669,17 @@ function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextTo
       contextToken,
       formatContext
     );
-    if (importAdder) {
+    if (importAdder || eraseRange) {
       const changes = ts_textChanges_exports.ChangeTracker.with(
         { host, formatContext, preferences },
-        importAdder.writeFixes
+        (tracker) => {
+          if (importAdder) {
+            importAdder.writeFixes(tracker);
+          }
+          if (eraseRange) {
+            tracker.deleteRange(sourceFile, eraseRange);
+          }
+        }
       );
       return {
         sourceDisplay: void 0,
@@ -165957,6 +166024,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();
@@ -181679,6 +181757,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           kindModifiers,
           sortText,
           insertText,
+          filterText,
           replacementSpan,
           hasAction,
           source,
@@ -181697,6 +181776,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           kindModifiers,
           sortText,
           insertText,
+          filterText,
           replacementSpan: convertedSpan,
           isSnippet,
           hasAction: hasAction || void 0,
@@ -182068,7 +182148,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:
@@ -1829,6 +1830,11 @@ declare namespace ts {
                  * coupled with `replacementSpan` to replace a dotted access with a bracket access.
                  */
                 insertText?: string;
+                /**
+                 * A string that should be used when filtering a set of
+                 * completion items.
+                 */
+                filterText?: string;
                 /**
                  * `insertText` should be interpreted as a snippet if true.
                  */
@@ -10190,7 +10196,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 +10486,7 @@ declare namespace ts {
         renameFilename?: string;
         renameLocation?: number;
         commands?: CodeActionCommand[];
+        notApplicableReason?: string;
     }
     type RefactorTriggerReason = "implicit" | "invoked";
     interface TextInsertion {
@@ -10801,6 +10808,7 @@ declare namespace ts {
         kindModifiers?: string;
         sortText: string;
         insertText?: string;
+        filterText?: string;
         isSnippet?: true;
         /**
          * An optional span that indicates the text to be replaced by this completion item.