From a3c2eb04b9a18124bea8eb9661edfbbd57b78d3e Mon Sep 17 00:00:00 2001
From: Ivan Yonchovski <yyoncho@users.noreply.github.com>
Date: Fri, 15 Jul 2022 20:56:33 +0300
Subject: [PATCH] Use module actual file instead of PSym.info (#19956)

After this you can do goto module from module import

(cherry picked from commit b0b9a3e5fade002b8f117f7ffb4d8fb93686401d)
---
 compiler/suggest.nim            | 30 ++++++++++++++++++------------
 nimsuggest/tests/tv3_import.nim |  7 +++++++
 2 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 nimsuggest/tests/tv3_import.nim

diff --git a/compiler/suggest.nim b/compiler/suggest.nim
index 38751fcc72..2fab71e27b 100644
--- a/compiler/suggest.nim
+++ b/compiler/suggest.nim
@@ -157,19 +157,25 @@ proc symToSuggest*(g: ModuleGraph; s: PSym, isLocal: bool, section: IdeCmd, info
       result.forth = ""
     when defined(nimsuggest) and not defined(noDocgen) and not defined(leanCompiler):
       result.doc = extractDocComment(g, s)
-  let infox =
-    if useSuppliedInfo or section in {ideUse, ideHighlight, ideOutline}:
-      info
-    else:
-      s.info
-  result.filePath = toFullPath(g.config, infox)
-  result.line = toLinenumber(infox)
-  result.column = toColumn(infox)
+  if s.kind == skModule and s.ast.len != 0 and section != ideHighlight:
+    result.filePath = toFullPath(g.config, s.ast[0].info)
+    result.line = 1
+    result.column = 0
+    result.tokenLen = 0
+  else:
+    let infox =
+      if useSuppliedInfo or section in {ideUse, ideHighlight, ideOutline}:
+        info
+      else:
+        s.info
+    result.filePath = toFullPath(g.config, infox)
+    result.line = toLinenumber(infox)
+    result.column = toColumn(infox)
+    result.tokenLen = if section != ideHighlight:
+                        s.name.s.len
+                      else:
+                        getTokenLenFromSource(g.config, s.name.s, infox)
   result.version = g.config.suggestVersion
-  result.tokenLen = if section != ideHighlight:
-                      s.name.s.len
-                    else:
-                      getTokenLenFromSource(g.config, s.name.s, infox)
 
 proc `$`*(suggest: Suggest): string =
   result = $suggest.section
diff --git a/nimsuggest/tests/tv3_import.nim b/nimsuggest/tests/tv3_import.nim
new file mode 100644
index 0000000000..3c128f85b0
--- /dev/null
+++ b/nimsuggest/tests/tv3_import.nim
@@ -0,0 +1,7 @@
+import tv#[!]#3
+
+discard """
+$nimsuggest --v3 --tester $file
+>def $1
+def	skModule	tv3		*/tv3.nim	1	0	""	100
+"""