getTokenAtPosition: default includeJsDocComment to true

Andy Hanson · Andy Hanson · commit 8bab5860a681 · 2018-06-18T09:07:20.000-07:00
diff --git a/src/services/breakpoints.ts b/src/services/breakpoints.ts
@@ -9,7 +9,7 @@ namespace ts.BreakpointResolver {
             return undefined;
         }
 
-        let tokenAtLocation = getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false);
+        let tokenAtLocation = getTokenAtPosition(sourceFile, position);
         const lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
         if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart(sourceFile)).line > lineOfPosition) {
             // Get previous token if the token is returned starts on new line
diff --git a/src/services/codefixes/addMissingInvocationForDecorator.ts b/src/services/codefixes/addMissingInvocationForDecorator.ts
@@ -13,7 +13,7 @@ namespace ts.codefix {
     });
 
     function makeChange(changeTracker: textChanges.ChangeTracker, sourceFile: SourceFile, pos: number) {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         const decorator = findAncestor(token, isDecorator)!;
         Debug.assert(!!decorator, "Expected position to be owned by a decorator.");
         const replacement = createCall(decorator.expression, /*typeArguments*/ undefined, /*argumentsArray*/ undefined);
diff --git a/src/services/codefixes/annotateWithTypeFromJSDoc.ts b/src/services/codefixes/annotateWithTypeFromJSDoc.ts
@@ -18,7 +18,7 @@ namespace ts.codefix {
     });
 
     function getDeclaration(file: SourceFile, pos: number): DeclarationWithType | undefined {
-        const name = getTokenAtPosition(file, pos, /*includeJsDocComment*/ false);
+        const name = getTokenAtPosition(file, pos);
         // For an arrow function with no name, 'name' lands on the first parameter.
         return tryCast(isParameter(name.parent) ? name.parent.parent : name.parent, parameterShouldGetTypeFromJSDoc);
     }
