Merge upstream changes

Author: nathanwhit

internal/checker/checker.go

@@ -9872,7 +9872,7 @@ func (c *Checker) contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node
 					inferenceContext := c.getInferenceContext(node)
 					var instantiatedContextualSignature *Signature
 					if checkMode&CheckModeInferential != 0 {
-						c.inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext)
+						c.inferFromAnnotatedParametersAndReturn(signature, contextualSignature, inferenceContext)
 						restType := c.getEffectiveRestType(contextualSignature)
 						if restType != nil && restType.flags&TypeFlagsTypeParameter != 0 {
 							instantiatedContextualSignature = c.instantiateSignature(contextualSignature, inferenceContext.nonFixingMapper)
@@ -9893,7 +9893,7 @@ func (c *Checker) contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node
 			} else if contextualSignature != nil && node.TypeParameters() == nil && len(contextualSignature.parameters) > len(node.Parameters()) {
 				inferenceContext := c.getInferenceContext(node)
 				if checkMode&CheckModeInferential != 0 {
-					c.inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext)
+					c.inferFromAnnotatedParametersAndReturn(signature, contextualSignature, inferenceContext)
 				}
 			}
 			if contextualSignature != nil && c.getReturnTypeFromAnnotation(node) == nil && signature.resolvedReturnType == nil {
@@ -9940,7 +9940,7 @@ func (c *Checker) checkFunctionExpressionOrObjectLiteralMethodDeferred(node *ast
 	}
 }
 
