Use getFirstConstructorWithBody in one more place, and simplify other class members iteration

src/compiler/utilities.ts

@@ -2933,11 +2933,7 @@ namespace ts {
  }
 
  export function getFirstConstructorWithBody(node: ClassLikeDeclaration): ConstructorDeclaration {
- return forEach(node.members, member => {
- if (member.kind === SyntaxKind.Constructor && nodeIsPresent((<ConstructorDeclaration>member).body)) {
- return <ConstructorDeclaration>member;
- }
- });
+ return find(node.members, (member): member is ConstructorDeclaration => isConstructorDeclaration(member) && nodeIsPresent(member.body));
  }
 
  function getSetAccessorValueParameter(accessor: SetAccessorDeclaration): ParameterDeclaration | undefined {

src/services/codefixes/fixStrictClassInitialization.ts

@@ -127,7 +127,7 @@ namespace ts.codefix {
  const classDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
  if (!classDeclaration || hasModifier(classDeclaration, ModifierFlags.Abstract)) return undefined;
 
- const constructorDeclaration = find<ClassElement, ConstructorDeclaration>(classDeclaration.members, (m): m is ConstructorDeclaration => isConstructorDeclaration(m) && !!m.body)!;
+ const constructorDeclaration = getFirstConstructorWithBody(classDeclaration);
  if (constructorDeclaration && constructorDeclaration.parameters.length) return undefined;
 
  return createNew(createIdentifier(type.symbol.name), /*typeArguments*/ undefined, /*argumentsArray*/ undefined);

src/services/findAllReferences.ts

@@ -1014,21 +1014,17 @@ namespace ts.FindAllReferences.Core {
 
  function addClassStaticThisReferences(referenceLocation: Node, search: Search, state: State): void {
  addReference(referenceLocation, search.symbol, state);
- if (!state.options.isForRename && isClassLike(referenceLocation.parent)) {
- Debug.assert(referenceLocation.parent.name === referenceLocation);
- // This is the class declaration.
- addStaticThisReferences(referenceLocation.parent, state.referenceAdder(search.symbol));
- }
- }
-
- function addStaticThisReferences(classLike: ClassLikeDeclaration, pusher: (node: Node) => void): void {
+ const classLike = referenceLocation.parent;
+ if (state.options.isForRename || !isClassLike(classLike)) return;
+ Debug.assert(classLike.name === referenceLocation);
+ const addRef = state.referenceAdder(search.symbol);
  for (const member of classLike.members) {
  if (!(isMethodOrAccessor(member) && hasModifier(member, ModifierFlags.Static))) {
  continue;
  }
  member.body.forEachChild(function cb(node) {
  if (node.kind === SyntaxKind.ThisKeyword) {
- pusher(node);
+ addRef(node);
  }
  else if (!isFunctionLike(node)) {
  node.forEachChild(cb);

src/services/jsDoc.ts

@@ -365,13 +365,10 @@ namespace ts.JsDoc {
  case SyntaxKind.FunctionExpression:
  case SyntaxKind.ArrowFunction:
  return (<FunctionExpression>rightHandSide).parameters;
- case SyntaxKind.ClassExpression:
- for (const member of (<ClassExpression>rightHandSide).members) {
- if (member.kind === SyntaxKind.Constructor) {
- return (<ConstructorDeclaration>member).parameters;
- }
- }
- break;
+ case SyntaxKind.ClassExpression: {
+ const ctr = find((rightHandSide as ClassExpression).members, isConstructorDeclaration);
+ return ctr && ctr.parameters;
+ }
  }
 
  return emptyArray;