Skip to content

Commit ab45eea

Browse files
author
Denis Peshkov
committed
small fix: when Options.DeclareModule is false no namespaces were added
1 parent 5e3ade5 commit ab45eea

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ x64/
2121
*.ncrunchsolution
2222
*.ncrunchproject
2323
_NCrunch_WebCompiler
24-
*.d.ts
24+
*.generated.d.ts
25+
*.generated.ts

src/TypeScriptDefinitionGenerator/Generator/IntellisenseParser.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,8 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
278278

279279
//VSHelpers.WriteOnBuildDebugWindow($"#{result.CodeName}#{result.TypeScriptName}#{effectiveTypeRef.AsString}#{effectiveTypeRef.AsFullName}#{effectiveTypeRef.CodeType}");
280280
//VSHelpers.WriteOnBuildDebugWindow($"##{effectiveTypeRef.TypeKind}##{vsCMTypeRef.vsCMTypeRefCodeType}##{effectiveTypeRef.CodeType.InfoLocation}##{vsCMInfoLocation.vsCMInfoLocationProject}");
281+
282+
result.ClientSideReferenceName = null;
281283
if (effectiveTypeRef.TypeKind == vsCMTypeRef.vsCMTypeRefCodeType)
282284
{
283285
var hasIntellisense = Options.IgnoreIntellisense;
@@ -289,10 +291,9 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
289291
hasIntellisense = HasIntellisense(codeEnum.ProjectItem, references);
290292
}
291293

292-
result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (GetNamespace(codeClass) + "." + Utility.CamelCaseClassName(GetClassName(codeClass))) : null) ??
293-
(codeEnum != null && hasIntellisense ? (GetNamespace(codeEnum) + "." + Utility.CamelCaseClassName(codeEnum.Name)) : null);
294+
result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeClass) + "." : "") + Utility.CamelCaseClassName(GetClassName(codeClass)) : null) ??
295+
(codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(codeEnum.Name) : null);
294296
}
295-
else result.ClientSideReferenceName = null;
296297

297298
if (!isPrimitive && (codeClass != null || codeEnum != null) && !traversedTypes.Contains(effectiveTypeRef.CodeType.FullName) && !isCollection)
298299
{

tests/ClassLibrary1/ClassLibrary1.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<None Update="Some.generated.d.ts">
8+
<None Update="Some.generated.ts">
99
<DependentUpon>Some.cs</DependentUpon>
1010
</None>
11-
<None Update="SomeClass.generated.d.ts">
11+
<None Update="SomeClass.generated.ts">
1212
<DependentUpon>SomeClass.cs</DependentUpon>
1313
</None>
1414
<None Update="SomeSomeClass.generated.d.ts">

tests/TypeScriptDefinitionGenerator.Tests/TypeScriptDefinitionGenerator.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<None Update="Class1.cs.generated.d.ts">
4141
<DependentUpon>Class1.cs</DependentUpon>
4242
</None>
43-
<None Update="Class1.generated.d.ts">
43+
<None Update="Class1.generated.ts">
4444
<DependentUpon>Class1.cs</DependentUpon>
4545
</None>
4646
</ItemGroup>

0 commit comments

Comments
 (0)