Merge branch 'master' into import_externals

Luke Owlclaw2 · Luke Owlclaw2 · commit 9d2445f41659 · 2019-03-18T05:28:25.000+01:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,25 @@
 ### Installed product versions
 - Visual Studio: [example 2015 Professional]
 - This extension: [example 1.1.21]
+- Options override:
+```
+[example {
+                CamelCaseEnumerationValues = false,
+                CamelCasePropertyNames = true,
+                CamelCaseTypeNames = false,
+
+                WebEssentials2015 = false,
+
+                ClassInsteadOfInterface = false,
+                DeclareModule = false,
+                DefaultModuleName = "Server.Dtos",
+                EOLType = EOLType.LF,
+                IgnoreIntellisense = true,
+                IndentTab = false,
+                IndentTabSize = 2,
+                UseNamespace = true,            
+}]
+```
 
 ### Description
 Replace this text with a short description
@@ -15,4 +34,4 @@ Replace this text with a short description
 Explain what it's doing and why it's wrong
 
 ### Expected behavior
-Explain what it should be doing after it's fixed.
+Explain what it should be doing after it's fixed.
diff --git a/lib/Microsoft.VisualStudio.Telemetry.dll b/lib/Microsoft.VisualStudio.Telemetry.dll
diff --git a/src/TypeScriptDefinitionGenerator/DtsPackage.cs b/src/TypeScriptDefinitionGenerator/DtsPackage.cs
@@ -15,7 +15,7 @@ namespace TypeScriptDefinitionGenerator
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideLanguageEditorOptionPage(typeof(OptionsDialogPage), "TypeScript", null, "Generate d.ts", null, new[] { "d.ts" })]
     [ProvideCodeGenerator(typeof(DtsGenerator), DtsGenerator.Name, DtsGenerator.Description, true)]
-    [ProvideAutoLoad(PackageGuids.UIContextRuleString)]
+    [ProvideAutoLoad(PackageGuids.UIContextRuleString, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideUIContextRule(PackageGuids.UIContextRuleString,
         name: "Auto load",
         expression: "cs | vb",
@@ -40,6 +40,8 @@ public static void EnsurePackageLoad()
 
         protected override async Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+
             Options = (OptionsDialogPage)GetDialogPage(typeof(OptionsDialogPage));
 
             await ToggleCustomTool.InitializeAsync(this);
diff --git a/src/TypeScriptDefinitionGenerator/Generator/IntellisenseParser.cs b/src/TypeScriptDefinitionGenerator/Generator/IntellisenseParser.cs
@@ -201,6 +201,11 @@ private static bool IsPublic(CodeFunction cf)
             return retVal;
         }
 
+        private static string GetInterfaceName(CodeInterface cc)
+        {
+            return cc.Name;
+        }
+
         private static string GetClassName(CodeClass cc)
         {
             return cc.Name;
@@ -211,6 +216,16 @@ private static string GetEnumName(CodeEnum cc)
             return cc.Name;
         }
 
+        private static string GetNamespace(CodeInterface cc)
+        {
+            if (!Options.UseNamespace)
+                return Options.DefaultModuleName;
+
+            return cc == null
+                ? Options.DefaultModuleName
+                : cc.Namespace.FullName;
+        }
+
         private static string GetNamespace(CodeClass cc)
         {
             if (!Options.UseNamespace)
@@ -243,13 +258,16 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
 
             if (isCollection)
             {
-                isDictionary = codeTypeRef.AsString.StartsWith("System.Collections.Generic.Dictionary", StringComparison.Ordinal);
+                isDictionary = codeTypeRef.AsString.StartsWith("System.Collections.Generic.Dictionary", StringComparison.Ordinal)
+                    || codeTypeRef.AsString.StartsWith("System.Collections.Generic.IDictionary", StringComparison.Ordinal);
             }
 
             string typeName = effectiveTypeRef.AsFullName;
 
             try
             {
+                //VSHelpers.WriteOnBuildDebugWindow($"%{(effectiveTypeRef.CodeType as CodeInterface2) != null}%");
+                var codeInterface = effectiveTypeRef.CodeType as CodeInterface2;
                 var codeClass = effectiveTypeRef.CodeType as CodeClass2;
                 var codeEnum = effectiveTypeRef.CodeType as CodeEnum;
                 var isPrimitive = IsPrimitive(effectiveTypeRef);
@@ -277,8 +295,10 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT
                             hasIntellisense = HasIntellisense(codeEnum.ProjectItem, references);
                     }
 
+                    //VSHelpers.WriteOnBuildDebugWindow($"@{codeClass != null}@{codeEnum != null}@{hasIntellisense}@{Options.DeclareModule}");
                     result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeClass) + "." : "") + Utility.CamelCaseClassName(GetClassName(codeClass)) : null) ??
