Fix #11422 debug: Missing variable class for variable with varid (#4616)

Author: chrchr-github

lib/tokenize.cpp

@@ -5639,7 +5639,7 @@ void Tokenizer::removePragma()
 void Tokenizer::removeMacroInClassDef()
 {
     for (Token *tok = list.front(); tok; tok = tok->next()) {
-        if (!Token::Match(tok, "class|struct %name% %name% {|:"))
+        if (!Token::Match(tok, "class|struct %name% %name% final| {|:"))
             continue;
 
         const bool nextIsUppercase = tok->next()->isUpperCaseName();

test/testtokenize.cpp

@@ -6634,6 +6634,7 @@ class TestTokenizer : public TestFixture {
     void removeMacroInClassDef() { // #6058
         ASSERT_EQUALS("class Fred { } ;", tokenizeAndStringify("class DLLEXPORT Fred { } ;"));
         ASSERT_EQUALS("class Fred : Base { } ;", tokenizeAndStringify("class Fred FINAL : Base { } ;"));
+        ASSERT_EQUALS("class Fred final : Base { } ;", tokenizeAndStringify("class DLLEXPORT Fred final : Base { } ;")); // #11422
         // Regression for C code:
         ASSERT_EQUALS("struct Fred { } ;", tokenizeAndStringify("struct DLLEXPORT Fred { } ;", true, Settings::Native, "test.c"));
     }