Address feedback from design meeting review

src/VisualStudio/Core/Def/Implementation/FindReferences/FindUsagesValueUsageInfoColumnDefinition.cs

@@ -28,7 +28,6 @@ internal sealed class FindUsagesValueUsageInfoColumnDefinition : AbstractFindUsa
 
         public const string ColumnName = nameof(SymbolUsageInfo);
 
-        
         // Allow filtering of the column by each allowed SymbolUsageInfo kind.
         public override IEnumerable<string> FilterPresets => SymbolUsageInfo.LocalizableStringsForAllAllowedValues;
         public override bool IsFilterable => true;

src/Workspaces/CSharp/Portable/LanguageServices/CSharpSyntaxFactsService.cs

@@ -699,6 +699,9 @@ public bool IsSimpleArgument(SyntaxNode node)
         public bool IsTypeArgumentList(SyntaxNode node)
             => node.IsKind(SyntaxKind.TypeArgumentList);
 
+        public bool IsTypeConstraint(SyntaxNode node)
+            => node.IsKind(SyntaxKind.TypeConstraint);
+
         public bool IsInConstantContext(SyntaxNode node)
         {
             return (node as ExpressionSyntax).IsInConstantContext();

src/Workspaces/Core/Portable/Extensions/SymbolUsageInfo.cs

@@ -17,15 +17,15 @@ namespace Microsoft.CodeAnalysis
         public static readonly SymbolUsageInfo None = Create(ValueUsageInfo.None);
         public static readonly ImmutableArray<string> LocalizableStringsForAllAllowedValues = CreateLocalizableStringsForAllAllowedValues();
 
-        private readonly ValueUsageInfo? _valueUsageInfoOpt;
-        private readonly TypeOrNamespaceUsageInfo? _typeOrNamespaceUsageInfoOpt;
+        public ValueUsageInfo? ValueUsageInfoOpt { get; }
+        public TypeOrNamespaceUsageInfo? TypeOrNamespaceUsageInfoOpt { get; }
 
         private SymbolUsageInfo(ValueUsageInfo? valueUsageInfoOpt, TypeOrNamespaceUsageInfo? typeOrNamespaceUsageInfoOpt)
         {
             Debug.Assert(valueUsageInfoOpt.HasValue ^ typeOrNamespaceUsageInfoOpt.HasValue);
 
-            _valueUsageInfoOpt = valueUsageInfoOpt;
-            _typeOrNamespaceUsageInfoOpt = typeOrNamespaceUsageInfoOpt;
+            ValueUsageInfoOpt = valueUsageInfoOpt;
+            TypeOrNamespaceUsageInfoOpt = typeOrNamespaceUsageInfoOpt;
         }
 
         public static SymbolUsageInfo Create(ValueUsageInfo valueUsageInfo)
@@ -48,18 +48,18 @@ private static ImmutableArray<string> CreateLocalizableStringsForAllAllowedValue
         }
 
         public bool IsReadFrom()
-            => _valueUsageInfoOpt.HasValue && _valueUsageInfoOpt.Value.IsReadFrom();
+            => ValueUsageInfoOpt.HasValue && ValueUsageInfoOpt.Value.IsReadFrom();
 
         public bool IsWrittenTo()
-            => _valueUsageInfoOpt.HasValue && _valueUsageInfoOpt.Value.IsWrittenTo();
+            => ValueUsageInfoOpt.HasValue && ValueUsageInfoOpt.Value.IsWrittenTo();
 
         public bool IsNameOnly()
-            => _valueUsageInfoOpt.HasValue && _valueUsageInfoOpt.Value.IsNameOnly();
+            => ValueUsageInfoOpt.HasValue && ValueUsageInfoOpt.Value.IsNameOnly();
 
         public string ToLocalizableString()
-            => _valueUsageInfoOpt.HasValue ? _valueUsageInfoOpt.Value.ToLocalizableString() : _typeOrNamespaceUsageInfoOpt.Value.ToLocalizableString();
+            => ValueUsageInfoOpt.HasValue ? ValueUsageInfoOpt.Value.ToLocalizableString() : TypeOrNamespaceUsageInfoOpt.Value.ToLocalizableString();
 
         public ImmutableArray<string> ToLocalizableValues()
