Add checks for identifiers

Author: zeule

src/Parsers/CppParser/cppdocumentparser.cpp

@@ -398,7 +398,6 @@ CppDocumentParser::CppDocumentParser( QObject* parent )
       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

@@ -39,8 +39,10 @@ CppParserOptionsWidget::CppParserOptionsWidget( const CppParserSettings* const s
   /* Set up the options for What to Check */
   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 );
@@ -152,6 +154,7 @@ void CppParserOptionsWidget::updateWithSettings( const CppParserSettings* const
   ui->checkBoxIgnoreCaps->setChecked( !settings->checkAllCapsWords );
   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 };

src/Parsers/CppParser/cppparseroptionswidget.ui

@@ -68,7 +68,7 @@
         <x>0</x>
         <y>0</y>
         <width>801</width>
-        <height>1803</height>
+        <height>1843</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -111,6 +111,13 @@
           <property name="verticalSpacing">
            <number>0</number>
           </property>
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxWhatComments">
+            <property name="text">
+             <string>Comments</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_19">
             <property name="orientation">
@@ -148,6 +155,13 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxWhatLiterals">
+            <property name="text">
+             <string>String Literals</string>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_20">
             <property name="orientation">
@@ -201,20 +215,47 @@
             </property>
            </spacer>
           </item>
-          <item row="0" column="0" colspan="2">
-           <widget class="QCheckBox" name="checkBoxWhatComments">
+          <item row="5" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxWhatIdentifiers">
             <property name="text">
-             <string>Comments</string>
+             <string>Identifiers</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QCheckBox" name="checkBoxWhatLiterals">
+          <item row="7" column="1">
+           <widget class="QLabel" name="label">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <italic>true</italic>
+             </font>
+            </property>
             <property name="text">
-             <string>String Literals</string>
+             <string>Identifiers, such as variable, type, and function names.</string>
             </property>
            </widget>
           </item>
+          <item row="7" column="0">
+           <spacer name="horizontalSpacer_25">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Policy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>

src/Parsers/CppParser/cppparsersettings.h

@@ -40,9 +40,10 @@ class CppParserSettings
   ~CppParserSettings();
 
   enum WhatToCheck {
-    Tokens_NONE         = 0,        /*!< Invalid option needed for QFLAGS. */
-    CheckComments       = 1 << 0,   /*!< Check Comments. */
-    CheckStringLiterals = 1 << 1,   /*!< Check String Literals */
+    Tokens_NONE         = 0,      /*!< Invalid option needed for QFLAGS. */
+    CheckComments       = 1 << 0, /*!< Check Comments. */
+    CheckStringLiterals = 1 << 1, /*!< Check String Literals */
+    CheckIdentifiers    = 1 << 2, /*!< Check Identifiers */
   };
   Q_DECLARE_FLAGS( WhatToCheckOptions, WhatToCheck )