Move ID error for accessor inference failure from return expression to (both) accessors (#4517)

Author: weswigham

internal/fourslash/_scripts/manualTests.txt

@@ -8,6 +8,8 @@ autoImportPackageRootPathExtension
 autoImportPackageRootPathTypeModule
 autoImportProvider5
 autoImportSymlinkCaseSensitive
+codeFixMissingTypeAnnotationOnExports45-decorators
+codeFixMissingTypeAnnotationOnExports46-decorators-experimental
 completionForStringLiteral_details
 completionForStringLiteralExport
 completionForStringLiteralImport1

…AnnotationOnExports45-decorators_test.go …AnnotationOnExports45-decorators_test.gointernal/fourslash/tests/gen/codeFixMissingTypeAnnotationOnExports45-decorators_test.go renamed to internal/fourslash/tests/manual/codeFixMissingTypeAnnotationOnExports45-decorators_test.go internal/fourslash/tests/gen/codeFixMissingTypeAnnotationOnExports45-decorators_test.go renamed to internal/fourslash/tests/manual/codeFixMissingTypeAnnotationOnExports45-decorators_test.go

@@ -1,6 +1,3 @@
-// Code generated by convertFourslash; DO NOT EDIT.
-// To modify this test, run "npm run makemanual codeFixMissingTypeAnnotationOnExports45-decorators"
-
 package fourslash_test
 
 import (
@@ -11,7 +8,6 @@ import (
 )
 
 func TestCodeFixMissingTypeAnnotationOnExports45_decorators(t *testing.T) {
-	fourslash.SkipIfFailing(t)
 	t.Parallel()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @isolatedDeclarations: true
@@ -71,7 +67,7 @@ export class A {
     return foo();
   }
   @setterDecorator
-  set a(value) {}
+  set a(value: number) {}
 
   @fieldDecorator classProp: number = foo();
 }`,

…xports46-decorators-experimental_test.go …xports46-decorators-experimental_test.gointernal/fourslash/tests/gen/codeFixMissingTypeAnnotationOnExports46-decorators-experimental_test.go renamed to internal/fourslash/tests/manual/codeFixMissingTypeAnnotationOnExports46-decorators-experimental_test.go internal/fourslash/tests/gen/codeFixMissingTypeAnnotationOnExports46-decorators-experimental_test.go renamed to internal/fourslash/tests/manual/codeFixMissingTypeAnnotationOnExports46-decorators-experimental_test.go

@@ -1,6 +1,3 @@
-// Code generated by convertFourslash; DO NOT EDIT.
-// To modify this test, run "npm run makemanual codeFixMissingTypeAnnotationOnExports46-decorators-experimental"
-
 package fourslash_test
 
 import (
@@ -11,7 +8,6 @@ import (
 )
 
 func TestCodeFixMissingTypeAnnotationOnExports46_decorators_experimental(t *testing.T) {
-	fourslash.SkipIfFailing(t)
 	t.Parallel()
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @isolatedDeclarations: true
@@ -71,7 +67,7 @@ export class A {
     return foo();
   }
   @setterDecorator()
-  set a(value) {}
+  set a(value: number) {}
   @fieldDecorator() classProp: number = foo();
 }`,
 	})

internal/pseudochecker/lookup.go

@@ -24,11 +24,7 @@ func (ch *PseudoChecker) GetReturnTypeOfSignature(signatureNode *ast.Node) *Pseu
 }
 
 func (ch *PseudoChecker) GetTypeOfAccessor(accessor *ast.Node) *PseudoType {
-	annotated := ch.typeFromAccessor(accessor)
-	if annotated.Kind == PseudoTypeKindNoResult {
-		return ch.inferAccessorType(accessor)
-	}
-	return annotated
+	return ch.typeFromAccessor(accessor)
 }
 
 func (ch *PseudoChecker) GetTypeOfExpression(node *ast.Node) *PseudoType {
@@ -154,18 +150,19 @@ func (ch *PseudoChecker) typeFromAccessor(accessor *ast.Node) *PseudoType {
 		return NewPseudoTypeDirect(accessorType)
 	}
 	if accessorDeclarations.GetAccessor != nil {
-		return ch.createReturnFromSignature(accessorDeclarations.GetAccessor.AsNode())
+		res := ch.createReturnFromSignature(accessorDeclarations.GetAccessor.AsNode())
+		if res.Kind == PseudoTypeKindInferred && len(res.AsPseudoTypeInferred().ErrorNodes) == 0 {
+			errorNodes := []*ast.Node{accessorDeclarations.GetAccessor.AsNode()}
+			if accessorDeclarations.SetAccessor != nil {
+				errorNodes = append(errorNodes, accessorDeclarations.SetAccessor.AsNode())
+			}
+			res = NewPseudoTypeInferredWithErrors(res.AsPseudoTypeInferred().Expression, res.AsPseudoTypeInferred().IsSignatureReturn, errorNodes) // Move error up to the accessor
+		}
+		return res
 	}
 	return NewPseudoTypeNoResult(accessor)
 }
 
