From e4a2c2d474f725b01acfa3a6169686f5e16f2ce9 Mon Sep 17 00:00:00 2001
From: Ivan Yonchovski <yyoncho@users.noreply.github.com>
Date: Fri, 29 Apr 2022 12:16:07 +0300
Subject: [PATCH] Make sure that field usage preserves the original line info
 (#19751)

Currently `struct.field` will generate a node with `info` that points to the
symbol definition instead of having the actual node location.
---
 compiler/semexprs.nim               |  2 ++
 nimsuggest/tests/tuse_structure.nim | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 nimsuggest/tests/tuse_structure.nim

diff --git a/compiler/semexprs.nim b/compiler/semexprs.nim
index 702b47929c..b8742ff65f 100644
--- a/compiler/semexprs.nim
+++ b/compiler/semexprs.nim
@@ -1436,8 +1436,10 @@ proc builtinFieldAccess(c: PContext, n: PNode, flags: TExprFlags): PNode =
         # is the access to a public field or in the same module or in a friend?
         markUsed(c, n[1].info, f)
         onUse(n[1].info, f)
+        let info = n[1].info
         n[0] = makeDeref(n[0])
         n[1] = newSymNode(f) # we now have the correct field
+        n[1].info = info # preserve the original info
         n.typ = f.typ
         if check == nil:
           result = n
diff --git a/nimsuggest/tests/tuse_structure.nim b/nimsuggest/tests/tuse_structure.nim
new file mode 100644
index 0000000000..f65ab9060e
--- /dev/null
+++ b/nimsuggest/tests/tuse_structure.nim
@@ -0,0 +1,15 @@
+# tests for use and structures
+
+type
+  Foo* = ref object of RootObj
+    bar*: string
+
+proc test(f: Foo) =
+  echo f.#[!]#bar
+
+discard """
+$nimsuggest --tester $file
+>use $1
+def	skField	tuse_structure.Foo.bar	string	$file	5	4	""	100
+use	skField	tuse_structure.Foo.bar	string	$file	8	9	""	100
+"""