-
Notifications
You must be signed in to change notification settings - Fork 13.2k
Don't block completion after end of type parameters in JSX elements #47501
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.
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
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
tests/cases/fourslash/jsxAttributeSnippetCompletionAfterTypeArgs.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| /// <reference path="fourslash.ts" /> | ||
| //@Filename: file.tsx | ||
|
|
||
| ////declare const React: any; | ||
| //// | ||
| ////namespace JSX { | ||
| //// export interface IntrinsicElements { | ||
| //// div: any; | ||
| //// } | ||
| ////} | ||
| //// | ||
| ////function GenericElement<T>(props: {xyz?: T}) { | ||
| //// return <></> | ||
| ////} | ||
| //// | ||
| ////function fn1() { | ||
| //// return <div> | ||
| //// <GenericElement<number> /*1*/ /> | ||
| //// </div> | ||
| ////} | ||
| //// | ||
| ////function fn2() { | ||
| //// return <> | ||
| //// <GenericElement<number> /*2*/ /> | ||
| //// </> | ||
| ////} | ||
| ////function fn3() { | ||
| //// return <div> | ||
| //// <GenericElement<number> /*3*/ ></GenericElement> | ||
| //// </div> | ||
| ////} | ||
| //// | ||
| ////function fn4() { | ||
| //// return <> | ||
| //// <GenericElement<number> /*4*/ ></GenericElement> | ||
| //// </> | ||
| ////} | ||
|
|
||
| verify.completions( | ||
| { | ||
| marker: test.markers(), | ||
| includes: { | ||
| name: "xyz", | ||
| insertText: "xyz={$1}", | ||
| text: "(property) xyz?: number", | ||
| isSnippet: true, | ||
| sortText: completion.SortText.OptionalMember | ||
| }, | ||
| preferences: { | ||
| jsxAttributeCompletionStyle: "braces", | ||
| includeCompletionsWithSnippetText: true, | ||
| includeCompletionsWithInsertText: true, | ||
| }, | ||
| }, | ||
| ) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on its own, this fix makes sense to me. How does it relate to the next comment, which says there are two possibilities -- jsxtext inside a
<div>and non-jsxtext inside a type-argument-having<Component<T>? It seems like the second case might be handled entirely by the new code, but I'm not sure.If it is, then the following check could be simplified.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I thought the same thing, but removing it breaks the test added in the original "don't do completions in JsxText" PR; I can't remember if I figured out why or not at this point, though, so can go double check.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like it's the comment that needs to be updated; the second listed possibility is no longer accurate as
locationin this case isn'tGreaterThanToken, it's the entire element. I'll change the comment to reflect that it's only handling the first case.