Skip to content

Commit 022d7b1

Browse files
jakebaileytypescript-bot
authored andcommitted
Cherry-pick PR microsoft#47096 into release-4.5
Component commits: 191aa68 Disable JSX attribute snippet if attribute is acutally the HTML tag 1786d5e Add more tests of text before and after 7ac5e59 Big comment
1 parent 002c79b commit 022d7b1

File tree

2 files changed

+79
-1
lines changed

2 files changed

+79
-1
lines changed

Diff for: src/services/completions.ts

+18-1
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,25 @@ namespace ts.Completions {
713713
}
714714
}
715715

716+
// Before offering up a JSX attribute snippet, ensure that we aren't potentially completing
717+
// a tag name; this may appear as an attribute after the "<" when the tag has not yet been
718+
// closed, as in:
719+
//
720+
// return <>
721+
// foo <butto|
722+
// </>
723+
//
724+
// We can detect this case by checking if both:
725+
//
726+
// 1. The location is "<", so we are completing immediately after it.
727+
// 2. The "<" has the same position as its parent, so is not a binary expression.
716728
const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, location);
717-
if (kind === ScriptElementKind.jsxAttribute && preferences.includeCompletionsWithSnippetText && preferences.jsxAttributeCompletionStyle && preferences.jsxAttributeCompletionStyle !== "none") {
729+
if (
730+
kind === ScriptElementKind.jsxAttribute
731+
&& (location.kind !== SyntaxKind.LessThanToken || location.pos !== location.parent.pos)
732+
&& preferences.includeCompletionsWithSnippetText
733+
&& preferences.jsxAttributeCompletionStyle
734+
&& preferences.jsxAttributeCompletionStyle !== "none") {
718735
let useBraces = preferences.jsxAttributeCompletionStyle === "braces";
719736
const type = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
720737

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/// <reference path="fourslash.ts" />
2+
//@Filename: file.tsx
3+
////declare namespace JSX {
4+
//// interface IntrinsicElements {
5+
//// button: any;
6+
//// div: any;
7+
//// }
8+
////}
9+
////function fn() {
10+
//// return <>
11+
//// <butto/*1*/
12+
//// </>;
13+
////}
14+
////function fn2() {
15+
//// return <>
16+
//// preceding junk <butto/*2*/
17+
//// </>;
18+
////}
19+
////function fn3() {
20+
//// return <>
21+
//// <butto/*3*/ style=""
22+
//// </>;
23+
////}
24+
25+
26+
27+
verify.completions(
28+
{
29+
marker: "1",
30+
includes: [
31+
{ name: "button", insertText: undefined, isSnippet: undefined }
32+
],
33+
preferences: {
34+
jsxAttributeCompletionStyle: "braces",
35+
includeCompletionsWithSnippetText: true,
36+
includeCompletionsWithInsertText: true,
37+
}
38+
},
39+
{
40+
marker: "2",
41+
includes: [
42+
{ name: "button", insertText: undefined, isSnippet: undefined }
43+
],
44+
preferences: {
45+
jsxAttributeCompletionStyle: "braces",
46+
includeCompletionsWithSnippetText: true,
47+
includeCompletionsWithInsertText: true,
48+
}
49+
},
50+
{
51+
marker: "3",
52+
includes: [
53+
{ name: "button", insertText: undefined, isSnippet: undefined }
54+
],
55+
preferences: {
56+
jsxAttributeCompletionStyle: "braces",
57+
includeCompletionsWithSnippetText: true,
58+
includeCompletionsWithInsertText: true,
59+
}
60+
},
61+
);

0 commit comments

Comments
 (0)