Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicated JSDoc comments

Browse Source 
Incorporate suppressLeadingAndTrailingTrivia just added by @amcasey.
This commit is contained in:
Nathan Shively-Sanders
2017-10-12 14:28:34 -07:00
parent c2c18a8d06
commit f35764d4ec
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/refactors/annotateWithTypeFromJSDoc.ts
+7 -3
View File
@@ -62,14 +62,16 @@ namespace ts.refactor.annotateWithTypeFromJSDoc {
const sourceFile = context.file;
const token = getTokenAtPosition(sourceFile, context.startPosition, /*includeJsDocComment*/ false);
const decl = findAncestor(token, isDeclarationWithType);
const jsdocType = getJSDocReturnType(decl) || getJSDocType(decl);
const jsdocType = getJSDocType(decl);
if (!decl || !jsdocType || decl.type) {
Debug.fail(`!decl || !jsdocType || decl.type: !${decl} || !${jsdocType} || ${decl.type}`);
return undefined;
}
const changeTracker = textChanges.ChangeTracker.fromContext(context);
changeTracker.replaceRange(sourceFile, { pos: decl.getStart(), end: decl.end }, addType(decl, transformJSDocType(jsdocType) as TypeNode));
const declarationWithType = addType(decl, transformJSDocType(jsdocType) as TypeNode);
suppressLeadingAndTrailingTrivia(declarationWithType);
changeTracker.replaceRange(sourceFile, { pos: decl.getStart(), end: decl.end }, declarationWithType);
return {
edits: changeTracker.getChanges(),
renameFilename: undefined,
@@ -87,7 +89,9 @@ namespace ts.refactor.annotateWithTypeFromJSDoc {
const token = getTokenAtPosition(sourceFile, context.startPosition, /*includeJsDocComment*/ false);
const decl = findAncestor(token, isFunctionLikeDeclaration);
const changeTracker = textChanges.ChangeTracker.fromContext(context);
changeTracker.replaceRange(sourceFile, { pos: decl.getStart(), end: decl.end }, addTypesToFunctionLike(decl));
const functionWithType = addTypesToFunctionLike(decl);
suppressLeadingAndTrailingTrivia(functionWithType);
changeTracker.replaceRange(sourceFile, { pos: decl.getStart(), end: decl.end }, functionWithType);
return {
edits: changeTracker.getChanges(),
renameFilename: undefined,
tests/cases/fourslash/annotateWithTypeFromJSDoc12.ts
-3
View File
@@ -10,9 +10,6 @@
verify.applicableRefactorAvailableAtMarker('1');
verify.fileAfterApplyingRefactorAtMarker('1',
`class C {
/**
* @return {...*}
*/
/**
* @return {...*}
*/
tests/cases/fourslash/annotateWithTypeFromJSDoc5.ts
-1
View File
@@ -9,7 +9,6 @@
verify.applicableRefactorAvailableAtMarker('1');
verify.fileAfterApplyingRefactorAtMarker('1',
`class C {
/** @type {number | null} */
/** @type {number | null} */
p: number | null = null;
}`, 'Annotate with type from JSDoc', 'annotate');
tests/cases/fourslash/annotateWithTypeFromJSDoc6.ts
-1
View File
@@ -9,7 +9,6 @@
verify.applicableRefactorAvailableAtMarker('1');
verify.fileAfterApplyingRefactorAtMarker('1',
`declare class C {
/** @type {number | null} */
/** @type {number | null} */
p: number | null;
}`, 'Annotate with type from JSDoc', 'annotate');