Skip to content

Basic JSX attribute snippet fixes #51855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 9, 2023
Merged

Basic JSX attribute snippet fixes #51855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a466e4
add test & fixes
zardoy Dec 11, 2022
c706a5a
adjust tests
zardoy Dec 11, 2022
84b794c
add tests for #47302
zardoy Dec 13, 2022
5488cfb
Update src/services/completions.ts
zardoy Dec 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/services/completions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2844,8 +2844,10 @@ function getCompletionData(

case SyntaxKind.JsxExpression:
case SyntaxKind.JsxSpreadAttribute:
// For `<div foo={true} [||] ></div>`, `parent` will be `{true}` and `previousToken` will be `}`
if (previousToken.kind === SyntaxKind.CloseBraceToken && currentToken.kind === SyntaxKind.GreaterThanToken) {
// First case is for `<div foo={true} [||] />` or `<div foo={true} [||] ></div>`,
// `parent` will be `{true}` and `previousToken` will be `}`
// Second case is for `<div foo={true} t[||] ></div>`
if (previousToken.kind === SyntaxKind.CloseBraceToken || (previousToken.kind === SyntaxKind.Identifier || previousToken.parent.kind === SyntaxKind.JsxAttribute)) {
isJsxIdentifierExpected = true;
}
break;
Expand Down Expand Up @@ -5173,4 +5175,3 @@ function toUpperCharCode(charCode: number) {
}
return charCode;
}

24 changes: 22 additions & 2 deletions tests/cases/fourslash/jsxAttributeSnippetCompletionClosed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//@Filename: file.tsx
////interface NestedInterface {
//// Foo: NestedInterface;
//// (props: {className?: string}): any;
//// (props: {className?: string, onClick?: () => void}): any;
////}
////
////declare const Foo: NestedInterface;
Expand Down Expand Up @@ -52,12 +52,27 @@
////function fn11() {
//// return <Foo something cla/*11*/ />
////}
////function fn12() {
//// return <Foo something={false} cla/*12*/ />
////}
////function fn13() {
//// return <Foo something={false} /*13*/ foo />
////}
////function fn14() {
//// return <Foo something={false} cla/*14*/ foo />
////}
////function fn15() {
//// return <Foo onC/*15*/="" />
////}
////function fn16() {
//// return <Foo something={false} onC/*16*/="" foo />
////}

var preferences: FourSlashInterface.UserPreferences = {
jsxAttributeCompletionStyle: "braces",
includeCompletionsWithSnippetText: true,
includeCompletionsWithInsertText: true,
};
};

verify.completions(
{ marker: "1", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
Expand All @@ -71,4 +86,9 @@ verify.completions(
{ marker: "9", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "10", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "11", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "12", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "13", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "14", preferences, includes: { name: "className", insertText: "className={$1}", text: "(property) className?: string", isSnippet: true, sortText: completion.SortText.OptionalMember } },
{ marker: "15", preferences, includes: { name: "onClick", insertText: undefined, text: "(property) onClick?: () => void", isSnippet: undefined, sortText: completion.SortText.OptionalMember } },
{ marker: "16", preferences, includes: { name: "onClick", insertText: undefined, text: "(property) onClick?: () => void", isSnippet: undefined, sortText: completion.SortText.OptionalMember } },
)