-            => _valueUsageInfoOpt.HasValue ? _valueUsageInfoOpt.Value.ToLocalizableValues() : _typeOrNamespaceUsageInfoOpt.Value.ToLocalizableValues();
+            => ValueUsageInfoOpt.HasValue ? ValueUsageInfoOpt.Value.ToLocalizableValues() : TypeOrNamespaceUsageInfoOpt.Value.ToLocalizableValues();
     }
 }

src/Workspaces/Core/Portable/Extensions/TypeOrNamespaceUsageInfo.cs

@@ -28,29 +28,35 @@ internal enum TypeOrNamespaceUsageInfo
         /// </summary>
         TypeArgument = 0x02,
 
+        /// <summary>
+        /// Represents a type parameter constraint that is a type.
+        /// For example, 'Type' in <code>class Derived{T} where T : Type { }</code>
+        /// </summary>
+        TypeConstraint = 0x04,
+
         /// <summary>
         /// Represents a base type or interface reference in the base list of a named type.
         /// For example, 'Base' in <code>class Derived : Base { }</code>.
         /// </summary>
-        Base = 0x04,
+        Base = 0x08,
 
         /// <summary>
         /// Represents a reference to a type whose instance is being created.
         /// For example, 'C' in <code>var x = new C();</code>, where 'C' is a named type.
         /// </summary>
-        ObjectCreation = 0x08,
+        ObjectCreation = 0x10,
 
         /// <summary>
         /// Represents a reference to a namespace or type within a using or imports directive.
         /// For example, <code>using NS;</code> or <code>using static NS.Extensions</code> or <code>using Alias = MyType</code>.
         /// </summary>
-        Import = 0x10,
+        Import = 0x20,
 
         /// <summary>
         /// Represents a reference to a namespace name in a namespace declaration context.
         /// For example, 'N1' or <code>namespaces N1.N2 { }</code>.
         /// </summary>
-        NamespaceDeclaration = 0x20,
+        NamespaceDeclaration = 0x40,
     }
 
     internal static class TypeOrNamespaceUsageInfoExtensions
@@ -63,22 +69,25 @@ public static string ToLocalizableString(this TypeOrNamespaceUsageInfo info)
             switch (info)
             {
                 case TypeOrNamespaceUsageInfo.Qualified:
-                    return WorkspacesResources.TypeOrNamespaceUsageInfo_Qualified;
+                    return WorkspacesResources.TypeOrNamespaceUsageInfo_Qualify;
 
                 case TypeOrNamespaceUsageInfo.TypeArgument:
                     return WorkspacesResources.TypeOrNamespaceUsageInfo_TypeArgument;
 
+                case TypeOrNamespaceUsageInfo.TypeConstraint:
+                    return WorkspacesResources.TypeOrNamespaceUsageInfo_TypeConstraint;
+
                 case TypeOrNamespaceUsageInfo.Base:
-                    return WorkspacesResources.TypeOrNamespaceUsageInfo_Base;
+                    return WorkspacesResources.TypeOrNamespaceUsageInfo_BaseType;
 
                 case TypeOrNamespaceUsageInfo.ObjectCreation:
-                    return WorkspacesResources.TypeOrNamespaceUsageInfo_ObjectCreation;
+                    return WorkspacesResources.TypeOrNamespaceUsageInfo_Construct;
 
                 case TypeOrNamespaceUsageInfo.Import:
                     return WorkspacesResources.TypeOrNamespaceUsageInfo_Import;
 
                 case TypeOrNamespaceUsageInfo.NamespaceDeclaration:
-                    return WorkspacesResources.TypeOrNamespaceUsageInfo_NamespaceDeclaration;
+                    return WorkspacesResources.TypeOrNamespaceUsageInfo_Declare;
 
                 default:
                     Debug.Fail($"Unhandled value: '{info.ToString()}'");

src/Workspaces/Core/Portable/FindSymbols/FindReferences/Finders/AbstractReferenceFinder.cs

@@ -585,6 +585,10 @@ TypeOrNamespaceUsageInfo GetTypeOrNamespaceUsageInfo()
                 {
                     usageInfo |= TypeOrNamespaceUsageInfo.TypeArgument;
                 }
+                else if (syntaxFacts.IsTypeConstraint(node.Parent))
+                {
+                    usageInfo |= TypeOrNamespaceUsageInfo.TypeConstraint;
+                }
                 else if (syntaxFacts.IsBaseTypeList(node.Parent) ||
                     syntaxFacts.IsBaseTypeList(node.Parent?.Parent))
                 {

src/Workspaces/Core/Portable/LanguageServices/SyntaxFactsService/ISyntaxFactsService.cs

@@ -230,6 +230,7 @@ internal interface ISyntaxFactsService : ILanguageService
         bool IsArgument(SyntaxNode node);
         RefKind GetRefKindOfArgument(SyntaxNode node);
         bool IsTypeArgumentList(SyntaxNode node);
+        bool IsTypeConstraint(SyntaxNode node);
 
         void GetNameAndArityOfSimpleName(SyntaxNode node, out string name, out int arity);
         bool LooksGeneric(SyntaxNode simpleName);

src/Workspaces/Core/Portable/Remote/RemoteArguments.cs

@@ -91,6 +91,58 @@ public bool Equals(SerializableSymbolAndProjectId other)
         }
     }
 
