Merge branch 'main' into jabaile/symbol-tweaks

Author: jakebailey

.github/workflows/ci.yml

@@ -31,6 +31,14 @@ jobs:
         with:
           cache-name: build
 
+      # Avoid duplicate PR annotations.
+      - name: Disable PR annotations
+        run: |
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=go::"
+
       - run: npm ci
 
       - run: npx hereby build
@@ -53,6 +61,7 @@ jobs:
         config:
           - os: ubuntu-latest
             coverage: true
+            main: true
           - os: windows-latest
             coverage: true
             skip: ${{ github.event_name == 'merge_group' }}
@@ -106,6 +115,15 @@ jobs:
         with:
           cache-name: test
 
+      # Avoid duplicate PR annotations.
+      - if: ${{ ! matrix.config.main }}
+        name: Disable PR annotations
+        run: |
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=go::"
+
       - run: npm ci
 
       - run: go install gotest.tools/gotestsum@latest
@@ -155,6 +173,7 @@ jobs:
       matrix:
         config:
           - os: ubuntu-latest
+            main: true
           - os: windows-latest
             skip: ${{ github.event_name == 'merge_group' }}
           - os: macos-latest
@@ -182,6 +201,15 @@ jobs:
         with:
           cache-name: lint${{ (matrix.config.noembed && '-noembed') || ''}}
 
+      # Avoid duplicate PR annotations.
+      - if: ${{ ! matrix.config.main }}
+        name: Disable PR annotations
+        run: |
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=go::"
+
       - run: npm ci
 
       - run: npx hereby lint
@@ -245,6 +273,14 @@ jobs:
         with:
           cache-name: smoke
 
+      # Avoid duplicate PR annotations.
+      - name: Disable PR annotations
+        run: |
+          echo "::remove-matcher owner=eslint-compact::"
+          echo "::remove-matcher owner=eslint-stylish::"
+          echo "::remove-matcher owner=tsc::"
+          echo "::remove-matcher owner=go::"
+
       - run: npm ci
 
       - run: npx hereby build --race

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/dlclark/regexp2 v1.11.5
 	github.com/go-json-experiment/json v0.0.0-20250517221953-25912455fbc8
 	github.com/google/go-cmp v0.7.0
-	github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c
+	github.com/peter-evans/patience v0.3.0
 	golang.org/x/sync v0.14.0
 	golang.org/x/sys v0.33.0
 	gotest.tools/v3 v3.5.2

go.sum

@@ -12,8 +12,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/matryer/moq v0.5.3 h1:4femQCFmBUwFPYs8VfM5ID7AI67/DTEDRBbTtSWy7GU=
 github.com/matryer/moq v0.5.3/go.mod h1:8288Qkw7gMZhUP3cIN86GG7g5p9jRuZH8biXLW4RXvQ=
-github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c h1:8TRxBMS/YsupXoOiGKHr9ZOXo+5DezGWPgBAhBHEHto=
-github.com/pkg/diff v0.0.0-20241224192749-4e6772a4315c/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/peter-evans/patience v0.3.0 h1:rX0JdJeepqdQl1Sk9c9uvorjYYzL2TfgLX1adqYm9cA=
+github.com/peter-evans/patience v0.3.0/go.mod h1:Kmxu5sY1NmBLFSStvXjX1wS9mIv7wMcP/ubucyMOAu0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=

internal/ast/ast.go

@@ -1796,6 +1796,8 @@ type (
 	ObjectLiteralExpressionNode     = Node
 	ConstructorDeclarationNode      = Node
 	NamedExportsNode                = Node
+	UnionType                       = Node
+	LiteralType                     = Node
 )
 
 type (

internal/ast/utilities.go

@@ -2933,3 +2933,15 @@ func GetPropertyNameForPropertyNameNode(name *Node) string {
 	}
 	panic("Unhandled case in getPropertyNameForPropertyNameNode")
 }
+
+func IsStringTextContainingNode(node *Node) bool {
+	return node.Kind == KindStringLiteral || IsTemplateLiteralKind(node.Kind)
+}
+
+func IsTemplateLiteralKind(kind Kind) bool {
+	return KindFirstTemplateToken <= kind && kind <= KindLastTemplateToken
+}
+
+func IsTemplateLiteralToken(node *Node) bool {
+	return IsTemplateLiteralKind(node.Kind)
+}

