typescript 5.2.0-dev.20230517 → 5.2.0-dev.20230518

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230517`;
+var version = `${versionMajorMinor}.0-dev.20230518`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -18559,7 +18559,8 @@ function createNodeFactory(flags, baseFactory2) {
     ensureUseStrict,
     liftToBlock,
     mergeLexicalEnvironment,
-    updateModifiers
+    updateModifiers,
+    updateModifierLike
   };
   forEach(nodeFactoryPatchers, (fn) => fn(factory2));
   return factory2;
@@ -22041,6 +22042,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) ? updatePropertyDeclaration(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) ? updatePropertyDeclaration(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;
   }
@@ -23366,10 +23370,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] = _;
                 }
             }

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-dev.20230517`;
+var version = `${versionMajorMinor}.0-dev.20230518`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -22754,7 +22754,8 @@ function createNodeFactory(flags, baseFactory2) {
     ensureUseStrict,
     liftToBlock,
     mergeLexicalEnvironment,
-    updateModifiers
+    updateModifiers,
+    updateModifierLike
   };
   forEach(nodeFactoryPatchers, (fn) => fn(factory2));
   return factory2;
@@ -26236,6 +26237,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 +27621,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] = _;
                 }
             }
@@ -153173,7 +153177,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 +155750,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 +155809,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 +155861,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 +155882,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 +155915,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 +155941,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 +155992,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 +156637,7 @@ function getCompletionEntryCodeActionsAndSourceDisplay(name, location, contextTo
     }
   }
   if (source === "ClassMemberSnippet/" /* ClassMemberSnippet */) {
-    const { importAdder } = getEntryForMemberCompletion(
+    const { importAdder, eraseRange } = getEntryForMemberCompletion(
       host,
       program,
       compilerOptions,
@@ -156609,10 +156649,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,
@@ -181679,6 +181726,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           kindModifiers,
           sortText,
           insertText,
+          filterText,
           replacementSpan,
           hasAction,
           source,
@@ -181697,6 +181745,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
           kindModifiers,
           sortText,
           insertText,
+          filterText,
           replacementSpan: convertedSpan,
           isSnippet,
           hasAction: hasAction || void 0,

package/lib/tsserverlibrary.d.ts

@@ -1829,6 +1829,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.
                  */
@@ -10801,6 +10806,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.

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230517`;
+      version = `${versionMajorMinor}.0-dev.20230518`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20592,7 +20592,8 @@ ${lanes.join("\n")}
       ensureUseStrict,
       liftToBlock,
       mergeLexicalEnvironment,
-      updateModifiers
+      updateModifiers,
+      updateModifierLike
     };
     forEach(nodeFactoryPatchers, (fn) => fn(factory2));
     return factory2;
@@ -24074,6 +24075,9 @@ ${lanes.join("\n")}
       }
       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;
     }
@@ -25516,10 +25520,10 @@ ${lanes.join("\n")}
                     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] = _;
                 }
             }
@@ -152220,7 +152224,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 */;
     }
@@ -154977,6 +154982,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   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;
@@ -155035,11 +155041,15 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     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)) {
@@ -155083,6 +155093,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       hasAction: hasAction ? true : void 0,
       isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || void 0,
       insertText,
+      filterText,
       replacementSpan,
       sourceDisplay,
       labelDetails,
@@ -155103,11 +155114,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   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({
@@ -155136,9 +155147,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       );
     }
     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,
@@ -155162,18 +155173,42 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           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,
@@ -155189,24 +155224,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         );
       }
     }
-    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)) {
@@ -155829,7 +155869,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
     }
     if (source === "ClassMemberSnippet/" /* ClassMemberSnippet */) {
-      const { importAdder } = getEntryForMemberCompletion(
+      const { importAdder, eraseRange } = getEntryForMemberCompletion(
         host,
         program,
         compilerOptions,
@@ -155841,10 +155881,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         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,
@@ -179117,6 +179164,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
                 kindModifiers,
                 sortText,
                 insertText,
+                filterText,
                 replacementSpan,
                 hasAction,
                 source,
@@ -179135,6 +179183,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
                 kindModifiers,
                 sortText,
                 insertText,
+                filterText,
                 replacementSpan: convertedSpan,
                 isSnippet,
                 hasAction: hasAction || void 0,

package/lib/typescript.d.ts

@@ -6838,6 +6838,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.

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-dev.20230517`;
+      version = `${versionMajorMinor}.0-dev.20230518`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -20592,7 +20592,8 @@ ${lanes.join("\n")}
       ensureUseStrict,
       liftToBlock,
       mergeLexicalEnvironment,
-      updateModifiers
+      updateModifiers,
+      updateModifierLike
     };
     forEach(nodeFactoryPatchers, (fn) => fn(factory2));
     return factory2;
@@ -24074,6 +24075,9 @@ ${lanes.join("\n")}
       }
       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;
     }
@@ -25516,10 +25520,10 @@ ${lanes.join("\n")}
                     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] = _;
                 }
             }
@@ -152235,7 +152239,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       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 */;
     }
@@ -154992,6 +154997,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   }
   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;
@@ -155050,11 +155056,15 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
     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)) {
@@ -155098,6 +155108,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       hasAction: hasAction ? true : void 0,
       isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || void 0,
       insertText,
+      filterText,
       replacementSpan,
       sourceDisplay,
       labelDetails,
@@ -155118,11 +155129,11 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   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({
@@ -155151,9 +155162,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       );
     }
     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,
@@ -155177,18 +155188,42 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           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,
@@ -155204,24 +155239,29 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         );
       }
     }
-    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)) {
@@ -155844,7 +155884,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       }
     }
     if (source === "ClassMemberSnippet/" /* ClassMemberSnippet */) {
-      const { importAdder } = getEntryForMemberCompletion(
+      const { importAdder, eraseRange } = getEntryForMemberCompletion(
         host,
         program,
         compilerOptions,
@@ -155856,10 +155896,17 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         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,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-dev.20230517`;
+var version = `${versionMajorMinor}.0-dev.20230518`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -12891,7 +12891,8 @@ function createNodeFactory(flags, baseFactory2) {
     ensureUseStrict,
     liftToBlock,
     mergeLexicalEnvironment,
-    updateModifiers
+    updateModifiers,
+    updateModifierLike
   };
   forEach(nodeFactoryPatchers, (fn) => fn(factory2));
   return factory2;
@@ -16373,6 +16374,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) ? updatePropertyDeclaration(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) ? updatePropertyDeclaration(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;
   }

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.2.0-dev.20230517",
+    "version": "5.2.0-dev.20230518",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "dddd0667f012c51582c2ac92c08b8e57f2456587"
+    "gitHead": "174599c5542c38ee8f1fc61c9ca6532b68cbb19c"
 }