Skip to content

Port completion fixes for JSX scanning #1275

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 1 commit into from
Jun 24, 2025
Merged

Port completion fixes for JSX scanning #1275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 4 deletions internal/ls/completions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ func getCompletionData(program *compiler.Program, typeChecker *checker.Checker,
if parent.Kind == ast.KindJsxElement || parent.Kind == ast.KindJsxOpeningElement {
location = currentToken
}
case ast.KindSlashToken:
case ast.KindLessThanSlashToken:
if parent.Kind == ast.KindJsxSelfClosingElement {
location = currentToken
}
Expand All @@ -460,7 +460,7 @@ func getCompletionData(program *compiler.Program, typeChecker *checker.Checker,

switch parent.Kind {
case ast.KindJsxClosingElement:
if contextToken.Kind == ast.KindSlashToken {
if contextToken.Kind == ast.KindLessThanSlashToken {
isStartingCloseTag = true
location = contextToken
}
Expand Down Expand Up @@ -2432,7 +2432,7 @@ func isValidTrigger(file *ast.SourceFile, triggerCharacter CompletionsTriggerCha
if ast.IsStringLiteralLike(contextToken) {
return tryGetImportFromModuleSpecifier(contextToken) != nil
}
return contextToken.Kind == ast.KindSlashToken && ast.IsJsxClosingElement(contextToken.Parent)
return contextToken.Kind == ast.KindLessThanSlashToken && ast.IsJsxClosingElement(contextToken.Parent)
case " ":
return contextToken != nil && contextToken.Kind == ast.KindImportKeyword && contextToken.Parent.Kind == ast.KindSourceFile
default:
Expand Down Expand Up @@ -3934,7 +3934,7 @@ func (l *LanguageService) getJsxClosingTagCompletion(
switch node.Kind {
case ast.KindJsxClosingElement:
return ast.FindAncestorTrue
case ast.KindSlashToken, ast.KindGreaterThanToken, ast.KindIdentifier, ast.KindPropertyAccessExpression:
case ast.KindLessThanSlashToken, ast.KindGreaterThanToken, ast.KindIdentifier, ast.KindPropertyAccessExpression:
return ast.FindAncestorFalse
default:
return ast.FindAncestorQuit
Expand Down