feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Only generate valid identifiers in QuickFixes

Browse Source 
Change-Id: Idcb3495f04627610eaf530dcb5d3b58429eda616
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Leander Schulten
2021-01-18 15:26:11 +01:00
parent da07d8f5c3
commit 8082df491a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -617,6 +617,9 @@ bool nameIncludesOperatorName(const Name *name)
QString memberBaseName(const QString &name) QString memberBaseName(const QString &name)
{ {
const auto validName = [](const QString &name) {
return !name.isEmpty() && !name.at(0).isDigit();
};
QString baseName = name; QString baseName = name;
CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings( CppQuickFixSettings *settings = CppQuickFixProjectsSettings::getQuickFixSettings(
@@ -626,7 +629,7 @@ QString memberBaseName(const QString &name)
const QString postfix = nameTemplate.mid(nameTemplate.lastIndexOf('>') + 1); const QString postfix = nameTemplate.mid(nameTemplate.lastIndexOf('>') + 1);
if (name.startsWith(prefix) && name.endsWith(postfix)) { if (name.startsWith(prefix) && name.endsWith(postfix)) {
const QString base = name.mid(prefix.length(), name.length() - postfix.length()); const QString base = name.mid(prefix.length(), name.length() - postfix.length());
if (!base.isEmpty()) if (validName(base))
return base; return base;
} }
@@ -635,7 +638,7 @@ QString memberBaseName(const QString &name)
baseName.remove(0, 1); baseName.remove(0, 1);
while (baseName.endsWith(QLatin1Char('_'))) while (baseName.endsWith(QLatin1Char('_')))
baseName.chop(1); baseName.chop(1);
if (baseName != name) if (baseName != name && validName(baseName))
return baseName; return baseName;
// If no leading/trailing "_": remove "m_" and "m" prefix // If no leading/trailing "_": remove "m_" and "m" prefix
@@ -647,7 +650,7 @@ QString memberBaseName(const QString &name)
baseName[0] = baseName.at(0).toLower(); baseName[0] = baseName.at(0).toLower();
} }
return baseName; return validName(baseName) ? baseName : name;
} }
// Returns a non-null value if and only if the cursor is on the name of a (proper) class // Returns a non-null value if and only if the cursor is on the name of a (proper) class