src: more bug fixes

* fixed snippets added twice on token reactivation for errors and fulltext search results
* fixed colorscheme gets refreshed when cancelling preferences
* scroll to first line in errors table after indexing and showing view
* fixed file not properly expanded when snippet covers full file
* fixed project type naming in project setup
* fixed set delimiter of NameHierarchy for projects that can't be loaded yet
* changed language order for project setup

src/lib_gui/qt/element/QtCodeNavigator.cpp

@@ -165,18 +165,32 @@ void QtCodeNavigator::addFile(std::shared_ptr<SourceLocationFile> locationFile,
 		locationFile->forEachStartSourceLocation(
 			[&](SourceLocation* location)
 			{
-				if (!location->isScopeLocation())
+				if (location->isScopeLocation())
 				{
-					for (Id i : location->getTokenIds())
-					{
-						Reference ref;
-						ref.filePath = location->getFilePath();
-						ref.tokenId = i;
-						ref.locationId = location->getLocationId();
-						ref.locationType = location->getType();
+					return;
+				}
 
-						m_references.push_back(ref);
-					}
+				if (!location->getTokenIds().size())
+				{
+					Reference ref;
+					ref.filePath = location->getFilePath();
+					ref.tokenId = 0;
+					ref.locationId = location->getLocationId();
+					ref.locationType = location->getType();
+
+					m_references.push_back(ref);
+					return;
+				}
+
+				for (Id i : location->getTokenIds())
+				{
+					Reference ref;
+					ref.filePath = location->getFilePath();
+					ref.tokenId = i;
+					ref.locationId = location->getLocationId();
+					ref.locationType = location->getType();
+
+					m_references.push_back(ref);
 				}
 			}
 		);

src/lib_gui/qt/view/QtErrorView.cpp

@@ -167,6 +167,10 @@ void QtErrorView::doAddErrors(const std::vector<ErrorInfo>& errors, bool scrollT
 	{
 		m_table->showLastRow();
 	}
+	else
+	{
+		m_table->showFirstRow();
+	}
 }
 
 void QtErrorView::doSetErrorId(Id errorId)

src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp

@@ -12,6 +12,7 @@ QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
 )
 	: QtProjectWizzardContent(window)
 	, m_oldColorSchemeIndex(-1)
+	, m_newColorSchemeIndex(-1)
 {
 	std::vector<std::string> colorSchemePaths =
 		FileSystem::getFileNamesFromDirectory(ResourcePaths::getColorSchemesPath(), std::vector<std::string>(1, ".xml"));
@@ -23,7 +24,7 @@ QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
 
 QtProjectWizzardContentPreferences::~QtProjectWizzardContentPreferences()
 {
-	if (m_oldColorSchemeIndex != -1)
+	if (m_oldColorSchemeIndex != -1 && m_oldColorSchemeIndex != m_newColorSchemeIndex)
 	{
 		colorSchemeChanged(m_oldColorSchemeIndex);
 	}
@@ -212,6 +213,7 @@ void QtProjectWizzardContentPreferences::load()
 		{
 			m_colorSchemes->setCurrentIndex(i);
 			m_oldColorSchemeIndex = i;
+			m_newColorSchemeIndex = i;
 			break;
 		}
 	}
@@ -294,6 +296,7 @@ bool QtProjectWizzardContentPreferences::check()
 
 void QtProjectWizzardContentPreferences::colorSchemeChanged(int index)
 {
+	m_newColorSchemeIndex = index;
 	MessageSwitchColorScheme(m_colorSchemePaths[index]).dispatch();
 }
 

src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h

@@ -52,6 +52,8 @@ private:
 	QComboBox* m_colorSchemes;
 	std::vector<FilePath> m_colorSchemePaths;
 	int m_oldColorSchemeIndex;
+	int m_newColorSchemeIndex;
+
 	QCheckBox* m_useAnimations;
 	QCheckBox* m_loggingEnabled;
 	QCheckBox* m_verboseIndexerLoggingEnabled;

src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentSelect.cpp

@@ -110,7 +110,7 @@ void QtProjectWizzardContentSelect::populate(QGridLayout* layout, int& row)
 		for (auto projectIt: languageIt.second)
 		{
 			QToolButton* b = createProjectButton(
-				utility::insertLineBreaksAtBlankSpaces(sourceGroupTypeToString(projectIt.type), 15).c_str(),
+				utility::insertLineBreaksAtBlankSpaces(sourceGroupTypeToProjectSetupString(projectIt.type), 15).c_str(),
 				(ResourcePaths::getGuiPath() + "icon/" + m_projectTypeIconName[projectIt.type] + ".png").c_str()
 			);
 			b->setProperty("source_group_type", int(projectIt.type));