Skip to content

Commit b4b1f3b

Browse files
committed
renameParameterToNameFromType minor fixes
1 parent 7926be7 commit b4b1f3b

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

typescript/src/codeActions/custom/renameParameterToNameFromType.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,14 @@ export const renameParameterToNameFromType = {
4747
tryToApply(sourceFile, position, range, node, formatOptions, languageService) {
4848
if (!node || !position) return
4949
const functionSignature = node.parent.parent
50-
if (
51-
!ts.isIdentifier(node) ||
52-
!ts.isParameter(node.parent) ||
53-
!ts.isFunctionLike(functionSignature) ||
54-
!ts.isVariableDeclaration(functionSignature.parent)
55-
)
56-
return
50+
if (!ts.isIdentifier(node) || !ts.isParameter(node.parent) || !ts.isFunctionLike(functionSignature)) return
5751
const { parent: functionDecl, parameters: functionParameters } = functionSignature
5852

5953
const parameterIndex = functionParameters.indexOf(node.parent)
6054
const parameterName = functionParameters[parameterIndex]!.name.getText()
6155
const typeParamName = getTypeParamName(parameterName, functionParameters.indexOf(node.parent), functionDecl, languageService)
6256
if (!typeParamName) return
63-
this.name = `Rename Parameter to Name from Type '${functionDecl.type!.getText()}'`
57+
this.name = `Rename Parameter to Name from Type ('${typeParamName}')`
6458
if (!formatOptions) return true
6559

6660
const edits = compact(getEdits(sourceFile.fileName, position, typeParamName, languageService))
@@ -95,7 +89,8 @@ export const renameAllParametersToNameFromType = {
9589

9690
if (paramsToRename.length < 2) return
9791

98-
this.name = `Rename All Parameters to Name from Type '${functionDecl.type!.getText()}'`
92+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
93+
this.name = `Rename All Parameters to Name from Type '${functionDecl.type?.getText()}'`
9994
if (!formatOptions) return true
10095

10196
const edits = compact(

0 commit comments

Comments
 (0)