From bac841ef18df797f9b169d011467986ae9a01c4e Mon Sep 17 00:00:00 2001 From: Sang <11912225+sangxxh@users.noreply.github.com> Date: Wed, 8 Sep 2021 06:20:58 +1000 Subject: [PATCH] Fix missing abstract keyword in completion (#45710) * first commit * tests --- src/harness/fourslashInterfaceImpl.ts | 2 ++ src/services/completions.ts | 1 + .../completionsCommentsClass.baseline | 12 ++++++++++ .../completionsCommentsClassMembers.baseline | 24 +++++++++++++++++++ ...completionsCommentsCommentParsing.baseline | 24 +++++++++++++++++++ ...letionsCommentsFunctionExpression.baseline | 24 +++++++++++++++++++ 6 files changed, 87 insertions(+) diff --git a/src/harness/fourslashInterfaceImpl.ts b/src/harness/fourslashInterfaceImpl.ts index 7479d2258c4..c7a2f1d0f03 100644 --- a/src/harness/fourslashInterfaceImpl.ts +++ b/src/harness/fourslashInterfaceImpl.ts @@ -1292,6 +1292,7 @@ namespace FourSlashInterface { "let", "package", "yield", + "abstract", "as", "asserts", "any", @@ -1495,6 +1496,7 @@ namespace FourSlashInterface { "let", "package", "yield", + "abstract", "as", "asserts", "any", diff --git a/src/services/completions.ts b/src/services/completions.ts index 764e64c32e1..2bb3e8f27d2 100644 --- a/src/services/completions.ts +++ b/src/services/completions.ts @@ -2960,6 +2960,7 @@ namespace ts.Completions { || kind === SyntaxKind.ModuleKeyword || kind === SyntaxKind.TypeKeyword || kind === SyntaxKind.NamespaceKeyword + || kind === SyntaxKind.AbstractKeyword || isTypeKeyword(kind) && kind !== SyntaxKind.UndefinedKeyword; case KeywordCompletionFilters.FunctionLikeBodyKeywords: return isFunctionLikeBodyKeyword(kind); diff --git a/tests/baselines/reference/completionsCommentsClass.baseline b/tests/baselines/reference/completionsCommentsClass.baseline index 1285092cc1f..f6625952f04 100644 --- a/tests/baselines/reference/completionsCommentsClass.baseline +++ b/tests/baselines/reference/completionsCommentsClass.baseline @@ -3672,6 +3672,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", diff --git a/tests/baselines/reference/completionsCommentsClassMembers.baseline b/tests/baselines/reference/completionsCommentsClassMembers.baseline index d9fdda9493a..b3fd787cd6b 100644 --- a/tests/baselines/reference/completionsCommentsClassMembers.baseline +++ b/tests/baselines/reference/completionsCommentsClassMembers.baseline @@ -86508,6 +86508,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", @@ -91852,6 +91864,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", diff --git a/tests/baselines/reference/completionsCommentsCommentParsing.baseline b/tests/baselines/reference/completionsCommentsCommentParsing.baseline index 50779f72e86..6da2d73bc7f 100644 --- a/tests/baselines/reference/completionsCommentsCommentParsing.baseline +++ b/tests/baselines/reference/completionsCommentsCommentParsing.baseline @@ -23145,6 +23145,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", @@ -41018,6 +41030,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", diff --git a/tests/baselines/reference/completionsCommentsFunctionExpression.baseline b/tests/baselines/reference/completionsCommentsFunctionExpression.baseline index b5ea10ef6f7..52b00c2a5d8 100644 --- a/tests/baselines/reference/completionsCommentsFunctionExpression.baseline +++ b/tests/baselines/reference/completionsCommentsFunctionExpression.baseline @@ -3579,6 +3579,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword", @@ -8289,6 +8301,18 @@ } ] }, + { + "name": "abstract", + "kind": "keyword", + "kindModifiers": "", + "sortText": "15", + "displayParts": [ + { + "text": "abstract", + "kind": "keyword" + } + ] + }, { "name": "as", "kind": "keyword",