Add checks for identifiers

src/Parsers/CppParser/cppdocumentparser.cpp

@@ -393,13 +393,11 @@ CppDocumentParser::CppDocumentParser( QObject* parent )
 
   CppEditor::CppModelManager* modelManager = CppEditor::CppModelManager::instance();
   connect( modelManager, &CppEditor::CppModelManager::documentUpdated, this, &CppDocumentParser::parseCppDocumentOnUpdate, Qt::DirectConnection );
-  connect(         qApp, &QApplication::aboutToQuit,                  this, [=]() {
-          /* Disconnect any signals that might still get emitted. */
-          modelManager->disconnect( this );
-          SpellCheckerCore::instance()->disconnect( this );
-          this->disconnect( SpellCheckerCore::instance() );
-        }, Qt::DirectConnection );
-
+  connect( qApp, &QApplication::aboutToQuit, this, [=, this]() {
+      /* Disconnect any signals that might still get emitted. */
+      modelManager->disconnect( this );
+      SpellCheckerCore::instance()->disconnect( this );
+      this->disconnect( SpellCheckerCore::instance() ); }, Qt::DirectConnection );
   Core::Context context( CppEditor::Constants::CPPEDITOR_ID );
   Core::ActionContainer* cppEditorContextMenu = Core::ActionManager::createMenu( CppEditor::Constants::M_CONTEXT );
   Core::ActionContainer* contextMenu          = Core::ActionManager::createMenu( Constants::CONTEXT_MENU_ID );

src/Parsers/CppParser/cppdocumentprocessor.cpp

@@ -155,6 +155,23 @@ void CppDocumentProcessor::process( CppDocumentProcessor::Promise& promise )
     return;
   }
 
+  if (d->settings.whatToCheck.testFlag(CppParserSettings::CheckIdentifiers)) {
+    /* Parse identifiers (consider merging all the 3 loops, because we now touch each token) */
+    unsigned int tokenCount = d->trUnit->tokenCount();
+    for ( unsigned int tokenIndex = 0; tokenIndex < tokenCount; ++tokenIndex ) {
+      const CPlusPlus::Token &token{ d->trUnit->tokenAt( tokenIndex ) };
+      const CPlusPlus::Identifier *identifier{ token.identifier };
+      if ( identifier ) {
+        wordTokens.push_back( parseToken( token, WordTokens::Type::Identifier ) );
+      }
+    }
+  }
+
+  if (promise.isCanceled() == true) {
+    promise.future().cancel();
+    return;
+  }
+
   /* At this point the DocPtr can be released since it will no longer be
    * Used */
   d->docPtr->releaseSourceAndAST();

src/Parsers/CppParser/cppdocumentprocessor.h

@@ -56,7 +56,8 @@ struct WordTokens
   enum class Type {
     Comment = 0,
     Doxygen,
-    Literal
+    Literal,
+    Identifier,
   };
 
   HashWords::key_type hash;

src/Parsers/CppParser/cppparseroptionswidget.cpp

@@ -37,12 +37,12 @@ CppParserOptionsWidget::CppParserOptionsWidget( const CppParserSettings* const s
   ui->labelDescriptionEmail->setText( ui->labelDescriptionEmail->text().arg( QLatin1String( SpellChecker::Parsers::CppParser::Constants::EMAIL_ADDRESS_REGEXP_PATTERN ) ) );
   ui->labelDescriptionWebsites->setText( ui->labelDescriptionWebsites->text().arg( QLatin1String( SpellChecker::Parsers::CppParser::Constants::WEBSITE_ADDRESS_REGEXP_PATTERN ) ) );
   /* Set up the options for What to Check */
-  ui->radioButtonWhatComments->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckComments );
-  ui->radioButtonWhatLiterals->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckStringLiterals );
-  ui->radioButtonWhatBoth->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckBoth );
-  connect( ui->radioButtonWhatComments, &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
-  connect( ui->radioButtonWhatLiterals, &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
-  connect( ui->radioButtonWhatBoth,     &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
+  ui->checkBoxWhatComments->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckComments );
+  ui->checkBoxWhatLiterals->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckStringLiterals );
+  ui->checkBoxWhatIdentifiers->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckIdentifiers );
+  connect( ui->checkBoxWhatComments, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
+  connect( ui->checkBoxWhatLiterals, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
+  connect( ui->checkBoxWhatIdentifiers, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
   /* Set up the options for Comments to Check */
   ui->radioButtonCommentsC->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CommentsC );
   ui->radioButtonCommentsCpp->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CommentsCpp );
@@ -101,11 +101,9 @@ const CppParserSettings& CppParserOptionsWidget::settings()
 }
 // --------------------------------------------------
 
-void CppParserOptionsWidget::radioButtonWhatToggled()
+void CppParserOptionsWidget::checkBoxWhatToggled()
 {
-  if( static_cast<QRadioButton*>( sender() )->isChecked() == true ) {
-    m_settings.whatToCheck = static_cast<CppParserSettings::WhatToCheckOptions>( sender()->property( ENUM_VAL_PROPERTY ).toInt() );
-  }
+  m_settings.whatToCheck.setFlag( static_cast<CppParserSettings::WhatToCheck>( sender()->property( ENUM_VAL_PROPERTY ).toInt() ), static_cast<QAbstractButton *>( sender() )->isChecked() );
 }
 // --------------------------------------------------
 
@@ -154,9 +152,10 @@ void CppParserOptionsWidget::updateWithSettings( const CppParserSettings* const
   ui->checkBoxRemoveEmailAddresses->setChecked( settings->removeEmailAddresses );
   ui->checkBoxIgnoreKeywords->setChecked( !settings->checkQtKeywords );
   ui->checkBoxIgnoreCaps->setChecked( !settings->checkAllCapsWords );
-  QRadioButton* whatButtons[] = { nullptr, ui->radioButtonWhatComments, ui->radioButtonWhatLiterals, ui->radioButtonWhatBoth };
-  whatButtons[settings->whatToCheck]->setChecked( true );
-  QRadioButton* commentButtons[] = { nullptr, ui->radioButtonCommentsC, ui->radioButtonCommentsCpp, ui->radioButtonCommentsBoth };
+  ui->checkBoxWhatComments->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckComments ) );
+  ui->checkBoxWhatLiterals->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckStringLiterals ) );
+  ui->checkBoxWhatIdentifiers->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckIdentifiers ) );
+  QRadioButton *commentButtons[] = { nullptr, ui->radioButtonCommentsC, ui->radioButtonCommentsCpp, ui->radioButtonCommentsBoth };
   commentButtons[settings->commentsToCheck]->setChecked( true );
   QRadioButton* numberButtons[] = { ui->radioButtonNumbersRemove, ui->radioButtonNumbersSplit, ui->radioButtonNumbersLeave };
   numberButtons[settings->wordsWithNumberOption]->setChecked( true );

src/Parsers/CppParser/cppparseroptionswidget.h

@@ -45,7 +45,7 @@ class CppParserOptionsWidget
   const CppParserSettings& settings();
 
 public slots:
-  void radioButtonWhatToggled();
+  void checkBoxWhatToggled();
   void radioButtonCommentsToggled();
   void radioButtonNumbersToggled();
   void radioButtonUnderscoresToggled();