Modified VS-99 Changes

Author: Ravi-Raghavan

src/MongoDB.Analyzer.Helpers/Builders/MqlGenerator.cs

@@ -12,25 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-using MongoDB.Driver;
 using System.Linq;
-using BsonDocumentCustom123 = MongoDB.Bson.BsonDocument;
-using BsonValueCustom123 = MongoDB.Bson.BsonValue;
-using BsonObjectIdCustom123 = MongoDB.Bson.BsonObjectId;
-using BsonTypeCustom123 = MongoDB.Bson.BsonType;
-using BsonTimeSpanCustom123 = MongoDB.Bson.Serialization.Options.TimeSpanUnits;
+using MongoDB.Bson;
+using MongoDB.Driver;
 
 namespace MongoDB.Analyzer.Helpers.Builders
 {
     public static class MqlGenerator
     {
 #pragma warning disable CS0169 // The field is never used
 #pragma warning disable IDE0051
-        private static readonly BsonDocumentCustom123 s_dummyRef1;
-        private static readonly BsonValueCustom123 s_dummyRef2;
-        private static readonly BsonObjectIdCustom123 s_dummyRef3;
-        private static readonly BsonTypeCustom123 s_dummyRef4;
-        private static readonly BsonTimeSpanCustom123 s_dummyRef5;
+        private static readonly BsonType s_dummyRef1;
 #pragma warning restore IDE0051 // The field is never used
 #pragma warning restore CS0169
 

src/MongoDB.Analyzer.Helpers/Linq/MqlGenerator.cs

@@ -14,18 +14,16 @@
 
 using System;
 using System.Linq;
+using MongoDB.Bson;
 using MongoDB.Driver.Linq;
-using BsonTypeCustom123 = MongoDB.Bson.BsonType;
-using BsonTimeSpanCustom123 = MongoDB.Bson.Serialization.Options.TimeSpanUnits;
 
 namespace MongoDB.Analyzer.Helpers.Linq
 {
     public static class MqlGenerator
     {
 #pragma warning disable CS0169 // The field is never used
 #pragma warning disable IDE0051
-        private static readonly BsonTypeCustom123 s_dummyRef1;
-        private static readonly BsonTimeSpanCustom123 s_dummyRef2;
+        private static readonly BsonType s_dummyRef1;
 #pragma warning restore IDE0051 // The field is never used
 #pragma warning restore CS0169
 

src/MongoDB.Analyzer/Core/TypesGeneratorHelper.cs

@@ -22,12 +22,7 @@ internal static class TypesGeneratorHelper
         .AddUsings(
             Using("System"),
             Using("MongoDB.Bson"),
-            Using("MongoDB.Bson.Serialization.Attributes"),
-            Using("BsonTimeSpanCustom123", "MongoDB.Bson.Serialization.Options.TimeSpanUnits"),
-            Using("BsonTypeCustom123", "MongoDB.Bson.BsonType"),
-            Using("BsonDocumentCustom123", "MongoDB.Bson.BsonDocument"),
-            Using("BsonValueCustom123", "MongoDB.Bson.BsonValue"),
-            Using("BsonObjectIdCustom123", "MongoDB.Bson.BsonObjectId"));
+            Using("MongoDB.Bson.Serialization.Attributes"));
 
 
     private static readonly NamespaceDeclarationSyntax s_namespaceDeclarationSyntaxBuilders = SyntaxFactory.NamespaceDeclaration(SyntaxFactory.ParseName(MqlGeneratorSyntaxElements.Builders.MqlGeneratorNamespace));

src/MongoDB.Analyzer/Core/TypesProcessor.cs

@@ -16,15 +16,6 @@ namespace MongoDB.Analyzer.Core;
 
 internal sealed class TypesProcessor
 {
-    private static readonly Dictionary<string, string> s_knownBsonTypes = new()
-    {
-        { "MongoDB.Bson.BsonDocument", "BsonDocumentCustom123" },
-        { "MongoDB.Bson.BsonValue", "BsonValueCustom123" },
-        { "MongoDB.Bson.BsonObjectId", "BsonObjectIdCustom123" },
-        { "MongoDB.Bson.BsonType", "BsonTypeCustom123" },
-        { "MongoDB.Bson.Serialization.Options.TimeSpanUnits", "BsonTimeSpanCustom123" }
-    };
-
     private readonly Dictionary<string, (string NewName, MemberDeclarationSyntax NewDeclaration)> _processedTypes;
 
     private int _nextTypeId = 0;
@@ -73,9 +64,9 @@ public string ProcessTypeSymbol(ITypeSymbol typeSymbol)
         }
 
         var fullTypeName = GetFullName(typeSymbol);
-        if (s_knownBsonTypes.TryGetValue(fullTypeName, out var knowTypeName))
+        if (typeSymbol.IsSupportedBsonType())
         {
-            return (knowTypeName, fullTypeName);
+            return (typeSymbol.Name, fullTypeName);
         }
 
         if (_processedTypes.TryGetValue(fullTypeName, out var result))

src/MongoDB.Analyzer/Core/Utilities/SymbolExtensions.cs

@@ -16,13 +16,22 @@ namespace MongoDB.Analyzer.Core;
 
 internal static class SymbolExtensions
 {
-    private const string AssemblyMongoDBDriver = "MongoDB.Driver";
+    private const string NamespaceMongoDBBson = "MongoDB.Bson";
     private const string NamespaceMongoDBBsonAttributes = "MongoDB.Bson.Serialization.Attributes";
+    private const string AssemblyMongoDBDriver = "MongoDB.Driver";
     private const string NamespaceMongoDBDriver = "MongoDB.Driver";
     private const string NamespaceMongoDBLinq = "MongoDB.Driver.Linq";
     private const string NamespaceSystem = "System";
     private const string NamespaceSystemLinq = "System.Linq";
 
+    private static readonly HashSet<string> s_knownBsonTypes = new()
+    {
+        "MongoDB.Bson.BsonDocument",
+        "MongoDB.Bson.BsonValue",
+        "MongoDB.Bson.BsonObjectId",
+        "MongoDB.Bson.BsonType"
+    };
+
     private static readonly HashSet<string> s_supportedCollections = new()
     {
         "System.Collections.Generic.IEnumerable<T>",
@@ -162,6 +171,10 @@ public static bool IsSupportedBsonAttribute(this ITypeSymbol typeSymbol) =>
         s_supportedBsonAttributes.Contains(typeSymbol?.Name) &&
         typeSymbol?.ContainingNamespace?.ToDisplayString() == NamespaceMongoDBBsonAttributes;
 
+    public static bool IsSupportedBsonType(this ITypeSymbol typeSymbol) =>
+        typeSymbol?.ContainingNamespace?.ToDisplayString() == NamespaceMongoDBBson &&
+        s_knownBsonTypes.Contains(typeSymbol.ToDisplayString());
+
     public static bool IsString(this ITypeSymbol typeSymbol) =>
         typeSymbol?.SpecialType == SpecialType.System_String;