- fix autocomplete not showing up after changing tabs

christophhart · Dec 19, 2023 · b2471b5 · b2471b5
1 parent 9e9641d
commit b2471b5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/hi_backend/backend/BackendRootWindow.h b/hi_backend/backend/BackendRootWindow.h
@@ -90,6 +90,19 @@ class BackendRootWindow : public TopLevelWindowWithOptionalOpenGL,
 
 	bool isFullScreenMode() const;
 
+	static mcl::TokenCollection::Ptr getJavascriptTokenCollection(Component* any)
+	{
+		if(auto brw = GET_BACKEND_ROOT_WINDOW(any))
+		{
+			if(brw->javascriptTokens == nullptr)
+				brw->javascriptTokens = new mcl::TokenCollection(mcl::LanguageIds::HiseScript);
+
+			return brw->javascriptTokens;
+		}
+
+		return nullptr;
+	}
+
 	void rebuildTokenProviders(const Identifier& languageId)
 	{
 		if(javascriptTokens == nullptr && languageId == mcl::LanguageIds::HiseScript)

diff --git a/hi_scripting/scripting/components/ScriptingPanelTypes.cpp b/hi_scripting/scripting/components/ScriptingPanelTypes.cpp
@@ -75,6 +75,8 @@ Component* CodeEditorPanel::createContentComponent(int index)
 			pe->getEditor()->editor.setScaleFactor(scaleFactor);
 #endif
 
+		pe->getEditor()->editor.tokenCollection = BackendRootWindow::getJavascriptTokenCollection(this);
+
 		pe->addMouseListener(this, true);
 		getProcessor()->getMainController()->setLastActiveEditor(pe->getEditor(), CodeDocument::Position());
 		pe->grabKeyboardFocusAsync();
@@ -112,7 +114,9 @@ Component* CodeEditorPanel::createContentComponent(int index)
         if(scaleFactor != -1.0f)
             pe->getEditor()->editor.setScaleFactor(scaleFactor);
 #endif
-
+
+		pe->getEditor()->editor.tokenCollection = BackendRootWindow::getJavascriptTokenCollection(this);
+
 		if(auto ed = pe->getEditor())
 			getProcessor()->getMainController()->setLastActiveEditor(pe->getEditor(), CodeDocument::Position());