@@ -13,7 +13,6 @@ namespace TypeScriptDefinitionGenerator
1313{
1414 internal static class IntellisenseParser
1515 {
16- private const string ModuleNameAttributeName = "TypeScriptModule" ;
1716 private static readonly Regex IsNumber = new Regex ( "^[0-9a-fx]+[ul]{0,2}$" , RegexOptions . IgnoreCase | RegexOptions . Compiled ) ;
1817 private static Project _project ;
1918
@@ -205,8 +204,11 @@ private static bool IsPublic(CodeFunction cf)
205204 private static string GetClassName ( CodeClass cc )
206205 {
207206 return cc . Name ;
207+ }
208208
209- // return GetDataContractName(cc, "Name") ?? cc.Name;
209+ private static string GetEnumName ( CodeEnum cc )
210+ {
211+ return cc . Name ;
210212 }
211213
212214 private static string GetNamespace ( CodeClass cc )
@@ -217,8 +219,6 @@ private static string GetNamespace(CodeClass cc)
217219 return cc == null
218220 ? Options . DefaultModuleName
219221 : cc . Namespace . FullName ;
220-
221- //return GetDataContractName(cc, "Namespace") ?? GetNamespace(cc.Attributes);
222222 }
223223
224224 private static string GetNamespace ( CodeEnum cc )
@@ -229,41 +229,8 @@ private static string GetNamespace(CodeEnum cc)
229229 return cc == null
230230 ? Options . DefaultModuleName
231231 : cc . Namespace . FullName ;
232-
233- //return GetNamespace(cc.Attributes);
234232 }
235233
236- //private static string GetDataContractName(CodeClass cc, string attrName)
237- //{
238- // var dataContractAttribute = cc.Attributes.Cast<CodeAttribute>().Where(a => a.Name == "DataContract");
239-
240- // if (!dataContractAttribute.Any())
241- // return null;
242-
243- // string name = null;
244- // var keyValues = dataContractAttribute.First().Children.OfType<CodeAttributeArgument>()
245- // .ToDictionary(a => a.Name, a => (a.Value ?? "").Trim('\"', '\''));
246-
247- // if (keyValues.ContainsKey(attrName))
248- // name = keyValues[attrName];
249-
250- // return name;
251- //}
252-
253- //private static string GetNamespace(CodeElements attrs)
254- //{
255- // if (attrs == null || attrs.Count == 0) return Options.DefaultModuleName;
256-
257- // var namespaceFromAttr = from a in attrs.Cast<CodeAttribute2>()
258- // where a.Name.EndsWith(ModuleNameAttributeName, StringComparison.OrdinalIgnoreCase)
259- // from arg in a.Arguments.Cast<CodeAttributeArgument>()
260- // let v = (arg.Value ?? "").Trim('\"')
261- // where !string.IsNullOrWhiteSpace(v)
262- // select v;
263-
264- // return namespaceFromAttr.FirstOrDefault() ?? Options.DefaultModuleName;
265- //}
266-
267234 private static IntellisenseType GetType ( CodeClass rootElement , CodeTypeRef codeTypeRef , HashSet < string > traversedTypes , HashSet < string > references )
268235 {
269236 var isArray = codeTypeRef . TypeKind == vsCMTypeRef . vsCMTypeRefArray ;
@@ -280,7 +247,7 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
280247 }
281248
282249 string typeName = effectiveTypeRef . AsFullName ;
283-
250+
284251 try
285252 {
286253 var codeClass = effectiveTypeRef . CodeType as CodeClass2 ;
@@ -311,7 +278,7 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
311278 }
312279
313280 result . ClientSideReferenceName = ( codeClass != null && hasIntellisense ? ( Options . DeclareModule ? GetNamespace ( codeClass ) + "." : "" ) + Utility . CamelCaseClassName ( GetClassName ( codeClass ) ) : null ) ??
314- ( codeEnum != null && hasIntellisense ? ( Options . DeclareModule ? GetNamespace ( codeEnum ) + "." : "" ) + Utility . CamelCaseClassName ( codeEnum . Name ) : null ) ;
281+ ( codeEnum != null && hasIntellisense ? ( Options . DeclareModule ? GetNamespace ( codeEnum ) + "." : "" ) + Utility . CamelCaseClassName ( GetEnumName ( codeEnum ) ) : null ) ;
315282 }
316283
317284 if ( ! isPrimitive && ( codeClass != null || codeEnum != null ) && ! traversedTypes . Contains ( effectiveTypeRef . CodeType . FullName ) && ! isCollection )
0 commit comments