vim-patch:8.2.0114: info about sourced scripts is scattered

Problem:    Info about sourced scripts is scattered.
Solution:   Use scriptitem_T for info about a script, including s: variables.
            Drop ga_scripts.

https://github.com/vim/vim/commit/7ebcba61b20d25d23109fff73d0346ad44ba1b3b

Co-authored-by: Bram Moolenaar <Bram@vim.org>

1 files changed, 12 insertions, 2 deletions

diff --git a/src/nvim/runtime.c b/src/nvim/runtime.c
index cff0f886ce..e8b0492f35 100644
--- a/src/nvim/runtime.c
+++ b/src/nvim/runtime.c
@@ -1846,10 +1846,13 @@ scriptitem_T *new_script_item(char *const name, scid_T *const sid_out)
   while (script_items.ga_len < sid) {
     script_items.ga_len++;
     SCRIPT_ITEM(script_items.ga_len).sn_name = NULL;
+
+    // Allocate the local script variables to use for this script.
+    new_script_vars(script_items.ga_len);
+
     SCRIPT_ITEM(script_items.ga_len).sn_prof_on = false;
   }
   SCRIPT_ITEM(sid).sn_name = name;
-  new_script_vars(sid);  // Allocate the local script variables to use for this script.
   return &SCRIPT_ITEM(sid);
 }
 
@@ -2305,7 +2308,14 @@ void free_scriptnames(void)
 {
   profile_reset();
 
-# define FREE_SCRIPTNAME(item) xfree((item)->sn_name)
+# define FREE_SCRIPTNAME(item) \
+  do { \
+    /* the variables themselves are cleared in evalvars_clear() */ \
+    xfree((item)->sn_vars); \
+    xfree((item)->sn_name); \
+    ga_clear(&(item)->sn_prl_ga); \
+  } while (0) \
+
   GA_DEEP_CLEAR(&script_items, scriptitem_T, FREE_SCRIPTNAME);
 }
 #endif