diff --git a/src/services/codefixes/convertFunctionToEs6Class.ts b/src/services/codefixes/convertFunctionToEs6Class.ts
@@ -14,7 +14,7 @@ namespace ts.codefix {
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, position: number, checker: TypeChecker): void {
         const deletedNodes: { node: Node, inList: boolean }[] = [];
-        const ctorSymbol = checker.getSymbolAtLocation(getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false))!;
+        const ctorSymbol = checker.getSymbolAtLocation(getTokenAtPosition(sourceFile, position))!;
 
         if (!ctorSymbol || !(ctorSymbol.flags & (SymbolFlags.Function | SymbolFlags.Variable))) {
             // Bad input
diff --git a/src/services/codefixes/convertToMappedObjectType.ts b/src/services/codefixes/convertToMappedObjectType.ts
@@ -25,7 +25,7 @@ namespace ts.codefix {
 
     interface Info { readonly indexSignature: IndexSignatureDeclaration; readonly container: FixableDeclaration; }
     function getInfo(sourceFile: SourceFile, pos: number): Info | undefined {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         const indexSignature = cast(token.parent.parent, isIndexSignatureDeclaration);
         if (isClassDeclaration(indexSignature.parent)) return undefined;
         const container = isInterfaceDeclaration(indexSignature.parent) ? indexSignature.parent : cast(indexSignature.parent.parent, isTypeAliasDeclaration);
diff --git a/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts b/src/services/codefixes/correctQualifiedNameToIndexedAccessType.ts
@@ -21,7 +21,7 @@ namespace ts.codefix {
     });
 
     function getQualifiedName(sourceFile: SourceFile, pos: number): QualifiedName & { left: Identifier } | undefined {
-        const qualifiedName = findAncestor(getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ true), isQualifiedName)!;
+        const qualifiedName = findAncestor(getTokenAtPosition(sourceFile, pos), isQualifiedName)!;
         Debug.assert(!!qualifiedName, "Expected position to be owned by a qualified name.");
         return isIdentifier(qualifiedName.left) ? qualifiedName as QualifiedName & { left: Identifier } : undefined;
     }
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
@@ -52,7 +52,7 @@ namespace ts.codefix {
         // The identifier of the missing property. eg:
         // this.missing = 1;
         //      ^^^^^^^
-        const token = getTokenAtPosition(tokenSourceFile, tokenPos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(tokenSourceFile, tokenPos);
         if (!isIdentifier(token)) {
             return undefined;
         }
diff --git a/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts b/src/services/codefixes/fixAddModuleReferTypeMissingTypeof.ts
@@ -17,7 +17,7 @@ namespace ts.codefix {
     });
 
     function getImportTypeNode(sourceFile: SourceFile, pos: number): ImportTypeNode {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         Debug.assert(token.kind === SyntaxKind.ImportKeyword);
         Debug.assert(token.parent.kind === SyntaxKind.ImportType);
         return <ImportTypeNode>token.parent;
diff --git a/src/services/codefixes/fixAwaitInSyncFunction.ts b/src/services/codefixes/fixAwaitInSyncFunction.ts
@@ -34,7 +34,7 @@ namespace ts.codefix {
     }
 
     function getNodes(sourceFile: SourceFile, start: number): { insertBefore: Node, returnType: TypeNode | undefined } | undefined {
-        const token = getTokenAtPosition(sourceFile, start, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, start);
         const containingFunction = getContainingFunction(token);
         if (!containingFunction) {
             return;
diff --git a/src/services/codefixes/fixCannotFindModule.ts b/src/services/codefixes/fixCannotFindModule.ts
@@ -28,7 +28,7 @@ namespace ts.codefix {
     }
 
     function getTypesPackageNameToInstall(host: LanguageServiceHost, sourceFile: SourceFile, pos: number, diagCode: number): string | undefined {
-        const moduleName = cast(getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false), isStringLiteral).text;
+        const moduleName = cast(getTokenAtPosition(sourceFile, pos), isStringLiteral).text;
         const { packageName } = getPackageName(moduleName);
         return diagCode === errorCodeCannotFindModule
             ? (JsTyping.nodeCoreModules.has(packageName) ? "@types/node" : undefined)
diff --git a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
@@ -28,7 +28,7 @@ namespace ts.codefix {
     function getClass(sourceFile: SourceFile, pos: number): ClassLikeDeclaration {
         // Token is the identifier in the case of a class declaration
         // or the class keyword token in the case of a class expression.
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         return cast(token.parent, isClassLike);
     }
 
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -29,7 +29,7 @@ namespace ts.codefix {
     });
 
     function getClass(sourceFile: SourceFile, pos: number): ClassLikeDeclaration {
-        return Debug.assertDefined(getContainingClass(getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false)));
+        return Debug.assertDefined(getContainingClass(getTokenAtPosition(sourceFile, pos)));
     }
 
     function symbolPointsToNonPrivateMember (symbol: Symbol) {
diff --git a/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts b/src/services/codefixes/fixClassSuperMustPrecedeThisAccess.ts
@@ -33,7 +33,7 @@ namespace ts.codefix {
     }
 
     function getNodes(sourceFile: SourceFile, pos: number): { readonly constructor: ConstructorDeclaration, readonly superCall: ExpressionStatement } | undefined {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         if (token.kind !== SyntaxKind.ThisKeyword) return undefined;
         const constructor = getContainingFunction(token) as ConstructorDeclaration;
         const superCall = findSuperCall(constructor.body!);
diff --git a/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts b/src/services/codefixes/fixConstructorForDerivedNeedSuperCall.ts
@@ -16,7 +16,7 @@ namespace ts.codefix {
     });
 
     function getNode(sourceFile: SourceFile, pos: number): ConstructorDeclaration {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         Debug.assert(token.kind === SyntaxKind.ConstructorKeyword);
         return token.parent as ConstructorDeclaration;
     }
diff --git a/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts b/src/services/codefixes/fixExtendsInterfaceBecomesImplements.ts
@@ -20,7 +20,7 @@ namespace ts.codefix {
     });
 
     function getNodes(sourceFile: SourceFile, pos: number) {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         const heritageClauses = getContainingClass(token)!.heritageClauses!;
         const extendsToken = heritageClauses[0].getFirstToken()!;
         return extendsToken.kind === SyntaxKind.ExtendsKeyword ? { extendsToken, heritageClauses } : undefined;
diff --git a/src/services/codefixes/fixForgottenThisPropertyAccess.ts b/src/services/codefixes/fixForgottenThisPropertyAccess.ts
@@ -26,7 +26,7 @@ namespace ts.codefix {
 
     interface Info { readonly node: Identifier; readonly className: string | undefined; }
     function getInfo(sourceFile: SourceFile, pos: number, diagCode: number): Info | undefined {
-        const node = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const node = getTokenAtPosition(sourceFile, pos);
         if (!isIdentifier(node)) return undefined;
         return { node, className: diagCode === didYouMeanStaticMemberCode ? getContainingClass(node)!.name!.text : undefined };
     }
diff --git a/src/services/codefixes/fixInvalidImportSyntax.ts b/src/services/codefixes/fixInvalidImportSyntax.ts
@@ -40,7 +40,7 @@ namespace ts.codefix {
     function getActionsForUsageOfInvalidImport(context: CodeFixContext): CodeFixAction[] | undefined {
         const sourceFile = context.sourceFile;
         const targetKind = Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_Type_0_has_no_compatible_call_signatures.code === context.errorCode ? SyntaxKind.CallExpression : SyntaxKind.NewExpression;
-        const node = findAncestor(getTokenAtPosition(sourceFile, context.span.start, /*includeJsDocComment*/ false), a => a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length)) as CallExpression | NewExpression;
+        const node = findAncestor(getTokenAtPosition(sourceFile, context.span.start), a => a.kind === targetKind && a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length)) as CallExpression | NewExpression;
         if (!node) {
             return [];
         }
@@ -69,7 +69,7 @@ namespace ts.codefix {
 
     function getActionsForInvalidImportLocation(context: CodeFixContext): CodeFixAction[] | undefined {
         const sourceFile = context.sourceFile;
-        const node = findAncestor(getTokenAtPosition(sourceFile, context.span.start, /*includeJsDocComment*/ false), a => a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length));
+        const node = findAncestor(getTokenAtPosition(sourceFile, context.span.start), a => a.getStart() === context.span.start && a.getEnd() === (context.span.start + context.span.length));
         if (!node) {
             return [];
         }
diff --git a/src/services/codefixes/fixJSDocTypes.ts b/src/services/codefixes/fixJSDocTypes.ts
@@ -44,7 +44,7 @@ namespace ts.codefix {
     }
 
     function getInfo(sourceFile: SourceFile, pos: number, checker: TypeChecker): { readonly typeNode: TypeNode, readonly type: Type } | undefined {
-        const decl = findAncestor(getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false), isTypeContainer);
+        const decl = findAncestor(getTokenAtPosition(sourceFile, pos), isTypeContainer);
         const typeNode = decl && decl.type;
         return typeNode && { typeNode, type: checker.getTypeFromTypeNode(typeNode) };
     }
diff --git a/src/services/codefixes/fixSpelling.ts b/src/services/codefixes/fixSpelling.ts
@@ -29,7 +29,7 @@ namespace ts.codefix {
         // This is the identifier of the misspelled word. eg:
         // this.speling = 1;
         //      ^^^^^^^
-        const node = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false); // TODO: GH#15852
+        const node = getTokenAtPosition(sourceFile, pos);
         const checker = context.program.getTypeChecker();
 
         let suggestion: string | undefined;
diff --git a/src/services/codefixes/fixStrictClassInitialization.ts b/src/services/codefixes/fixStrictClassInitialization.ts
@@ -48,7 +48,7 @@ namespace ts.codefix {
     });
 
     function getPropertyDeclaration (sourceFile: SourceFile, pos: number): PropertyDeclaration | undefined {
-        const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, pos);
         return isIdentifier(token) ? cast(token.parent, isPropertyDeclaration) : undefined;
     }
 
diff --git a/src/services/codefixes/fixUnreachableCode.ts b/src/services/codefixes/fixUnreachableCode.ts
@@ -13,7 +13,7 @@ namespace ts.codefix {
     });
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, start: number): void {
-        const token = getTokenAtPosition(sourceFile, start, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, start);
         const statement = findAncestor(token, isStatement)!;
         Debug.assert(statement.getStart(sourceFile) === token.getStart(sourceFile));
 
diff --git a/src/services/codefixes/fixUnusedIdentifier.ts b/src/services/codefixes/fixUnusedIdentifier.ts
@@ -16,7 +16,7 @@ namespace ts.codefix {
         getCodeActions(context) {
             const { errorCode, sourceFile, program } = context;
             const checker = program.getTypeChecker();
-            const startToken = getTokenAtPosition(sourceFile, context.span.start, /*includeJsDocComment*/ false);
+            const startToken = getTokenAtPosition(sourceFile, context.span.start);
 
             const importDecl = tryGetFullImport(startToken);
             if (importDecl) {
@@ -54,7 +54,7 @@ namespace ts.codefix {
             const { sourceFile, program } = context;
             const checker = program.getTypeChecker();
             return codeFixAll(context, errorCodes, (changes, diag) => {
-                const startToken = getTokenAtPosition(sourceFile, diag.start, /*includeJsDocComment*/ false);
+                const startToken = getTokenAtPosition(sourceFile, diag.start);
                 const token = findPrecedingToken(textSpanEnd(diag), diag.file)!;
                 switch (context.fixId) {
                     case fixIdPrefix:
@@ -173,8 +173,8 @@ namespace ts.codefix {
                 const typeParameters = getEffectiveTypeParameterDeclarations(<DeclarationWithTypeParameters>parent.parent);
                 if (typeParameters.length === 1) {
                     const { pos, end } = cast(typeParameters, isNodeArray);
-                    const previousToken = getTokenAtPosition(sourceFile, pos - 1, /*includeJsDocComment*/ false);
-                    const nextToken = getTokenAtPosition(sourceFile, end, /*includeJsDocComment*/ false);
+                    const previousToken = getTokenAtPosition(sourceFile, pos - 1);
+                    const nextToken = getTokenAtPosition(sourceFile, end);
                     Debug.assert(previousToken.kind === SyntaxKind.LessThanToken);
                     Debug.assert(nextToken.kind === SyntaxKind.GreaterThanToken);
 
@@ -251,7 +251,7 @@ namespace ts.codefix {
                 else {
                     // import |d,| * as ns from './file'
                     const start = importClause.name!.getStart(sourceFile);
-                    const nextToken = getTokenAtPosition(sourceFile, importClause.name!.end, /*includeJsDocComment*/ false);
+                    const nextToken = getTokenAtPosition(sourceFile, importClause.name!.end);
                     if (nextToken && nextToken.kind === SyntaxKind.CommaToken) {
                         // shift first non-whitespace position after comma to the start position of the node
                         const end = skipTrivia(sourceFile.text, nextToken.end, /*stopAfterLineBreaks*/ false, /*stopAtComments*/ true);
@@ -285,7 +285,7 @@ namespace ts.codefix {
             // Delete named imports while preserving the default import
             // import d|, * as ns| from './file'
             // import d|, { a }| from './file'
-            const previousToken = getTokenAtPosition(sourceFile, namedBindings.pos - 1, /*includeJsDocComment*/ false);
+            const previousToken = getTokenAtPosition(sourceFile, namedBindings.pos - 1);
             if (previousToken && previousToken.kind === SyntaxKind.CommaToken) {
                 changes.deleteRange(sourceFile, { pos: previousToken.getStart(), end: namedBindings.end });
             }
diff --git a/src/services/codefixes/fixUnusedLabel.ts b/src/services/codefixes/fixUnusedLabel.ts
@@ -13,7 +13,7 @@ namespace ts.codefix {
     });
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, start: number): void {
-        const token = getTokenAtPosition(sourceFile, start, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(sourceFile, start);
         const labeledStatement = cast(token.parent, isLabeledStatement);
         const pos = token.getStart(sourceFile);
         const statementPos = labeledStatement.statement.getStart(sourceFile);
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -326,7 +326,7 @@ namespace ts.codefix {
     }
 
     function getActionsForUMDImport(context: CodeFixContext): CodeFixAction[] | undefined {
-        const token = getTokenAtPosition(context.sourceFile, context.span.start, /*includeJsDocComment*/ false);
+        const token = getTokenAtPosition(context.sourceFile, context.span.start);
         const checker = context.program.getTypeChecker();
 
         let umdSymbol: Symbol | undefined;
@@ -385,7 +385,7 @@ namespace ts.codefix {
         // This will always be an Identifier, since the diagnostics we fix only fail on identifiers.
         const { sourceFile, span, program, cancellationToken } = context;
         const checker = program.getTypeChecker();
-        const symbolToken = getTokenAtPosition(sourceFile, span.start, /*includeJsDocComment*/ false);
+        const symbolToken = getTokenAtPosition(sourceFile, span.start);
         // If we're at `<Foo/>`, we must check if `Foo` is already in scope, and if so, get an import for `React` instead.
         const symbolName = isJsxOpeningLikeElement(symbolToken.parent)
             && symbolToken.parent.tagName === symbolToken
diff --git a/src/services/codefixes/inferFromUsage.ts b/src/services/codefixes/inferFromUsage.ts
@@ -30,7 +30,7 @@ namespace ts.codefix {
                 return undefined; // TODO: GH#20113
             }
 
-            const token = getTokenAtPosition(sourceFile, start, /*includeJsDocComment*/ false);
+            const token = getTokenAtPosition(sourceFile, start);
             let declaration!: Declaration | undefined;
             const changes = textChanges.ChangeTracker.with(context, changes => { declaration = doChange(changes, sourceFile, token, errorCode, program, cancellationToken, /*markSeenseen*/ returnTrue); });
             return changes.length === 0 ? undefined
@@ -41,7 +41,7 @@ namespace ts.codefix {
             const { sourceFile, program, cancellationToken } = context;
             const markSeen = nodeSeenTracker();
             return codeFixAll(context, errorCodes, (changes, err) => {
-                doChange(changes, sourceFile, getTokenAtPosition(err.file, err.start, /*includeJsDocComment*/ false), err.code, program, cancellationToken, markSeen);
+                doChange(changes, sourceFile, getTokenAtPosition(err.file, err.start), err.code, program, cancellationToken, markSeen);
             });
         },
     });
diff --git a/src/services/codefixes/requireInTs.ts b/src/services/codefixes/requireInTs.ts
@@ -21,7 +21,7 @@ namespace ts.codefix {
 
     interface Info { readonly statement: VariableStatement; readonly name: Identifier; readonly required: StringLiteralLike; }
     function getInfo(sourceFile: SourceFile, pos: number): Info {
-        const { parent } = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const { parent } = getTokenAtPosition(sourceFile, pos);
         if (!isRequireCall(parent, /*checkArgumentIsStringLiteralLike*/ true)) throw Debug.failBadSyntaxKind(parent);
         const decl = cast(parent.parent, isVariableDeclaration);
         return { statement: cast(decl.parent.parent, isVariableStatement), name: cast(decl.name, isIdentifier), required: parent.arguments[0] };
diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts
@@ -24,7 +24,7 @@ namespace ts.codefix {
         readonly moduleSpecifier: Expression;
     }
     function getInfo(sourceFile: SourceFile, pos: number): Info | undefined {
-        const name = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
+        const name = getTokenAtPosition(sourceFile, pos);
         if (!isIdentifier(name)) return undefined; // bad input
         const { parent } = name;
         if (isImportEqualsDeclaration(parent) && isExternalModuleReference(parent.moduleReference)) {
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -849,7 +849,7 @@ namespace ts.Completions {
                     return { kind: CompletionDataKind.JsDocTagName };
                 }
                 if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === SyntaxKind.JSDocTypeExpression) {
-                    currentToken = getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ true);
+                    currentToken = getTokenAtPosition(sourceFile, position);
                     if (!currentToken ||
                         (!isDeclarationName(currentToken) &&
                             (currentToken.parent.kind !== SyntaxKind.JSDocPropertyTag ||
diff --git a/src/services/jsDoc.ts b/src/services/jsDoc.ts
diff --git a/src/services/pathCompletions.ts b/src/services/pathCompletions.ts
diff --git a/src/services/refactors/addOrRemoveBracesToArrowFunction.ts b/src/services/refactors/addOrRemoveBracesToArrowFunction.ts
diff --git a/src/services/refactors/convertImport.ts b/src/services/refactors/convertImport.ts
diff --git a/src/services/refactors/extractSymbol.ts b/src/services/refactors/extractSymbol.ts
diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
diff --git a/src/services/utilities.ts b/src/services/utilities.ts

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace ts.BreakpointResolver {`
`9`	`9`	`return undefined;`
`10`	`10`	`}`
`11`	`11`
`12`		`- let tokenAtLocation = getTokenAtPosition(sourceFile, position, /includeJsDocComment/ false);`
	`12`	`+ let tokenAtLocation = getTokenAtPosition(sourceFile, position);`
`13`	`13`	`const lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;`
`14`	`14`	`if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart(sourceFile)).line > lineOfPosition) {`
`15`	`15`	`// Get previous token if the token is returned starts on new line`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace ts.codefix {`
`18`	`18`	`});`
`19`	`19`
`20`	`20`	`function getDeclaration(file: SourceFile, pos: number): DeclarationWithType \| undefined {`
`21`		`- const name = getTokenAtPosition(file, pos, /includeJsDocComment/ false);`
	`21`	`+ const name = getTokenAtPosition(file, pos);`
`22`	`22`	`// For an arrow function with no name, 'name' lands on the first parameter.`
`23`	`23`	`return tryCast(isParameter(name.parent) ? name.parent.parent : name.parent, parameterShouldGetTypeFromJSDoc);`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace ts.codefix {`
`21`	`21`	`});`
`22`	`22`
`23`	`23`	`function getQualifiedName(sourceFile: SourceFile, pos: number): QualifiedName & { left: Identifier } \| undefined {`
`24`		`- const qualifiedName = findAncestor(getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ true), isQualifiedName)!;`
	`24`	`+ const qualifiedName = findAncestor(getTokenAtPosition(sourceFile, pos), isQualifiedName)!;`
`25`	`25`	`Debug.assert(!!qualifiedName, "Expected position to be owned by a qualified name.");`
`26`	`26`	`return isIdentifier(qualifiedName.left) ? qualifiedName as QualifiedName & { left: Identifier } : undefined;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace ts.codefix {`
`52`	`52`	`// The identifier of the missing property. eg:`
`53`	`53`	`// this.missing = 1;`
`54`	`54`	`// ^^^^^^^`
`55`		`- const token = getTokenAtPosition(tokenSourceFile, tokenPos, /includeJsDocComment/ false);`
	`55`	`+ const token = getTokenAtPosition(tokenSourceFile, tokenPos);`
`56`	`56`	`if (!isIdentifier(token)) {`
`57`	`57`	`return undefined;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace ts.codefix {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`function getNodes(sourceFile: SourceFile, start: number): { insertBefore: Node, returnType: TypeNode \| undefined } \| undefined {`
`37`		`- const token = getTokenAtPosition(sourceFile, start, /includeJsDocComment/ false);`
	`37`	`+ const token = getTokenAtPosition(sourceFile, start);`
`38`	`38`	`const containingFunction = getContainingFunction(token);`
`39`	`39`	`if (!containingFunction) {`
`40`	`40`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace ts.codefix {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function getTypesPackageNameToInstall(host: LanguageServiceHost, sourceFile: SourceFile, pos: number, diagCode: number): string \| undefined {`
`31`		`- const moduleName = cast(getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ false), isStringLiteral).text;`
	`31`	`+ const moduleName = cast(getTokenAtPosition(sourceFile, pos), isStringLiteral).text;`
`32`	`32`	`const { packageName } = getPackageName(moduleName);`
`33`	`33`	`return diagCode === errorCodeCannotFindModule`
`34`	`34`	`? (JsTyping.nodeCoreModules.has(packageName) ? "@types/node" : undefined)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ namespace ts.codefix {`
`29`	`29`	`});`
`30`	`30`
`31`	`31`	`function getClass(sourceFile: SourceFile, pos: number): ClassLikeDeclaration {`
`32`		`- return Debug.assertDefined(getContainingClass(getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ false)));`
	`32`	`+ return Debug.assertDefined(getContainingClass(getTokenAtPosition(sourceFile, pos)));`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`function symbolPointsToNonPrivateMember (symbol: Symbol) {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace ts.codefix {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`function getNodes(sourceFile: SourceFile, pos: number): { readonly constructor: ConstructorDeclaration, readonly superCall: ExpressionStatement } \| undefined {`
`36`		`- const token = getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ false);`
	`36`	`+ const token = getTokenAtPosition(sourceFile, pos);`
`37`	`37`	`if (token.kind !== SyntaxKind.ThisKeyword) return undefined;`
`38`	`38`	`const constructor = getContainingFunction(token) as ConstructorDeclaration;`
`39`	`39`	`const superCall = findSuperCall(constructor.body!);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace ts.codefix {`
`16`	`16`	`});`
`17`	`17`
`18`	`18`	`function getNode(sourceFile: SourceFile, pos: number): ConstructorDeclaration {`
`19`		`- const token = getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ false);`
	`19`	`+ const token = getTokenAtPosition(sourceFile, pos);`
`20`	`20`	`Debug.assert(token.kind === SyntaxKind.ConstructorKeyword);`
`21`	`21`	`return token.parent as ConstructorDeclaration;`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ namespace ts.codefix {`
`26`	`26`
`27`	`27`	`interface Info { readonly node: Identifier; readonly className: string \| undefined; }`
`28`	`28`	`function getInfo(sourceFile: SourceFile, pos: number, diagCode: number): Info \| undefined {`
`29`		`- const node = getTokenAtPosition(sourceFile, pos, /includeJsDocComment/ false);`
	`29`	`+ const node = getTokenAtPosition(sourceFile, pos);`
`30`	`30`	`if (!isIdentifier(node)) return undefined;`
`31`	`31`	`return { node, className: diagCode === didYouMeanStaticMemberCode ? getContainingClass(node)!.name!.text : undefined };`
`32`	`32`	`}`