append example declarations

Author: josef-poetzl

Tests/ACLibDeclarationDict/DeclarationDictTestCodemodule.cls

@@ -14,10 +14,9 @@ Option Explicit
 
 Dim AccUnitX As Long
 Private m_AccUnitInfo As String
+Public Field As String
 
-Private Enum TestEnum
-   TestEnum_P1 = 2
-End Enum
+Private Enum TestEnum: TestEnum_P1 = 2: End Enum
 Private Type TestType1
    FldA As Long
    FldB As String
@@ -37,8 +36,12 @@ End Type
 
 Public Event RaiseSomething(ByVal EventParam1 As Variant)
 
+Private Declare PtrSafe Sub Sleep Lib "kernel32" (ByVal dwMilliseconds As LongPtr)
+
+Public Event RaiseSomething2(ByVal EventParam1 As Variant, ByVal EventParam2 As Variant)
+
 Private Sub Class_Initialize()
-'
+' Dim Class_Initialize_Xyz as String ... ignored!
 End Sub
 
 Public Function AccUnitTestFunct(ByVal FuncParam1 As Variant, FuncParam2() As String) As Variant
@@ -47,6 +50,8 @@ Public Function AccUnitTestFunct(ByVal FuncParam1 As Variant, FuncParam2() As St
    Dim FuncVar3()
 
    Dim FuncVar4 As Long: FuncVar4 = 5
+   
+   Dim Dim1 As Long: Dim Dim2 As Long
 
 End Function
 
@@ -57,7 +62,12 @@ Friend Property Let Name2(ByVal NewValue As String)
 '
 End Property
 
-Friend Property Set Formatter(ByVal ObjRef As Object)
+Friend Property Set PropertySet(ByVal ObjRef As Object)
 '
 End Property
 
+Private Sub TestMe() ' _
+Private Sub ThisIsOnlyAComment(
+
+End Sub
+

Tests/ACLibDeclarationDict/DeclarationDictTests.cls

@@ -119,27 +119,25 @@ Public Sub ImportCodeModule_CheckKeys()
    Dim ActualDict As Scripting.Dictionary
 
    Dim ExpectedKeys() As Variant
-   ExpectedKeys = Array("AccUnitX", "m_AccUnitInfo", _
+   ExpectedKeys = Array("AccUnitX", "m_AccUnitInfo", "Field", _
                         "TestEnum", "TestEnum_P1", _
                         "TestType1", "FldA", "FldB", "FldC", _
                         "TestEnum2", "TestEnum2_P1", "TestEnum2_P2", _
                         "TestType2", "Fld2A", "Fld2B", _
                         "RaiseSomething", "EventParam1", _
+                        "Sleep", "dwMilliseconds", _
+                        "RaiseSomething2", "EventParam2", _
                         "Class_Initialize", _
-                        "AccUnitTestFunct", "FuncParam1", "FuncParam2", "FuncVar1", "FuncVar2", "FuncVar3", "FuncVar4", _
+                        "AccUnitTestFunct", "FuncParam1", "FuncParam2", "FuncVar1", "FuncVar2", "FuncVar3", "FuncVar4", "Dim1", "Dim2", _
                         "Name1", "Name2", "NewValue", _
-                        "Formatter", "ObjRef")
+                        "PropertySet", "ObjRef", _
+                        "TestMe")
 
    '
    m_DeclDict.ImportVBComponent CurrentVbProject.VBComponents("DeclarationDictTestCodemodule")
 
    Set ActualDict = m_DeclDict.Dict
 
-'   Dim k As Long
-'   For k = 0 To m_DeclDict.Count - 1
-'      Debug.Print m_DeclDict.Dict.Keys(k)
-'   Next
-   
    Assert.That ActualDict.Count, Iz.EqualTo(UBound(ExpectedKeys) + 1), "Count of items"
 
 

source/dbs-properties.json

@@ -101,7 +101,7 @@
       "Type": 4
     },
     "NavPane Width": {
-      "Value": 633,
+      "Value": 335,
       "Type": 4
     },
     "Never Cache": {

source/modules/DeclarationDict.cls

@@ -218,7 +218,6 @@ Private Sub AddFromCode(ByVal Code As String, ByVal RegEx As RegExp, ByVal IsPro
    Dim i As Long
 
    For Each Match In RegEx.Execute(Code)
-      If IsProcedure Then Debug.Print Match.Value
       For i = 0 To Match.SubMatches.Count - 1
          AddWordFromDeclaration Match.SubMatches(i), IsProcedure, IsEnumTypeBlock
       Next