-func (ch *PseudoChecker) inferAccessorType(node *ast.Node) *PseudoType {
-	if node.Kind == ast.KindGetAccessor {
-		return ch.createReturnFromSignature(node)
-	}
-	return NewPseudoTypeNoResult(node)
-}
-
 func (ch *PseudoChecker) getTypeAnnotationFromAllAccessorDeclarations(node *ast.Node, accessors ast.AllAccessorDeclarations) *ast.Node {
 	accessorType := ch.getTypeAnnotationFromAccessor(node)
 	if accessorType == nil && node != accessors.FirstAccessor {

testdata/baselines/reference/submodule/compiler/isolatedDeclarationErrorsClasses.errors.txt

@@ -3,7 +3,7 @@ isolatedDeclarationErrorsClasses.ts(4,5): error TS9008: Method must have an expl
 isolatedDeclarationErrorsClasses.ts(8,18): error TS7006: Parameter 'p' implicitly has an 'any' type.
 isolatedDeclarationErrorsClasses.ts(8,18): error TS9011: Parameter must have an explicit type annotation with --isolatedDeclarations.
 isolatedDeclarationErrorsClasses.ts(9,23): error TS9011: Parameter must have an explicit type annotation with --isolatedDeclarations.
-isolatedDeclarationErrorsClasses.ts(11,28): error TS9013: Expression type can't be inferred with --isolatedDeclarations.
+isolatedDeclarationErrorsClasses.ts(11,9): error TS9009: At least one accessor must have an explicit type annotation with --isolatedDeclarations.
 isolatedDeclarationErrorsClasses.ts(12,9): error TS7032: Property 'setOnly' implicitly has type 'any', because its set accessor lacks a parameter type annotation.
 isolatedDeclarationErrorsClasses.ts(12,17): error TS7006: Parameter 'value' implicitly has an 'any' type.
 isolatedDeclarationErrorsClasses.ts(12,17): error TS9009: At least one accessor must have an explicit type annotation with --isolatedDeclarations.
@@ -52,10 +52,9 @@ isolatedDeclarationErrorsClasses.ts(56,5): error TS9013: Expression type can't b
 !!! related TS9028 isolatedDeclarationErrorsClasses.ts:9:19: Add a type annotation to the parameter p.
 
         get getOnly() { return 1 + 1 }
-                               ~~~~~
-!!! error TS9013: Expression type can't be inferred with --isolatedDeclarations.
+            ~~~~~~~
+!!! error TS9009: At least one accessor must have an explicit type annotation with --isolatedDeclarations.
 !!! related TS9032 isolatedDeclarationErrorsClasses.ts:11:9: Add a return type to the get accessor declaration.
-!!! related TS9035 isolatedDeclarationErrorsClasses.ts:11:28: Add satisfies and a type assertion to this expression (satisfies T as T) to make the type explicit.
         set setOnly(value) { }
             ~~~~~~~
 !!! error TS7032: Property 'setOnly' implicitly has type 'any', because its set accessor lacks a parameter type annotation.

testdata/baselines/reference/submoduleTriaged/compiler/isolatedDeclarationErrorsClasses.errors.txt.diff

@@ -4,7 +4,6 @@
 
 # Omnibus: Isolated declarations error changes - needs investigation
 ## https://github.com/microsoft/typescript-go/issues/3477
-compiler/isolatedDeclarationErrorsClasses.errors.txt.diff
 compiler/isolatedDeclarationErrorsClassesExpressions.errors.txt.diff
 compiler/isolatedDeclarationsAddUndefined.errors.txt.diff