Merge branch 'master' into feature/3_Dynamic_build_module_name_from_server_dto's_namespace

Author: Denis Peshkov

.gitignore

@@ -21,4 +21,5 @@ x64/
 *.ncrunchsolution
 *.ncrunchproject
 _NCrunch_WebCompiler
-*.d.ts
+*.generated.d.ts
+*.generated.ts

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Mads Kristensen
+Copyright 2018 Denis Peshkov
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

appveyor.yml

@@ -22,7 +22,7 @@ for:
   install:
     - ps: (new-object Net.WebClient).DownloadString("https://raw.github.com/denis-peshkov/ExtensionScripts/master/AppVeyor/vsix.ps1") | iex
   before_build: 
-    - ps: Vsix-IncrementVsixVersion | Vsix-UpdateBuildVersion
+    - ps: Vsix-IncrementVsixVersion -initialVersion 2.1.0.0 -updateVsixCsVersion | Vsix-UpdateBuildVersion
   after_test:
     - ps: Vsix-PushArtifacts | Vsix-PublishToGallery
 

src/TypeScriptDefinitionGenerator/Generator/IntellisenseParser.cs

@@ -297,6 +297,8 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
 
                 //VSHelpers.WriteOnBuildDebugWindow($"#{result.CodeName}#{result.TypeScriptName}#{effectiveTypeRef.AsString}#{effectiveTypeRef.AsFullName}#{effectiveTypeRef.CodeType}");
                 //VSHelpers.WriteOnBuildDebugWindow($"##{effectiveTypeRef.TypeKind}##{vsCMTypeRef.vsCMTypeRefCodeType}##{effectiveTypeRef.CodeType.InfoLocation}##{vsCMInfoLocation.vsCMInfoLocationProject}");
+
+                result.ClientSideReferenceName = null;
                 if (effectiveTypeRef.TypeKind == vsCMTypeRef.vsCMTypeRefCodeType)
                 {
                     var hasIntellisense = Options.IgnoreIntellisense;
@@ -308,10 +310,9 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
                             hasIntellisense = HasIntellisense(codeEnum.ProjectItem, references);
                     }
 
-                    result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (GetNamespace(codeClass) + "." + Utility.CamelCaseClassName(GetClassName(codeClass))) : null) ??
-                                                     (codeEnum != null && hasIntellisense ? (GetNamespace(codeEnum) + "." + Utility.CamelCaseClassName(codeEnum.Name)) : null);
+                    result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeClass) + "." : "") + Utility.CamelCaseClassName(GetClassName(codeClass)) : null) ??
+                                                     (codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(codeEnum.Name) : null);
                 }
-                else result.ClientSideReferenceName = null;
 
                 if (!isPrimitive && (codeClass != null || codeEnum != null) && !traversedTypes.Contains(effectiveTypeRef.CodeType.FullName) && !isCollection)
                 {

tests/ClassLibrary1/ClassLibrary1.csproj

@@ -5,10 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="Some.generated.d.ts">
+    <None Update="Some.generated.ts">
       <DependentUpon>Some.cs</DependentUpon>
     </None>
-    <None Update="SomeClass.generated.d.ts">
+    <None Update="SomeClass.generated.ts">
       <DependentUpon>SomeClass.cs</DependentUpon>
     </None>
     <None Update="SomeSomeClass.generated.d.ts">

tests/TypeScriptDefinitionGenerator.Tests/TypeScriptDefinitionGenerator.Tests.csproj

@@ -40,7 +40,7 @@
     <None Update="Class1.cs.generated.d.ts">
       <DependentUpon>Class1.cs</DependentUpon>
     </None>
-    <None Update="Class1.generated.d.ts">
+    <None Update="Class1.generated.ts">
       <DependentUpon>Class1.cs</DependentUpon>
     </None>
   </ItemGroup>