Fix #13725 Bad varid for nested class member (#7388)

Author: chrchr-github

lib/tokenize.cpp

@@ -4425,6 +4425,10 @@ static bool setVarIdClassDeclaration(Token* const startToken,
         }
         if (tok->str() == "{") {
             inEnum = isEnumStart(tok);
+            if (!inEnum && isClassStructUnionEnumStart(tok)) { // nested type
+                tok = tok->link();
+                continue;
+            }
             if (initList && !initListArgLastToken)
                 initList = false;
             ++indentlevel;

test/testvarid.cpp

@@ -150,6 +150,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(varid_in_class25);
         TEST_CASE(varid_in_class26);
         TEST_CASE(varid_in_class27);
+        TEST_CASE(varid_in_class28);
         TEST_CASE(varid_namespace_1);   // #7272
         TEST_CASE(varid_namespace_2);   // #7000
         TEST_CASE(varid_namespace_3);   // #8627
@@ -2346,6 +2347,22 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(expected, tokenize(code));
     }
 
+    void varid_in_class28() {
+        const char code[] = "struct S {\n" // 13725
+                            "    struct T {\n"
+                            "        bool b();\n"
+                            "    };\n"
+                            "    bool b = false;\n"
+                            "};\n";
+        const char expected[] = "1: struct S {\n"
+                                "2: struct T {\n"
+                                "3: bool b ( ) ;\n"
+                                "4: } ;\n"
+                                "5: bool b@1 ; b@1 = false ;\n"
+                                "6: } ;\n";
+        ASSERT_EQUALS(expected, tokenize(code));
+    }
+
     void varid_namespace_1() { // #7272
         const char code[] = "namespace Blah {\n"
                             "  struct foo { int x;};\n"