From f1d62ab00b743146d05e8daf8b48a9bdb74bac03 Mon Sep 17 00:00:00 2001
From: Cosmo Myzrail Gorynych <admin@nersta.ru>
Date: Mon, 10 Aug 2020 10:13:56 +1200
Subject: [PATCH] :bug: Fix regression with custom script typings: they were
 not loaded on project load

---
 src/js/loadProject.js                               | 8 ++++++++
 src/riotTags/project-settings/scripts-setttings.tag | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/js/loadProject.js b/src/js/loadProject.js
index 3f359e3de..ee813f4ba 100644
--- a/src/js/loadProject.js
+++ b/src/js/loadProject.js
@@ -126,6 +126,14 @@
                 document.title = global.currentProject.settings.title + ' — ct.js';
             }
 
+            glob.scriptTypings = {};
+            for (const script of global.currentProject.scripts) {
+                glob.scriptTypings[script.name] = [
+                    monaco.languages.typescript.javascriptDefaults.addExtraLib(script.code),
+                    monaco.languages.typescript.typescriptDefaults.addExtraLib(script.code)
+                ];
+            }
+
             const {loadAllTypedefs, resetTypedefs} = require('./data/node_requires/resources/modules/typedefs');
             resetTypedefs();
             loadAllTypedefs();
diff --git a/src/riotTags/project-settings/scripts-setttings.tag b/src/riotTags/project-settings/scripts-setttings.tag
index b129710d4..cf36ec22e 100644
--- a/src/riotTags/project-settings/scripts-setttings.tag
+++ b/src/riotTags/project-settings/scripts-setttings.tag
@@ -25,13 +25,6 @@ scripts-settings
         this.currentProject.scripts = this.currentProject.scripts || [];
 
         const glob = require('./data/node_requires/glob');
-        glob.scriptTypings = glob.scriptTypings || {};
-        for (const script of global.currentProject.scripts) {
-            glob.scriptTypings[script.name] = [
-                monaco.languages.typescript.javascriptDefaults.addExtraLib(script.code),
-                monaco.languages.typescript.typescriptDefaults.addExtraLib(script.code)
-            ];
-        }
 
         this.addNewScript = () => {
             var script = {