Skip to content
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

Fix compatibility with TypeScript 5.5 #450

Merged
merged 1 commit into from
Jun 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .changeset/cold-turtles-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@mdx-js/language-service': patch
'@mdx-js/language-server': patch
'@mdx-js/typescript-plugin': patch
'vscode-mdx': patch
---

Solve a regression caused by TypeScript 5.5
2 changes: 1 addition & 1 deletion packages/language-service/lib/virtual-code.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default function MDXContent(props) {
}

// @ts-ignore
/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */
/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */
`

const jsxIndent = '\n '
Expand Down
58 changes: 29 additions & 29 deletions packages/language-service/test/language-plugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ test('create virtual code w/ mdxjsEsm', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -216,7 +216,7 @@ test('create virtual code w/ mdxjsEsm and CRLF', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -332,7 +332,7 @@ test('create virtual code w/o MDX layout in case of named re-export', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -449,7 +449,7 @@ test('create virtual code w/ MDX layout in case of default re-export', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -569,7 +569,7 @@ test('create virtual code w/ MDX layout in case of named and default re-export',
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -689,7 +689,7 @@ test('create virtual code w/ MDX layout in case of default and named re-export',
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -819,7 +819,7 @@ test('create virtual code w/ MDX layout in case of a default exported arrow func
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -954,7 +954,7 @@ test('create virtual code w/ MDX layout in case of a default exported function d
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1071,7 +1071,7 @@ test('create virtual code w/ MDX layout in case of a default exported constant',
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1206,7 +1206,7 @@ test('create virtual code w/ MDX layout and matching argument name', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1345,7 +1345,7 @@ test('create virtual code w/ MDX layout in case of a default export followed by
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1484,7 +1484,7 @@ test('create virtual code w/ MDX layout in case of a default export preceded by
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1599,7 +1599,7 @@ test('create virtual code w/ mdxFlowExpression', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1715,7 +1715,7 @@ test('create virtual code w/ empty mdxFlowExpression', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -1861,7 +1861,7 @@ test('create virtual code w/ prefixed JSX expressions for mdxFlowExpression', ()
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2015,7 +2015,7 @@ test('create virtual code w/ prefixed JSX expressions in attributes', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2188,7 +2188,7 @@ test('create virtual code w/ mdxJsxFlowElement w/ children', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2330,7 +2330,7 @@ test('create virtual code w/ mdxJsxFlowElement w/ blockquote child', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2471,7 +2471,7 @@ test('create virtual code w/ mdxJsxFlowElement w/o children', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2617,7 +2617,7 @@ test('create virtual code w/ mdxJsxTextElement', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2743,7 +2743,7 @@ test('create virtual code w/ mdxTextExpression', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -2865,7 +2865,7 @@ test('create virtual code w/ async mdxTextExpression', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3030,7 +3030,7 @@ test('ignore async functions in props or expressions', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3150,7 +3150,7 @@ test('create virtual code w/ dedented markdown content', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3256,7 +3256,7 @@ test('create virtual code w/ syntax error', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3342,7 +3342,7 @@ test('create virtual code w/ yaml frontmatter', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3474,7 +3474,7 @@ test('update virtual code', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3615,7 +3615,7 @@ test('support checkMdx', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down Expand Up @@ -3715,7 +3715,7 @@ test('support custom jsxImportSource', () => {
'}',
'',
'// @ts-ignore',
'/** @typedef {(0 extends 1 & Props ? {} : Props) & {components?: {}}} MDXContentProps */',
'/** @typedef {(void extends Props ? {} : Props) & {components?: {}}} MDXContentProps */',
''
)
},
Expand Down
Loading