Fix hover on module.exports (#2098)

Author: ahejlsberg

internal/checker/checker.go

@@ -30749,6 +30749,9 @@ func (c *Checker) getSymbolOfNameOrPropertyAccessExpression(name *ast.Node) *ast
 			}
 			meaning := core.IfElse(isJSDoc, ast.SymbolFlagsValue|ast.SymbolFlagsType|ast.SymbolFlagsNamespace, ast.SymbolFlagsValue)
 			result := c.resolveEntityName(name, meaning, true /*ignoreErrors*/, true /*dontResolveAlias*/, nil /*location*/)
+			if result != nil && result.Flags&ast.SymbolFlagsModuleExports != 0 {
+				result = result.ValueDeclaration.Symbol() // Symbol of the module source file
+			}
 			if result == nil && isJSDoc {
 				if container := ast.FindAncestor(name, ast.IsClassOrInterfaceLike); container != nil {
 					symbol := c.getSymbolOfDeclaration(container)

internal/fourslash/_scripts/failingTests.txt

@@ -231,7 +231,6 @@ TestDoubleUnderscoreCompletions
 TestEditJsdocType
 TestExportDefaultClass
 TestExportDefaultFunction
-TestFindAllRefsModuleDotExports
 TestFindReferencesBindingPatternInJsdocNoCrash1
 TestFindReferencesBindingPatternInJsdocNoCrash2
 TestGenericCombinatorWithConstraints1

internal/fourslash/tests/gen/findAllRefsModuleDotExports_test.go

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

internal/ls/findallreferences.go

@@ -753,7 +753,7 @@ func (l *LanguageService) getReferencedSymbolsForModuleIfDeclaredBySourceFile(ct
 	exportEquals := symbol.Exports[ast.InternalSymbolNameExportEquals]
 	// If exportEquals != nil, we're about to add references to `import("mod")` anyway, so don't double-count them.
 	moduleReferences := l.getReferencedSymbolsForModule(ctx, program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet)
-	if exportEquals == nil || !sourceFilesSet.Has(moduleSourceFileName) {
+	if exportEquals == nil || exportEquals.Flags&ast.SymbolFlagsAlias == 0 || !sourceFilesSet.Has(moduleSourceFileName) {
 		return moduleReferences
 	}
 	symbol, _ = checker.ResolveAlias(exportEquals)

internal/ls/hover.go

@@ -189,7 +189,11 @@ func getQuickInfoAndDeclarationAtLocation(c *checker.Checker, symbol *ast.Symbol
 				}
 			}
 		}
-		b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
+		if symbol.Name == ast.InternalSymbolNameExportEquals && symbol.Parent != nil && symbol.Parent.Flags&ast.SymbolFlagsModule != 0 {
+			b.WriteString("exports")
+		} else {
+			b.WriteString(c.SymbolToStringEx(symbol, container, ast.SymbolFlagsNone, symbolFormatFlags))
+		}
 		b.WriteString(": ")
 		if callNode := getCallOrNewExpression(node); callNode != nil {
 			b.WriteString(c.SignatureToStringEx(c.GetResolvedSignature(callNode), container, typeFormatFlags|checker.TypeFormatFlagsWriteCallStyleSignature|checker.TypeFormatFlagsWriteTypeArgumentsOfSignature|checker.TypeFormatFlagsWriteArrowStyleSignature))

testdata/baselines/reference/compiler/erasableSyntaxOnlyJS.symbols

@@ -11,7 +11,7 @@ import foo = require("./foo.js");
 === bar.cjs ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(bar.cjs, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("bar", Decl(bar.cjs, 0, 0))
 >exports : Symbol(export=, Decl(bar.cjs, 0, 0))
 
     a: 1,
@@ -21,7 +21,7 @@ module.exports = {
 === foo.js ===
 module.exports = {
 >module.exports : Symbol(export=, Decl(foo.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("foo", Decl(foo.js, 0, 0))
 >exports : Symbol(export=, Decl(foo.js, 0, 0))
 
     b: 2,

testdata/baselines/reference/compiler/panicSatisfiesOnExportEqualsDeclaration.symbols

@@ -6,6 +6,6 @@
  */
 module.exports = {};
 >module.exports : Symbol(export=, Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("panicSatisfiesOnExportEqualsDeclaration", Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
 >exports : Symbol(export=, Decl(panicSatisfiesOnExportEqualsDeclaration.js, 0, 0))
 

testdata/baselines/reference/fourslash/documentHighlights/emptyExportFindReferences.baseline.jsonc

@@ -1,5 +1,5 @@
 // === documentHighlights ===
 // === /Foo.js ===
-// /*HIGHLIGHTS*/module.exports = {
+// /*HIGHLIGHTS*/[|module.exports = {
 // 
-// }
+// }|]

testdata/baselines/reference/fourslash/findAllReferences/findAllRefsModuleDotExports.baseline.jsonc

@@ -0,0 +1,21 @@
+// === findAllReferences ===
+// === /a.js ===
+// /*FIND ALL REFS*/const [|b|] = require("./b");
+
+
+
+// === findAllReferences ===
+// === /a.js ===
+// const b = require("/*FIND ALL REFS*/[|./b|]");
+
+// === /b.js ===
+// [|module.exports = 0|];
+
+
+
+// === findAllReferences ===
+// === /a.js ===
+// const b = require("[|./b|]");
+
+// === /b.js ===
+// /*FIND ALL REFS*/[|module.exports = 0|];

testdata/baselines/reference/submodule/compiler/checkJsTypeDefNoUnusedLocalMarked.symbols

@@ -25,6 +25,6 @@ export = Foo;
 
 module.exports = /** @type {FooFun} */(void 0);
 >module.exports : Symbol(export=, Decl(something.js, 0, 0))
->module : Symbol(module.exports)
+>module : Symbol("something", Decl(something.js, 0, 0))
 >exports : Symbol(export=, Decl(something.js, 0, 0))