microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix(53372): TypeScript cannot auto-complete keyword extends (#53418)

Browse Source
This commit is contained in:
Oleksandr T 2023-03-21 22:12:38 +02:00 committed by GitHub
parent 84a09c762b
commit c5b539dcd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/completions.ts
View File

@ -165,6 +165,7 @@ import {
isInJSFile,
isInRightSideOfInternalImportEqualsDeclaration,
isInString,
isInterfaceDeclaration,
isIntersectionTypeNode,
isJSDoc,
isJSDocAugmentsTag,
@ -4263,9 +4264,9 @@ function getCompletionData(
return isDeclarationName(contextToken)
&& !isShorthandPropertyAssignment(contextToken.parent)
&& !isJsxAttribute(contextToken.parent)
// Don't block completions if we're in `class C /**/`, because we're *past* the end of the identifier and might want to complete `extends`.
// If `contextToken !== previousToken`, this is `class C ex/**/`.
&& !(isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
// Don't block completions if we're in `class C /**/` or `interface I /**/`, because we're *past* the end of the identifier and might want to complete `extends`.
// If `contextToken !== previousToken`, this is `class C ex/**/ or `interface I ex/**/``.
&& !((isClassLike(contextToken.parent) || isInterfaceDeclaration(contextToken.parent)) && (contextToken !== previousToken || position > previousToken.end));
}
function isPreviousPropertyDeclarationTerminated(contextToken: Node, position: number) {

8
tests/cases/fourslash/extendsKeywordCompletion.ts Normal file
View File

@ -0,0 +1,8 @@
/// <reference path="fourslash.ts" />
////export interface B ex/**/
verify.completions({
marker: "",
includes: [{ name: "extends", sortText: completion.SortText.GlobalsOrKeywords }]
});