internal/checker/exports.go

@@ -52,3 +52,7 @@ func GetDeclarationModifierFlagsFromSymbol(s *ast.Symbol) ast.ModifierFlags {
 func (c *Checker) WasCanceled() bool {
 	return c.wasCanceled
 }
+
+func (c *Checker) GetBaseConstraintOfType(t *Type) *Type {
+	return c.getBaseConstraintOfType(t)
+}

internal/checker/services.go

@@ -341,6 +341,7 @@ func (c *Checker) GetRootSymbols(symbol *ast.Symbol) []*ast.Symbol {
 		for _, root := range roots {
 			result = append(result, c.GetRootSymbols(root)...)
 		}
+		return result
 	}
 	return []*ast.Symbol{symbol}
 }
@@ -481,3 +482,31 @@ func (c *Checker) GetJsxIntrinsicTagNamesAt(location *ast.Node) []*ast.Symbol {
 func (c *Checker) GetContextualTypeForJsxAttribute(attribute *ast.JsxAttributeLike) *Type {
 	return c.getContextualTypeForJsxAttribute(attribute, ContextFlagsNone)
 }
+
+func (c *Checker) GetConstantValue(node *ast.Node) any {
+	if node.Kind == ast.KindEnumMember {
+		return c.getEnumMemberValue(node).Value
+	}
+
+	if c.symbolNodeLinks.Get(node).resolvedSymbol == nil {
+		c.checkExpressionCached(node) // ensure cached resolved symbol is set
+	}
+	symbol := c.symbolNodeLinks.Get(node).resolvedSymbol
+	if symbol == nil && ast.IsEntityNameExpression(node) {
+		symbol = c.resolveEntityName(
+			node,
+			ast.SymbolFlagsValue,
+			true,  /*ignoreErrors*/
+			false, /*dontResolveAlias*/
+			nil /*location*/)
+	}
+	if symbol != nil && symbol.Flags&ast.SymbolFlagsEnumMember != 0 {
+		// inline property\index accesses only for const enums
+		member := symbol.ValueDeclaration
+		if ast.IsEnumConst(member.Parent) {
+			return c.getEnumMemberValue(member).Value
+		}
+	}
+
+	return nil
+}

internal/checker/types.go

@@ -680,6 +680,10 @@ func (t *Type) IsClass() bool {
 	return t.objectFlags&ObjectFlagsClass != 0
 }
 
+func (t *Type) IsTypeParameter() bool {
+	return t.flags&TypeFlagsTypeParameter != 0
+}
+
 // TypeData
 
 type TypeData interface {
@@ -1216,3 +1220,6 @@ var LanguageFeatureMinimumTarget = LanguageFeatureMinimumTargetMap{
 	ClassAndClassElementDecorators:    core.ScriptTargetESNext,
 	RegularExpressionFlagsUnicodeSets: core.ScriptTargetESNext,
 }
+
+// Aliases for types
+type StringLiteralType = Type

internal/ls/completions.go

@@ -256,7 +256,8 @@ const (
 // true otherwise.
 type uniqueNamesMap = map[string]bool
 
-type literalValue any // string | jsnum.Number | PseudoBigInt
+// string | jsnum.Number | PseudoBigInt
+type literalValue any
 
 type globalsSearch int
 
@@ -276,7 +277,7 @@ func (l *LanguageService) getCompletionsAtPosition(
 	clientOptions *lsproto.CompletionClientCapabilities,
 ) *lsproto.CompletionList {
 	_, previousToken := getRelevantTokens(position, file)
-	if context.TriggerCharacter != nil && !isInString(file, position, previousToken) && !isValidTrigger(file, *context.TriggerCharacter, previousToken, position) {
+	if context.TriggerCharacter != nil && !IsInString(file, position, previousToken) && !isValidTrigger(file, *context.TriggerCharacter, previousToken, position) {
 		return nil
 	}
 
@@ -294,7 +295,19 @@ func (l *LanguageService) getCompletionsAtPosition(
 
 	// !!! see if incomplete completion list and continue or clean
 
-	// !!! string literal completions
+	stringCompletions := l.getStringLiteralCompletions(
+		ctx,
+		file,
+		position,
+		previousToken,
+		compilerOptions,
+		program,
+		preferences,
+		clientOptions,
+	)
+	if stringCompletions != nil {
+		return stringCompletions
+	}
 
 	if previousToken != nil && ast.IsBreakOrContinueStatement(previousToken.Parent) &&
 		(previousToken.Kind == ast.KindBreakKeyword ||
@@ -1479,10 +1492,11 @@ func (l *LanguageService) completionInfoFromData(
 	clientOptions *lsproto.CompletionClientCapabilities,
 ) *lsproto.CompletionList {
 	keywordFilters := data.keywordFilters
-	symbols := data.symbols
 	isNewIdentifierLocation := data.isNewIdentifierLocation
 	contextToken := data.contextToken
 	literals := data.literals
+	typeChecker, done := program.GetTypeCheckerForFile(ctx, file)
+	defer done()
 
 	// Verify if the file is JSX language variant
 	if ast.GetLanguageVariant(file.ScriptKind) == core.LanguageVariantJSX {
@@ -1498,17 +1512,31 @@ func (l *LanguageService) completionInfoFromData(
 	if caseClause != nil &&
 		(contextToken.Kind == ast.KindCaseKeyword ||
 			ast.IsNodeDescendantOf(contextToken, caseClause.Expression())) {
-		// !!! switch completions
+		tracker := newCaseClauseTracker(typeChecker, caseClause.Parent.AsCaseBlock().Clauses.Nodes)
+		literals = core.Filter(literals, func(literal literalValue) bool {
+			return !tracker.hasValue(literal)
+		})
+		data.symbols = core.Filter(data.symbols, func(symbol *ast.Symbol) bool {
+			if symbol.ValueDeclaration != nil && ast.IsEnumMember(symbol.ValueDeclaration) {
+				value := typeChecker.GetConstantValue(symbol.ValueDeclaration)
+				if value != nil && tracker.hasValue(value) {
+					return false
+				}
+			}
+			return true
+		})
 	}
 
 	isChecked := isCheckedFile(file, compilerOptions)
-	if isChecked && !isNewIdentifierLocation && len(symbols) == 0 && keywordFilters == KeywordCompletionFiltersNone {
+	if isChecked && !isNewIdentifierLocation && len(data.symbols) == 0 && keywordFilters == KeywordCompletionFiltersNone {
 		return nil
 	}
 
+	optionalReplacementSpan := l.getOptionalReplacementSpan(data.location, file)
 	uniqueNames, sortedEntries := l.getCompletionEntriesFromSymbols(
 		ctx,
 		data,
+		optionalReplacementSpan,
 		nil, /*replacementToken*/
 		position,
 		file,
@@ -1570,6 +1598,7 @@ func (l *LanguageService) completionInfoFromData(
 func (l *LanguageService) getCompletionEntriesFromSymbols(
 	ctx context.Context,
 	data *completionDataData,
+	optionalReplacementSpan *lsproto.Range,
 	replacementToken *ast.Node,
 	position int,
 	file *ast.SourceFile,
@@ -1584,7 +1613,6 @@ func (l *LanguageService) getCompletionEntriesFromSymbols(
 	typeChecker, done := program.GetTypeCheckerForFile(ctx, file)
 	defer done()
 	isMemberCompletion := isMemberCompletionKind(data.completionKind)
-	optionalReplacementSpan := getOptionalReplacementSpan(data.location, file)
 	// Tracks unique names.
 	// Value is set to false for global variables or completions from external module exports, because we can have multiple of those;
 	// true otherwise. Based on the order we add things we will always see locals first, then globals, then module exports.
@@ -1708,7 +1736,7 @@ func (l *LanguageService) createCompletionItem(
 	preferences *UserPreferences,
 	clientOptions *lsproto.CompletionClientCapabilities,
 	isMemberCompletion bool,
-	optionalReplacementSpan *core.TextRange,
+	optionalReplacementSpan *lsproto.Range,
 ) *lsproto.CompletionItem {
 	contextToken := data.contextToken
 	var insertText string
@@ -3110,12 +3138,11 @@ func getJSCompletionEntries(
 	return sortedEntries
 }
 
-func getOptionalReplacementSpan(location *ast.Node, file *ast.SourceFile) *core.TextRange {
+func (l *LanguageService) getOptionalReplacementSpan(location *ast.Node, file *ast.SourceFile) *lsproto.Range {
 	// StringLiteralLike locations are handled separately in stringCompletions.ts
 	if location != nil && location.Kind == ast.KindIdentifier {
 		start := astnav.GetStartOfNode(location, file, false /*includeJSDoc*/)
-		textRange := core.NewTextRange(start, location.End())
-		return &textRange
+		return l.createLspRangeFromBounds(start, location.End(), file)
 	}
 	return nil
 }
@@ -3934,7 +3961,7 @@ func (l *LanguageService) getJsxClosingTagCompletion(
 	tagName := jsxClosingElement.Parent.AsJsxElement().OpeningElement.TagName()
 	closingTag := tagName.Text()
 	fullClosingTag := closingTag + core.IfElse(hasClosingAngleBracket, "", ">")
-	optionalReplacementSpan := core.NewTextRange(jsxClosingElement.TagName().Pos(), jsxClosingElement.TagName().End())
+	optionalReplacementSpan := l.createLspRangeFromNode(jsxClosingElement.TagName(), file)
 	defaultCommitCharacters := getDefaultCommitCharacters(false /*isNewIdentifierLocation*/)
 
 	item := l.createLSPCompletionItem(
@@ -3945,7 +3972,7 @@ func (l *LanguageService) getJsxClosingTagCompletion(
 		ScriptElementKindClassElement,
 		core.Set[ScriptElementKindModifier]{}, /*kindModifiers*/
 		nil,                                   /*replacementSpan*/
-		&optionalReplacementSpan,
+		optionalReplacementSpan,
 		nil, /*commitCharacters*/
 		nil, /*labelDetails*/
 		file,
@@ -3975,7 +4002,7 @@ func (l *LanguageService) createLSPCompletionItem(
 	elementKind ScriptElementKind,
 	kindModifiers core.Set[ScriptElementKindModifier],
 	replacementSpan *lsproto.Range,
-	optionalReplacementSpan *core.TextRange,
+	optionalReplacementSpan *lsproto.Range,
 	commitCharacters *[]string,
 	labelDetails *lsproto.CompletionItemLabelDetails,
 	file *ast.SourceFile,
@@ -4001,8 +4028,11 @@ func (l *LanguageService) createLSPCompletionItem(
 	} else {
 		// Ported from vscode ts extension.
 		if optionalReplacementSpan != nil && ptrIsTrue(clientOptions.CompletionItem.InsertReplaceSupport) {
-			insertRange := l.createLspRangeFromBounds(optionalReplacementSpan.Pos(), position, file)
-			replaceRange := l.createLspRangeFromBounds(optionalReplacementSpan.Pos(), optionalReplacementSpan.End(), file)
+			insertRange := &lsproto.Range{
+				Start: optionalReplacementSpan.Start,
+				End:   l.createLspPosition(position, file),
+			}
+			replaceRange := optionalReplacementSpan
 			textEdit = &lsproto.TextEditOrInsertReplaceEdit{
 				InsertReplaceEdit: &lsproto.InsertReplaceEdit{
 					NewText: core.IfElse(insertText == "", name, insertText),
@@ -4085,11 +4115,10 @@ func (l *LanguageService) createLSPCompletionItem(
 		// !!! adjust label like vscode does
 	}
 
+	// Client assumes plain text by default.
 	var insertTextFormat *lsproto.InsertTextFormat
 	if isSnippet {
 		insertTextFormat = ptrTo(lsproto.InsertTextFormatSnippet)
-	} else {
-		insertTextFormat = ptrTo(lsproto.InsertTextFormatPlainText)
 	}
 
 	return &lsproto.CompletionItem{