#325 set correct line for subItems copied from local definitions

codefori · Sep 12, 2024 · a594fe5 · a594fe5
1 parent 8f22533
commit a594fe5
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/language/parser.js b/language/parser.js
@@ -303,7 +303,18 @@ export default class Parser {
             for (let i = scopes.length - 1; i >= 0; i--) {
               const valuePointer = scopes[i].structs.find(struct => struct.name.toUpperCase() === keywordValue);
               if (valuePointer) {
-                ds.subItems = valuePointer.subItems;
+                // Only use same subItems if local definition is from same path
+                if (ds.position.path === valuePointer.position.path) {
+                  ds.subItems = valuePointer.subItems;
+                } else {
+                  // Clone subitems for correct line assignment
+                  valuePointer.subItems.forEach((item) => {
+                    const newItem = item.clone();
+                    newItem.position.line = ds.position.line;
+                    ds.subItems.push(newItem);
+                  });
+                }
+
                 return;
               }
             }