Quick Info fixes

internal/fourslash/_scripts/failingTests.txt

@@ -118,7 +118,6 @@ TestCompletionListInvalidMemberNames2
 TestCompletionListInvalidMemberNames_escapeQuote
 TestCompletionListInvalidMemberNames_startWithSpace
 TestCompletionListInvalidMemberNames_withExistingIdentifier
-TestCompletionListObjectMembersInTypeLocationWithTypeof
 TestCompletionListOfGenericSymbol
 TestCompletionListOnAliases
 TestCompletionListStringParenthesizedExpression
@@ -251,7 +250,6 @@ TestGetJavaScriptQuickInfo7
 TestGetJavaScriptQuickInfo8
 TestGetJavaScriptSyntacticDiagnostics24
 TestGetOccurrencesIfElseBroken
-TestGetQuickInfoForIntersectionTypes
 TestHoverOverComment
 TestImportCompletionsPackageJsonExportsSpecifierEndsInTs
 TestImportCompletionsPackageJsonExportsTrailingSlash1
@@ -425,7 +423,6 @@ TestQuickInfoJSDocFunctionThis
 TestQuickInfoJSExport
 TestQuickInfoJsDocGetterSetterNoCrash1
 TestQuickInfoJsDocNonDiscriminatedUnionSharedProp
-TestQuickInfoJsPropertyAssignedAfterMethodDeclaration
 TestQuickInfoJsdocTypedefMissingType
 TestQuickInfoMappedSpreadTypes
 TestQuickInfoMappedType