-                                                     (codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(GetEnumName(codeEnum)) : null);
+                                                     (codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(GetEnumName(codeEnum)) : null) ?? 
+                                                     (codeInterface != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeInterface) + "." : "") + Utility.CamelCaseClassName(GetInterfaceName(codeInterface)) : null);
                 }
 
                 if (!isPrimitive && (codeClass != null || codeEnum != null) && !traversedTypes.Contains(effectiveTypeRef.CodeType.FullName) && !isCollection)
diff --git a/src/TypeScriptDefinitionGenerator/Generator/IntellisenseType.cs b/src/TypeScriptDefinitionGenerator/Generator/IntellisenseType.cs
@@ -68,6 +68,7 @@ private string GetTargetName(string codeName, bool js)
                     return "Date";
 
                 case "guid":
+                case "system.guid":
                 case "string":
                     return js ? "String" : "string";
 
diff --git a/src/TypeScriptDefinitionGenerator/TypeScriptDefinitionGenerator.csproj b/src/TypeScriptDefinitionGenerator/TypeScriptDefinitionGenerator.csproj
@@ -107,8 +107,8 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.16.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\lib\net45\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
+    <Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -131,7 +131,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.RemoteControl, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.0.263-masterA66FF384\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.RemoteControl.14.1.2\lib\net45\Microsoft.VisualStudio.RemoteControl.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Shell.15.0.15.4.27004\lib\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
@@ -174,7 +174,7 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Telemetry, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.8.950-master0B174108\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Telemetry.15.8.956\lib\net45\Microsoft.VisualStudio.Telemetry.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Text.Data.15.4.27004\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
@@ -224,7 +224,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities.Internal, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.0.79-master7F49A4E3\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.VisualStudio.Utilities.Internal.14.1.2\lib\net45\Microsoft.VisualStudio.Utilities.Internal.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
@@ -287,11 +287,9 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\..\packages\Microsoft.VSSDK.BuildTools.15.5.72\build\Microsoft.VSSDK.BuildTools.targets')" />
   <Import Project="..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Threading.Analyzers.15.7.17\build\Microsoft.VisualStudio.Threading.Analyzers.targets')" />
-  <Import Project="..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets" Condition="Exists('..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.16-beta\build\portable-net45+win8+wpa81\Microsoft.Diagnostics.Tracing.EventSource.Redist.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/TypeScriptDefinitionGenerator/app.config b/src/TypeScriptDefinitionGenerator/app.config
@@ -6,6 +6,10 @@
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.1.28.0" newVersion="1.1.28.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
diff --git a/src/TypeScriptDefinitionGenerator/packages.config b/src/TypeScriptDefinitionGenerator/packages.config
@@ -1,11 +1,11 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.16-beta" targetFramework="net462" />
+  <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Editor" version="15.4.27004" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Imaging" version="15.4.27004" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.RemoteControl" version="14.0.263-masterA66FF384" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.RemoteControl" version="14.1.2" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.SDK.Analyzers" version="15.7.4" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.SDK.EmbedInteropTypes" version="15.0.12" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Shell.15.0" version="15.4.27004" targetFramework="net462" />
@@ -17,7 +17,7 @@
   <package id="Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime" version="15.0.26606" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
-  <package id="Microsoft.VisualStudio.Telemetry" version="15.8.950-master0B174108" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Telemetry" version="15.8.956" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Text.Data" version="15.4.27004" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Text.Logic" version="15.4.27004" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Text.UI" version="15.4.27004" targetFramework="net46" />
@@ -31,7 +31,7 @@
   <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Threading.Analyzers" version="15.7.17" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net462" />
-  <package id="Microsoft.VisualStudio.Utilities.Internal" version="14.0.79-master7F49A4E3" targetFramework="net462" />
+  <package id="Microsoft.VisualStudio.Utilities.Internal" version="14.1.2" targetFramework="net462" />
   <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net462" />
   <package id="Microsoft.VSSDK.BuildTools" version="15.5.72" targetFramework="net462" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
diff --git a/tests/ClassLibrary1/SomeSomeClass.cs b/tests/ClassLibrary1/SomeSomeClass.cs
@@ -16,5 +16,7 @@ public class SomeSomeClass: SomeClass
         public IEnumerable<int> Inc10 { get; set; }
         public int[] Inc11 { get; set; }
         public bool Inc12 { get; set; }
+        public Dictionary<string, int> Inc13 { get; set; }
+        public IDictionary<string, int> Inc14 { get; set; }
     }
 }
