Skip to content

Commit 76de2ca

Browse files
committed
Fixes and typos
1 parent 7ea202a commit 76de2ca

6 files changed

+6
-6
lines changed

src/compiler/transformers/declarations.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1474,7 +1474,7 @@ export function transformDeclarations(context: TransformationContext) {
14741474
return undefined; // unique symbol or non-identifier name - omit, since there's no syntax that can preserve it
14751475
}
14761476
getSymbolAccessibilityDiagnostic = createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
1477-
const type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace, declarationEmitNodeBuilderOptions.flags | NodeBuilderFlags.NoSyntacticPrinter, symbolTracker);
1477+
const type = resolver.createTypeOfDeclaration(p.valueDeclaration, fakespace, { ...declarationEmitNodeBuilderOptions, flags: declarationEmitNodeBuilderOptions.flags | NodeBuilderFlags.NoSyntacticPrinter }, symbolTracker);
14781478
getSymbolAccessibilityDiagnostic = oldDiag;
14791479
const isNonContextualKeywordName = isStringANonContextualKeyword(nameStr);
14801480
const name = isNonContextualKeywordName ? factory.getGeneratedNameForNode(p.valueDeclaration) : factory.createIdentifier(nameStr);

src/services/codefixes/convertToAsyncFunction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ function finishCatchOrFinallyTransform(node: PromiseReturningCallExpression<"the
462462
varDeclIdentifier = getSynthesizedDeepClone(declareSynthIdentifier(possibleNameForVarDecl));
463463
const typeArray: Type[] = possibleNameForVarDecl.types;
464464
const unionType = transformer.checker.getUnionType(typeArray, UnionReduction.Subtype);
465-
const unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType, /*enclosingDeclaration*/ undefined, /*flags*/ undefined);
465+
const unionTypeNode = transformer.isInJSFile ? undefined : transformer.checker.typeToTypeNode(unionType, /*enclosingDeclaration*/ undefined, /*options*/ undefined);
466466
const varDecl = [factory.createVariableDeclaration(varDeclIdentifier, /*exclamationToken*/ undefined, unionTypeNode)];
467467
const varDeclList = factory.createVariableStatement(/*modifiers*/ undefined, factory.createVariableDeclarationList(varDecl, NodeFlags.Let));
468468
statements.push(varDeclList);

src/services/codefixes/fixAddMissingConstraint.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function addMissingConstraint(changes: textChanges.ChangeTracker, program: Progr
123123
const scriptTarget = getEmitScriptTarget(program.getCompilerOptions());
124124
const tracker = getNoopSymbolTrackerWithResolver({ program, host });
125125
const importAdder = createImportAdder(sourceFile, program, preferences, host);
126-
const typeNode = typeToAutoImportableTypeNode(checker, importAdder, constraint, /*contextNode*/ undefined, scriptTarget, /*flags*/ undefined, tracker);
126+
const typeNode = typeToAutoImportableTypeNode(checker, importAdder, constraint, /*contextNode*/ undefined, scriptTarget, /*options*/ undefined, tracker);
127127
if (typeNode) {
128128
changes.replaceNode(sourceFile, declaration, factory.updateTypeParameterDeclaration(declaration, /*modifiers*/ undefined, declaration.name, typeNode, declaration.default));
129129
importAdder.writeFixes(changes);

src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function addMissingDeclarations(
108108
function createMissingIndexSignatureDeclaration(type: InterfaceType, kind: IndexKind): void {
109109
const indexInfoOfKind = checker.getIndexInfoOfType(type, kind);
110110
if (indexInfoOfKind) {
111-
insertInterfaceMemberNode(sourceFile, classDeclaration, checker.indexInfoToIndexSignatureDeclaration(indexInfoOfKind, classDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context))!);
111+
insertInterfaceMemberNode(sourceFile, classDeclaration, checker.indexInfoToIndexSignatureDeclaration(indexInfoOfKind, classDeclaration, /*options*/ undefined, getNoopSymbolTrackerWithResolver(context))!);
112112
}
113113
}
114114

src/services/codefixes/fixJSDocTypes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ registerCodeFix({
8282
});
8383

8484
function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, oldTypeNode: TypeNode, newType: Type, checker: TypeChecker): void {
85-
changes.replaceNode(sourceFile, oldTypeNode, checker.typeToTypeNode(newType, /*enclosingDeclaration*/ oldTypeNode, /*flags*/ undefined)!); // TODO: GH#18217
85+
changes.replaceNode(sourceFile, oldTypeNode, checker.typeToTypeNode(newType, /*enclosingDeclaration*/ oldTypeNode, /*options*/ undefined)!); // TODO: GH#18217
8686
}
8787

8888
function getInfo(sourceFile: SourceFile, pos: number, checker: TypeChecker): { readonly typeNode: TypeNode; readonly type: Type; } | undefined {

src/services/codefixes/fixReturnTypeInAsyncFunction.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function getInfo(sourceFile: SourceFile, checker: TypeChecker, pos: number): Inf
7272

7373
const returnType = checker.getTypeFromTypeNode(returnTypeNode);
7474
const promisedType = checker.getAwaitedType(returnType) || checker.getVoidType();
75-
const promisedTypeNode = checker.typeToTypeNode(promisedType, /*enclosingDeclaration*/ returnTypeNode, /*flags*/ undefined);
75+
const promisedTypeNode = checker.typeToTypeNode(promisedType, /*enclosingDeclaration*/ returnTypeNode, /*options*/ undefined);
7676
if (promisedTypeNode) {
7777
return { returnTypeNode, returnType, promisedTypeNode, promisedType };
7878
}

0 commit comments

Comments
 (0)