internal/fourslash/tests/gen/completionListObjectMembersInTypeLocationWithTypeof_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestCompletionListObjectMembersInTypeLocationWithTypeof(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @strict: true
 const languageService = { getCompletions() {} }

internal/fourslash/tests/gen/getQuickInfoForIntersectionTypes_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestGetQuickInfoForIntersectionTypes(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `function f(): string & {(): any} {
 	return <any>{};

internal/fourslash/tests/gen/quickInfoJsPropertyAssignedAfterMethodDeclaration_test.go

@@ -9,7 +9,7 @@ import (
 
 func TestQuickInfoJsPropertyAssignedAfterMethodDeclaration(t *testing.T) {
 	t.Parallel()
-	t.Skip()
+
 	defer testutil.RecoverAndFail(t, "Panic on fourslash test")
 	const content = `// @noLib: true
 // @allowJs: true

internal/ls/hover.go

@@ -129,6 +129,9 @@ func getQuickInfoAndDeclarationAtLocation(c *checker.Checker, symbol *ast.Symbol
 		}
 	}
 	flags := symbol.Flags
+	if flags&ast.SymbolFlagsProperty != 0 && declaration != nil && ast.IsMethodDeclaration(declaration) {
+		flags = ast.SymbolFlagsMethod
+	}
 	if flags&ast.SymbolFlagsType != 0 && (ast.IsPartOfTypeNode(node) || ast.IsTypeDeclarationName(node)) {
 		// If the symbol has a type meaning and we're in a type context, remove value-only meanings
 		flags &^= ast.SymbolFlagsVariable | ast.SymbolFlagsFunction
@@ -165,7 +168,11 @@ func getQuickInfoAndDeclarationAtLocation(c *checker.Checker, symbol *ast.Symbol
 		}
 		b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
 		b.WriteString(": ")
-		b.WriteString(c.TypeToStringEx(c.GetTypeOfSymbolAtLocation(symbol, node), container, typeFormatFlags))
+		if callNode := getCallOrNewExpression(node); callNode != nil {
+			b.WriteString(c.SignatureToStringEx(c.GetResolvedSignature(callNode), container, typeFormatFlags|checker.TypeFormatFlagsWriteCallStyleSignature|checker.TypeFormatFlagsWriteTypeArgumentsOfSignature|checker.TypeFormatFlagsWriteArrowStyleSignature))
+		} else {
+			b.WriteString(c.TypeToStringEx(c.GetTypeOfSymbolAtLocation(symbol, node), container, typeFormatFlags))
+		}
 	case flags&ast.SymbolFlagsEnumMember != 0:
 		b.WriteString("(enum member) ")
 		t := c.GetTypeOfSymbol(symbol)
@@ -176,22 +183,26 @@ func getQuickInfoAndDeclarationAtLocation(c *checker.Checker, symbol *ast.Symbol
 		}
 	case flags&(ast.SymbolFlagsFunction|ast.SymbolFlagsMethod) != 0:
 		signatures := getSignaturesAtLocation(c, symbol, checker.SignatureKindCall, node)
-		if len(signatures) == 1 && signatures[0].Declaration() != nil {
-			declaration = signatures[0].Declaration()
+		if len(signatures) == 1 {
+			if d := signatures[0].Declaration(); d != nil && d.Flags&ast.NodeFlagsJSDoc == 0 {
+				declaration = d
+			}
 		}
-		prefix := core.IfElse(symbol.Flags&ast.SymbolFlagsMethod != 0, "(method) ", "function ")
+		prefix := core.IfElse(flags&ast.SymbolFlagsMethod != 0, "(method) ", "function ")
 		writeSignatures(&b, c, signatures, container, prefix, symbol)
 	case flags&ast.SymbolFlagsConstructor != 0:
 		signatures := getSignaturesAtLocation(c, symbol.Parent, checker.SignatureKindConstruct, node)
-		if len(signatures) == 1 && signatures[0].Declaration() != nil {
-			declaration = signatures[0].Declaration()
+		if len(signatures) == 1 {
+			if d := signatures[0].Declaration(); d != nil && d.Flags&ast.NodeFlagsJSDoc == 0 {
+				declaration = d
+			}
 		}
 		writeSignatures(&b, c, signatures, container, "constructor ", symbol.Parent)
 	case flags&(ast.SymbolFlagsClass|ast.SymbolFlagsInterface) != 0:
 		if node.Kind == ast.KindThisKeyword || ast.IsThisInTypeQuery(node) {
 			b.WriteString("this")
 		} else {
-			b.WriteString(core.IfElse(symbol.Flags&ast.SymbolFlagsClass != 0, "class ", "interface "))
+			b.WriteString(core.IfElse(flags&ast.SymbolFlagsClass != 0, "class ", "interface "))
 			b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
 			params := c.GetDeclaredTypeOfSymbol(symbol).AsInterfaceType().LocalTypeParameters()
 			writeTypeParams(&b, c, params)
@@ -288,7 +299,7 @@ func getCallOrNewExpression(node *ast.Node) *ast.Node {
 	if ast.IsPropertyAccessExpression(node.Parent) && node.Parent.Name() == node {
 		node = node.Parent
 	}
-	if ast.IsCallExpression(node.Parent) || ast.IsNewExpression(node.Parent) {
+	if (ast.IsCallExpression(node.Parent) || ast.IsNewExpression(node.Parent)) && node.Parent.Expression() == node {
 		return node.Parent
 	}
 	return nil

testdata/baselines/reference/fourslash/quickInfo/quickInfoDisplayPartsConst.baseline

@@ -121,15 +121,15 @@
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | const h: { (a: string): number; (a: number): string; }
+// | const h: (a: number) => string
 // | ```
 // | 
 // | ----------------------------------------------------------------------
 // h("hello");
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | const h: { (a: string): number; (a: number): string; }
+// | const h: (a: string) => number
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -525,7 +525,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nconst h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nconst h: (a: number) => string\n```\n"
       },
       "range": {
         "start": {
@@ -552,7 +552,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nconst h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nconst h: (a: string) => number\n```\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoDisplayPartsInterfaceMembers.baseline

@@ -54,7 +54,7 @@
 // ^^^^^^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iInstance: I
+// | var iInstance: () => string
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -69,7 +69,7 @@
 //                           ^^^^^^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iInstance: I
+// | var iInstance: () => I
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -249,7 +249,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iInstance: I\n```\n"
+        "value": "```tsx\nvar iInstance: () => string\n```\n"
       },
       "range": {
         "start": {
@@ -303,7 +303,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iInstance: I\n```\n"
+        "value": "```tsx\nvar iInstance: () => I\n```\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoDisplayPartsLet.baseline

@@ -121,15 +121,15 @@
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | let h: { (a: string): number; (a: number): string; }
+// | let h: (a: number) => string
 // | ```
 // | 
 // | ----------------------------------------------------------------------
 // h("hello");
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | let h: { (a: string): number; (a: number): string; }
+// | let h: (a: string) => number
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -525,7 +525,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nlet h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nlet h: (a: number) => string\n```\n"
       },
       "range": {
         "start": {
@@ -552,7 +552,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nlet h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nlet h: (a: string) => number\n```\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoDisplayPartsTypeParameterInInterface.baseline

@@ -171,15 +171,15 @@
 //     ^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iVal: I<string>
+// | var iVal: <"hello">(a: "hello", b: string) => "hello"
 // | ```
 // | 
 // | ----------------------------------------------------------------------
 // iVal("hello", "hello");
 // ^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iVal: I<string>
+// | var iVal: <"hello">(a: "hello", b: string) => "hello"
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -404,7 +404,7 @@
 //     ^^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iVal1: I1<I<string>>
+// | var iVal1: <I<string>>(a: I<string>, b: I<string>) => I<string>
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -426,7 +426,7 @@
 // ^^^^^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var iVal1: I1<I<string>>
+// | var iVal1: <I<string>>(a: I<string>, b: I<string>) => I<string>
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -1108,7 +1108,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iVal: I<string>\n```\n"
+        "value": "```tsx\nvar iVal: <\"hello\">(a: \"hello\", b: string) => \"hello\"\n```\n"
       },
       "range": {
         "start": {
@@ -1135,7 +1135,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iVal: I<string>\n```\n"
+        "value": "```tsx\nvar iVal: <\"hello\">(a: \"hello\", b: string) => \"hello\"\n```\n"
       },
       "range": {
         "start": {
@@ -1972,7 +1972,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iVal1: I1<I<string>>\n```\n"
+        "value": "```tsx\nvar iVal1: <I<string>>(a: I<string>, b: I<string>) => I<string>\n```\n"
       },
       "range": {
         "start": {
@@ -2053,7 +2053,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar iVal1: I1<I<string>>\n```\n"
+        "value": "```tsx\nvar iVal1: <I<string>>(a: I<string>, b: I<string>) => I<string>\n```\n"
       },
       "range": {
         "start": {

testdata/baselines/reference/fourslash/quickInfo/quickInfoDisplayPartsVar.baseline

@@ -101,15 +101,15 @@
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var h: { (a: string): number; (a: number): string; }
+// | var h: (a: number) => string
 // | ```
 // | 
 // | ----------------------------------------------------------------------
 // h("hello");
 // ^
 // | ----------------------------------------------------------------------
 // | ```tsx
-// | var h: { (a: string): number; (a: number): string; }
+// | var h: (a: string) => number
 // | ```
 // | 
 // | ----------------------------------------------------------------------
@@ -451,7 +451,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nvar h: (a: number) => string\n```\n"
       },
       "range": {
         "start": {
@@ -478,7 +478,7 @@
     "item": {
       "contents": {
         "kind": "markdown",
-        "value": "```tsx\nvar h: { (a: string): number; (a: number): string; }\n```\n"
+        "value": "```tsx\nvar h: (a: string) => number\n```\n"
       },
       "range": {
         "start": {