+    internal class SerializableSymbolUsageInfo : IEquatable<SerializableSymbolUsageInfo>
+    {
+        public bool UsageInfoIsValue;
+        public string UsageInfoString;
+
+        public static SerializableSymbolUsageInfo Dehydrate(SymbolUsageInfo symbolUsageInfo)
+        {
+            bool usageInfoIsValue;
+            string usageInfoString;
+            if (symbolUsageInfo.ValueUsageInfoOpt.HasValue)
+            {
+                usageInfoIsValue = true;
+                usageInfoString = symbolUsageInfo.ValueUsageInfoOpt.Value.ToString();
+            }
+            else
+            {
+                usageInfoIsValue = false;
+                usageInfoString = symbolUsageInfo.TypeOrNamespaceUsageInfoOpt.Value.ToString();
+            }
+
+            return new SerializableSymbolUsageInfo
+            {
+                UsageInfoIsValue = usageInfoIsValue,
+                UsageInfoString = usageInfoString
+            };
+        }
+
+        public SymbolUsageInfo Rehydrate()
+        {
+            return UsageInfoIsValue
+                ? SymbolUsageInfo.Create((ValueUsageInfo)Enum.Parse(typeof(ValueUsageInfo), UsageInfoString))
+                : SymbolUsageInfo.Create((TypeOrNamespaceUsageInfo)Enum.Parse(typeof(TypeOrNamespaceUsageInfo), UsageInfoString));
+        }
+
+        public bool Equals(SerializableSymbolUsageInfo other)
+        {
+            return other != null &&
+                UsageInfoIsValue == other.UsageInfoIsValue &&
+                UsageInfoString == other.UsageInfoString;
+        }
+
+        public override bool Equals(object obj)
+        {
+            return Equals(obj as SerializableSymbolUsageInfo);
+        }
+
+        public override int GetHashCode()
+        {
+            return Hash.Combine(UsageInfoIsValue.GetHashCode(), UsageInfoString.GetHashCode());
+        }
+    }
+
     internal class SerializableReferenceLocation
     {
         public DocumentId Document { get; set; }
@@ -101,7 +153,7 @@ internal class SerializableReferenceLocation
 
         public bool IsImplicit { get; set; }
 
-        internal SymbolUsageInfo SymbolUsageInfo { get; set; }
+        public SerializableSymbolUsageInfo SymbolUsageInfo { get; set; }
 
         public CandidateReason CandidateReason { get; set; }
 
@@ -114,7 +166,7 @@ internal class SerializableReferenceLocation
                 Alias = SerializableSymbolAndProjectId.Dehydrate(referenceLocation.Alias, referenceLocation.Document),
                 Location = referenceLocation.Location.SourceSpan,
                 IsImplicit = referenceLocation.IsImplicit,
-                SymbolUsageInfo = referenceLocation.SymbolUsageInfo,
+                SymbolUsageInfo = SerializableSymbolUsageInfo.Dehydrate(referenceLocation.SymbolUsageInfo),
                 CandidateReason = referenceLocation.CandidateReason
             };
         }
@@ -130,7 +182,7 @@ internal class SerializableReferenceLocation
                 aliasSymbol,
                 CodeAnalysis.Location.Create(syntaxTree, Location),
                 isImplicit: IsImplicit,
