From da2c522af0040c1bce08ea31ec8c1e7845e2657a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= <spartanj@gmail.com>
Date: Thu, 3 Feb 2022 01:48:45 -0300
Subject: [PATCH] AutoCompleteModule tentative minor fix.

---
 src/tools/codeeditor/autocompletemodule.cpp | 5 +++--
 src/tools/codeeditor/codeeditor.cpp         | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/tools/codeeditor/autocompletemodule.cpp b/src/tools/codeeditor/autocompletemodule.cpp
index f8b1dd279..ff76c5ca8 100644
--- a/src/tools/codeeditor/autocompletemodule.cpp
+++ b/src/tools/codeeditor/autocompletemodule.cpp
@@ -195,9 +195,9 @@ void AutoCompleteModule::updateDocCache( TextDocument* doc ) {
 	cache.changeId = doc->getCurrentChangeId();
 	cache.symbols = getDocumentSymbols( doc );
 	std::string langName( doc->getSyntaxDefinition().getLanguageName() );
-	auto& lang = mLangCache[langName];
 	{
 		Lock l( mLangSymbolsMutex );
+		auto& lang = mLangCache[langName];
 		lang.clear();
 		for ( const auto& d : mDocCache ) {
 			if ( d.first->getSyntaxDefinition().getLanguageName() == langName )
@@ -210,9 +210,9 @@ void AutoCompleteModule::updateDocCache( TextDocument* doc ) {
 
 void AutoCompleteModule::updateLangCache( const std::string& langName ) {
 	Clock clock;
-	auto& lang = mLangCache[langName];
 	Lock l( mLangSymbolsMutex );
 	Lock l2( mDocMutex );
+	auto& lang = mLangCache[langName];
 	lang.clear();
 	for ( const auto& d : mDocCache ) {
 		if ( d.first->getSyntaxDefinition().getLanguageName() == langName )
@@ -454,6 +454,7 @@ void AutoCompleteModule::runUpdateSuggestions( const std::string& symbol,
 
 void AutoCompleteModule::updateSuggestions( const std::string& symbol, UICodeEditor* editor ) {
 	const std::string& lang = editor->getDocument().getSyntaxDefinition().getLanguageName();
+	Lock l( mLangSymbolsMutex );
 	auto langSuggestions = mLangCache.find( lang );
 	if ( langSuggestions == mLangCache.end() )
 		return;
diff --git a/src/tools/codeeditor/codeeditor.cpp b/src/tools/codeeditor/codeeditor.cpp
index 770bdb51c..b71e519e1 100644
--- a/src/tools/codeeditor/codeeditor.cpp
+++ b/src/tools/codeeditor/codeeditor.cpp
@@ -1770,8 +1770,8 @@ void App::createProjectTreeMenu( const FileInfo& file ) {
 		mProjectTreeMenu->add( "Duplicate File...", findIcon( "file-copy" ) )
 			->setId( "duplicate_file" );
 	}
-	mProjectTreeMenu->add( "Rename", findIcon( "edit" ) )->setId( "rename" );
-	mProjectTreeMenu->add( "Remove...", findIcon( "delete-bin" ), "F2" )->setId( "remove" );
+	mProjectTreeMenu->add( "Rename", findIcon( "edit" ), "F2" )->setId( "rename" );
+	mProjectTreeMenu->add( "Remove...", findIcon( "delete-bin" ) )->setId( "remove" );
 	mProjectTreeMenu->addEventListener( Event::OnItemClicked, [&, file]( const Event* event ) {
 		if ( !event->getNode()->isType( UI_TYPE_MENUITEM ) )
 			return;