Skip to content

Commit 5d3c87a

Browse files
committed
Merge pull request hilkoc#6 from tommy9/master
Add optional Friend keyword for class subs/functions/properties
2 parents 125586b + cb72b9f commit 5d3c87a

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

src/vbaDeveloper.xlam/Formatter.bas

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,28 @@ Private Const BEG_SUB = "Sub "
55
Private Const END_SUB = "End Sub"
66
Private Const BEG_PB_SUB = "Public Sub "
77
Private Const BEG_PV_SUB = "Private Sub "
8+
Private Const BEG_FR_SUB = "Friend Sub "
9+
Private Const BEG_PB_ST_SUB = "Public Static Sub "
10+
Private Const BEG_PV_ST_SUB = "Private Static Sub "
11+
Private Const BEG_FR_ST_SUB = "Friend Static Sub "
812

913
Private Const BEG_FUN = "Function "
1014
Private Const END_FUN = "End Function"
1115
Private Const BEG_PB_FUN = "Public Function "
1216
Private Const BEG_PV_FUN = "Private Function "
17+
Private Const BEG_FR_FUN = "Friend Function "
18+
Private Const BEG_PB_ST_FUN = "Public Static Function "
19+
Private Const BEG_PV_ST_FUN = "Private Static Function "
20+
Private Const BEG_FR_ST_FUN = "Friend Static Function "
1321

1422
Private Const BEG_PROP = "Property "
1523
Private Const END_PROP = "End Property"
1624
Private Const BEG_PB_PROP = "Public Property "
1725
Private Const BEG_PV_PROP = "Private Property "
26+
Private Const BEG_FR_PROP = "Friend Property "
27+
Private Const BEG_PB_ST_PROP = "Public Static Property "
28+
Private Const BEG_PV_ST_PROP = "Private Static Property "
29+
Private Const BEG_FR_ST_PROP = "Friend Static Property "
1830

1931
Private Const BEG_ENUM = "Enum "
2032
Private Const END_ENUM = "End Enum"
@@ -80,16 +92,28 @@ Private Sub initializeWords()
8092
w.Add END_SUB, -1
8193
w.Add BEG_PB_SUB, 1
8294
w.Add BEG_PV_SUB, 1
95+
w.Add BEG_FR_SUB, 1
96+
w.Add BEG_PB_ST_SUB, 1
97+
w.Add BEG_PV_ST_SUB, 1
98+
w.Add BEG_FR_ST_SUB, 1
8399

84100
w.Add BEG_FUN, 1
85101
w.Add END_FUN, -1
86102
w.Add BEG_PB_FUN, 1
87103
w.Add BEG_PV_FUN, 1
104+
w.Add BEG_FR_FUN, 1
105+
w.Add BEG_PB_ST_FUN, 1
106+
w.Add BEG_PV_ST_FUN, 1
107+
w.Add BEG_FR_ST_FUN, 1
88108

89109
w.Add BEG_PROP, 1
90110
w.Add END_PROP, -1
91111
w.Add BEG_PB_PROP, 1
92112
w.Add BEG_PV_PROP, 1
113+
w.Add BEG_FR_PROP, 1
114+
w.Add BEG_PB_ST_PROP, 1
115+
w.Add BEG_PV_ST_PROP, 1
116+
w.Add BEG_FR_ST_PROP, 1
93117

94118
w.Add BEG_ENUM, 1
95119
w.Add END_ENUM, -1

0 commit comments

Comments
 (0)