-func (c *Checker) inferFromAnnotatedParameters(sig *Signature, context *Signature, inferenceContext *InferenceContext) {
+func (c *Checker) inferFromAnnotatedParametersAndReturn(sig *Signature, context *Signature, inferenceContext *InferenceContext) {
 	length := len(sig.parameters) - core.IfElse(signatureHasRestParameter(sig), 1, 0)
 	for i := range length {
 		declaration := sig.parameters[i].ValueDeclaration
@@ -9951,6 +9951,13 @@ func (c *Checker) inferFromAnnotatedParameters(sig *Signature, context *Signatur
 			c.inferTypes(inferenceContext.inferences, source, target, InferencePriorityNone, false)
 		}
 	}
+	if declaration := sig.Declaration(); declaration != nil {
+		if returnTypeNode := declaration.Type(); returnTypeNode != nil {
+			source := c.getTypeFromTypeNode(returnTypeNode)
+			target := c.getReturnTypeOfSignature(context)
+			c.inferTypes(inferenceContext.inferences, source, target, InferencePriorityNone, false)
+		}
+	}
 }
 
 // Return the contextual signature for a given expression node. A contextual type provides a

internal/checker/flow.go

@@ -1427,7 +1427,7 @@ func (c *Checker) getCandidateDiscriminantPropertyAccess(f *FlowState, expr *ast
 		// parameter declared in the same parameter list is a candidate.
 		if ast.IsIdentifier(expr) {
 			symbol := c.getResolvedSymbol(expr)
-			declaration := symbol.ValueDeclaration
+			declaration := c.getExportSymbolOfValueSymbolIfExported(symbol).ValueDeclaration
 			if declaration != nil && (ast.IsBindingElement(declaration) || ast.IsParameter(declaration)) && f.reference == declaration.Parent && declaration.Initializer() == nil && !hasDotDotDotToken(declaration) {
 				return declaration
 			}

internal/checker/relater.go

@@ -3298,6 +3298,22 @@ func (r *Relater) structuredTypeRelatedToWorker(source *Type, target *Type, repo
 					return result
 				}
 			}
+		case source.flags&TypeFlagsTemplateLiteral != 0:
+			if slices.Equal(source.AsTemplateLiteralType().texts, target.AsTemplateLiteralType().texts) {
+				result = TernaryTrue
+				for i, sourceType := range source.AsTemplateLiteralType().types {
+					targetType := target.AsTemplateLiteralType().types[i]
+					result &= r.isRelatedTo(sourceType, targetType, RecursionFlagsBoth, false /*reportErrors*/)
+					if result == TernaryFalse {
+						return result
+					}
+				}
+				return result
+			}
+		case source.flags&TypeFlagsStringMapping != 0:
+			if source.AsStringMappingType().Symbol() == target.AsStringMappingType().Symbol() {
+				return r.isRelatedTo(source.AsStringMappingType().target, target.AsStringMappingType().target, RecursionFlagsBoth, false /*reportErrors*/)
+			}
 		}
 		if source.flags&TypeFlagsObject == 0 {
 			return TernaryFalse

internal/fourslash/_scripts/failingTests.txt

@@ -168,13 +168,9 @@ TestDoubleUnderscoreCompletions
 TestEditJsdocType
 TestExportDefaultClass
 TestExportDefaultFunction
-TestFindAllReferencesDynamicImport1
-TestFindAllReferencesUmdModuleAsGlobalConst
-TestFindAllRefsExportEquals
 TestFindAllRefsForDefaultExport03
 TestFindAllRefsForModule
 TestFindAllRefsModuleDotExports
-TestFindAllRefs_importType_typeofImport
 TestFindReferencesBindingPatternInJsdocNoCrash1
 TestFindReferencesBindingPatternInJsdocNoCrash2
 TestGenericCombinatorWithConstraints1
@@ -262,7 +258,6 @@ TestJsdocTypedefTag
 TestJsdocTypedefTag2
 TestJsdocTypedefTagNamespace
 TestJsdocTypedefTagServices
-TestJsxFindAllReferencesOnRuntimeImportWithPaths1
 TestLetQuickInfoAndCompletionList
 TestLocalFunction
 TestMemberListInReopenedEnum
@@ -436,7 +431,6 @@ TestQuickinfoWrongComment
 TestRecursiveInternalModuleImport
 TestReferencesForStatementKeywords
 TestReferencesInEmptyFile
-TestReferencesIsAvailableThroughGlobalNoCrash
 TestRegexDetection
 TestRenameForAliasingExport02
 TestRenameFromNodeModulesDep1
@@ -461,7 +455,6 @@ TestTripleSlashRefPathCompletionExtensionsAllowJSFalse
 TestTripleSlashRefPathCompletionExtensionsAllowJSTrue
 TestTripleSlashRefPathCompletionHiddenFile
 TestTripleSlashRefPathCompletionRootdirs
-TestTslibFindAllReferencesOnRuntimeImportWithPaths1
 TestTsxCompletion14
 TestTsxCompletion15
 TestTsxCompletionNonTagLessThan

internal/fourslash/tests/documentHighlightImportPath_test.go

@@ -0,0 +1,21 @@
+package fourslash_test
+
+import (
+	"testing"
+
+	"github.com/microsoft/typescript-go/internal/fourslash"
+	"github.com/microsoft/typescript-go/internal/testutil"
+)
+
+func TestDocumentHighlightImportPath(t *testing.T) {
+	t.Parallel()
+
+	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
+	const content = `// @Filename: /a.ts
+export const x = 0;
+
+// @Filename: /b.ts
+import { x } from "[|./a|]";`
+	f := fourslash.NewFourslash(t, nil /*capabilities*/, content)
+	f.VerifyBaselineDocumentHighlights(t, nil /*preferences*/, f.Ranges()[0])
+}

internal/fourslash/tests/gen/findAllReferencesDynamicImport1_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestFindAllReferencesDynamicImport1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: foo.ts
 export function foo() { return "foo"; }

internal/fourslash/tests/gen/findAllReferencesUmdModuleAsGlobalConst_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestFindAllReferencesUmdModuleAsGlobalConst(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /node_modules/@types/three/three-core.d.ts
 export class Vector3 {

internal/fourslash/tests/gen/findAllRefsExportEquals_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestFindAllRefsExportEquals(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /a.ts
 type /*0*/T = number;

internal/fourslash/tests/gen/findAllRefs_importType_typeofImport_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestFindAllRefs_importType_typeofImport(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: /a.ts
 export const x = 0;

internal/fourslash/tests/gen/jsxFindAllReferencesOnRuntimeImportWithPaths1_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestJsxFindAllReferencesOnRuntimeImportWithPaths1(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @Filename: project/src/foo.ts
 import * as x from /**/"@foo/dir/jsx-runtime";