-                symbolUsageInfo: SymbolUsageInfo,
+                symbolUsageInfo: SymbolUsageInfo.Rehydrate(),
                 candidateReason: CandidateReason);
         }
 

src/Workspaces/Core/Portable/WorkspacesResources.Designer.cs

@@ -1810,47 +1810,47 @@ internal class WorkspacesResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Base.
+        ///   Looks up a localized string similar to Base Type.
         /// </summary>
-        internal static string TypeOrNamespaceUsageInfo_Base {
+        internal static string TypeOrNamespaceUsageInfo_BaseType {
             get {
-                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Base", resourceCulture);
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_BaseType", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Import.
+        ///   Looks up a localized string similar to Construct.
         /// </summary>
-        internal static string TypeOrNamespaceUsageInfo_Import {
+        internal static string TypeOrNamespaceUsageInfo_Construct {
             get {
-                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Import", resourceCulture);
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Construct", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Declaration.
+        ///   Looks up a localized string similar to Declare.
         /// </summary>
-        internal static string TypeOrNamespaceUsageInfo_NamespaceDeclaration {
+        internal static string TypeOrNamespaceUsageInfo_Declare {
             get {
-                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_NamespaceDeclaration", resourceCulture);
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Declare", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to new().
+        ///   Looks up a localized string similar to Import.
         /// </summary>
-        internal static string TypeOrNamespaceUsageInfo_ObjectCreation {
+        internal static string TypeOrNamespaceUsageInfo_Import {
             get {
-                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_ObjectCreation", resourceCulture);
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Import", resourceCulture);
             }
         }
         
         /// <summary>
         ///   Looks up a localized string similar to Qualify.
         /// </summary>
-        internal static string TypeOrNamespaceUsageInfo_Qualified {
+        internal static string TypeOrNamespaceUsageInfo_Qualify {
             get {
-                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Qualified", resourceCulture);
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_Qualify", resourceCulture);
             }
         }
         
@@ -1863,6 +1863,15 @@ internal class WorkspacesResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Type Constraint.
+        /// </summary>
+        internal static string TypeOrNamespaceUsageInfo_TypeConstraint {
+            get {
+                return ResourceManager.GetString("TypeOrNamespaceUsageInfo_TypeConstraint", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Types.
         /// </summary>

src/Workspaces/Core/Portable/WorkspacesResources.resx

@@ -794,33 +794,47 @@
   </data>
   <data name="ValueUsageInfo_Name" xml:space="preserve">
     <value>Name</value>
+    <comment>See xml doc comments on 'ValueUsageInfo' enum for context</comment>
   </data>
   <data name="ValueUsageInfo_Read" xml:space="preserve">
     <value>Read</value>
+    <comment>See xml doc comments on 'ValueUsageInfo' enum for context</comment>
   </data>
   <data name="ValueUsageInfo_Reference" xml:space="preserve">
     <value>Reference</value>
+    <comment>See xml doc comments on 'ValueUsageInfo' enum for context</comment>
   </data>
   <data name="ValueUsageInfo_Write" xml:space="preserve">
     <value>Write</value>
+    <comment>See xml doc comments on 'ValueUsageInfo' enum for context</comment>
   </data>
-  <data name="TypeOrNamespaceUsageInfo_Qualified" xml:space="preserve">
+  <data name="TypeOrNamespaceUsageInfo_Qualify" xml:space="preserve">
     <value>Qualify</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
   <data name="TypeOrNamespaceUsageInfo_TypeArgument" xml:space="preserve">
     <value>Type Argument</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
-  <data name="TypeOrNamespaceUsageInfo_Base" xml:space="preserve">
-    <value>Base</value>
+  <data name="TypeOrNamespaceUsageInfo_TypeConstraint" xml:space="preserve">
+    <value>Type Constraint</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
-  <data name="TypeOrNamespaceUsageInfo_ObjectCreation" xml:space="preserve">
-    <value>new()</value>
+  <data name="TypeOrNamespaceUsageInfo_BaseType" xml:space="preserve">
+    <value>Base Type</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
+  </data>
+  <data name="TypeOrNamespaceUsageInfo_Construct" xml:space="preserve">
+    <value>Construct</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
   <data name="TypeOrNamespaceUsageInfo_Import" xml:space="preserve">
     <value>Import</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
-  <data name="TypeOrNamespaceUsageInfo_NamespaceDeclaration" xml:space="preserve">
-    <value>Declaration</value>
+  <data name="TypeOrNamespaceUsageInfo_Declare" xml:space="preserve">
+    <value>Declare</value>
+    <comment>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</comment>
   </data>
   <data name="Parameter_preferences" xml:space="preserve">
     <value>Parameter preferences</value>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Přidávání projektů se nepodporuje.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Soubory jazyka Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Das Hinzufügen von Projekten wird nicht unterstützt.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Visual Basic-Dateien</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf

@@ -162,60 +162,65 @@
         <target state="translated">No se admite la adición de proyectos.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Archivos de Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf

@@ -162,60 +162,65 @@
         <target state="translated">L'ajout de projets n'est pas pris en charge.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Fichiers Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf

@@ -162,60 +162,65 @@
         <target state="translated">L'aggiunta di progetti non è supportata.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">File Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf

@@ -162,60 +162,65 @@
         <target state="translated">プロジェクトの追加はサポートされていません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Visual Basic ファイル</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf

@@ -162,60 +162,65 @@
         <target state="translated">프로젝트 추가가 지원되지 않습니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Visual Basic 파일</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Dodawanie projektów nie jest obsługiwane.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Pliki języka Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Não há suporte para adicionar projetos.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Arquivos do Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Добавление проектов не поддерживается.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Файлы Visual Basic</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf

@@ -162,60 +162,65 @@
         <target state="translated">Projelerin eklenmesi desteklenmiyor.</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Visual Basic dosyaları</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf

@@ -162,60 +162,65 @@
         <target state="translated">不支持添加项目。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">visual basic 文件</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf

@@ -162,60 +162,65 @@
         <target state="translated">不支援新增專案。</target>
         <note />
       </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_BaseType">
+        <source>Base Type</source>
+        <target state="new">Base Type</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Construct">
+        <source>Construct</source>
+        <target state="new">Construct</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Declare">
+        <source>Declare</source>
+        <target state="new">Declare</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_Qualify">
+        <source>Qualify</source>
+        <target state="new">Qualify</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
+      <trans-unit id="TypeOrNamespaceUsageInfo_TypeConstraint">
+        <source>Type Constraint</source>
+        <target state="new">Type Constraint</target>
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
+      </trans-unit>
       <trans-unit id="Visual_Basic_files">
         <source>Visual Basic files</source>
         <target state="translated">Visual Basic 檔案</target>
         <note />
       </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Base">
-        <source>Base</source>
-        <target state="new">Base</target>
-        <note />
-      </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_Import">
         <source>Import</source>
         <target state="new">Import</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_NamespaceDeclaration">
-        <source>Declaration</source>
-        <target state="new">Declaration</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_ObjectCreation">
-        <source>new()</source>
-        <target state="new">new()</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="TypeOrNamespaceUsageInfo_Qualified">
-        <source>Qualify</source>
-        <target state="new">Qualify</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="TypeOrNamespaceUsageInfo_TypeArgument">
         <source>Type Argument</source>
         <target state="new">Type Argument</target>
-        <note />
+        <note>See xml doc comments on 'TypeOrNamespaceUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Name">
         <source>Name</source>
         <target state="new">Name</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Read">
         <source>Read</source>
         <target state="new">Read</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Reference">
         <source>Reference</source>
         <target state="new">Reference</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="ValueUsageInfo_Write">
         <source>Write</source>
         <target state="new">Write</target>
-        <note />
+        <note>See xml doc comments on 'ValueUsageInfo' enum for context</note>
       </trans-unit>
       <trans-unit id="Workspace_is_not_empty">
         <source>Workspace is not empty.</source>

src/Workspaces/VisualBasic/Portable/LanguageServices/VisualBasicSyntaxFactsService.vb

@@ -649,6 +649,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic
             Return node.IsKind(SyntaxKind.TypeArgumentList)
         End Function
 
+        Public Function IsTypeConstraint(node As SyntaxNode) As Boolean Implements ISyntaxFactsService.IsTypeConstraint
+            Return node.IsKind(SyntaxKind.TypeConstraint)
+        End Function
+
         Public Function IsInConstantContext(node As Microsoft.CodeAnalysis.SyntaxNode) As Boolean Implements ISyntaxFactsService.IsInConstantContext
             Return node.IsInConstantContext()
         End Function