diff --git a/tests/TypeScriptDefinitionGenerator.Tests/IntellisenseParserTest.cs b/tests/TypeScriptDefinitionGenerator.Tests/IntellisenseParserTest.cs

Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,11 @@ private static bool IsPublic(CodeFunction cf)`
`201`	`201`	`return retVal;`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ private static string GetInterfaceName(CodeInterface cc)`
	`205`	`+ {`
	`206`	`+ return cc.Name;`
	`207`	`+ }`
	`208`	`+`
`204`	`209`	`private static string GetClassName(CodeClass cc)`
`205`	`210`	`{`
`206`	`211`	`return cc.Name;`
`@@ -211,6 +216,16 @@ private static string GetEnumName(CodeEnum cc)`
`211`	`216`	`return cc.Name;`
`212`	`217`	`}`
`213`	`218`
	`219`	`+ private static string GetNamespace(CodeInterface cc)`
	`220`	`+ {`
	`221`	`+ if (!Options.UseNamespace)`
	`222`	`+ return Options.DefaultModuleName;`
	`223`	`+`
	`224`	`+ return cc == null`
	`225`	`+ ? Options.DefaultModuleName`
	`226`	`+ : cc.Namespace.FullName;`
	`227`	`+ }`
	`228`	`+`
`214`	`229`	`private static string GetNamespace(CodeClass cc)`
`215`	`230`	`{`
`216`	`231`	`if (!Options.UseNamespace)`
`@@ -243,13 +258,16 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT`
`243`	`258`
`244`	`259`	`if (isCollection)`
`245`	`260`	`{`
`246`		`- isDictionary = codeTypeRef.AsString.StartsWith("System.Collections.Generic.Dictionary", StringComparison.Ordinal);`
	`261`	`+ isDictionary = codeTypeRef.AsString.StartsWith("System.Collections.Generic.Dictionary", StringComparison.Ordinal)`
	`262`	`+ \|\| codeTypeRef.AsString.StartsWith("System.Collections.Generic.IDictionary", StringComparison.Ordinal);`
`247`	`263`	`}`
`248`	`264`
`249`	`265`	`string typeName = effectiveTypeRef.AsFullName;`
`250`	`266`
`251`	`267`	`try`
`252`	`268`	`{`
	`269`	`+ //VSHelpers.WriteOnBuildDebugWindow($"%{(effectiveTypeRef.CodeType as CodeInterface2) != null}%");`
	`270`	`+ var codeInterface = effectiveTypeRef.CodeType as CodeInterface2;`
`253`	`271`	`var codeClass = effectiveTypeRef.CodeType as CodeClass2;`
`254`	`272`	`var codeEnum = effectiveTypeRef.CodeType as CodeEnum;`
`255`	`273`	`var isPrimitive = IsPrimitive(effectiveTypeRef);`
`@@ -277,8 +295,10 @@ private static IntellisenseType GetType(CodeClass rootElement, CodeTypeRef codeT`
`277`	`295`	`hasIntellisense = HasIntellisense(codeEnum.ProjectItem, references);`
`278`	`296`	`}`
`279`	`297`
	`298`	`+ //VSHelpers.WriteOnBuildDebugWindow($"@{codeClass != null}@{codeEnum != null}@{hasIntellisense}@{Options.DeclareModule}");`
`280`	`299`	`result.ClientSideReferenceName = (codeClass != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeClass) + "." : "") + Utility.CamelCaseClassName(GetClassName(codeClass)) : null) ??`
`281`		`- (codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(GetEnumName(codeEnum)) : null);`
	`300`	`+ (codeEnum != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeEnum) + "." : "") + Utility.CamelCaseClassName(GetEnumName(codeEnum)) : null) ??`
	`301`	`+ (codeInterface != null && hasIntellisense ? (Options.DeclareModule ? GetNamespace(codeInterface) + "." : "") + Utility.CamelCaseClassName(GetInterfaceName(codeInterface)) : null);`
`282`	`302`	`}`
`283`	`303`
`284`	`304`	`if (!isPrimitive && (codeClass != null \|\| codeEnum != null) && !traversedTypes.Contains(effectiveTypeRef.CodeType.FullName) && !isCollection)`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,7 @@ public class SomeSomeClass: SomeClass`
`16`	`16`	`public IEnumerable<int> Inc10 { get; set; }`
`17`	`17`	`public int[] Inc11 { get; set; }`
`18`	`18`	`public bool Inc12 { get; set; }`
	`19`	`+ public Dictionary<string, int> Inc13 { get; set; }`
	`20`	`+ public IDictionary<string, int> Inc14 { get; set; }`
`19`	`21`	`}`
`20`	`22`	`}`