Fix cross-platform issue with line endings on Linux

Author: kzu

src/StructId.Analyzer/EntityFrameworkGenerator.cs

@@ -91,8 +91,7 @@ protected override string SelectTemplate(StructIdModel model)
         if (builtInEFTypes.Contains(model.ValueTypeFullName))
             return ThisAssembly.Resources.Templates.EntityFramework.Text;
 
-        if (model.ValueTypeAllInterfaces.Contains("System.IParsable<T>") &&
-            model.ValueTypeAllInterfaces.Contains("System.IFormattable"))
+        if (UsesStringProvider(model))
             return ThisAssembly.Resources.Templates.EntityFrameworkParsable.Text;
 
         return ThisAssembly.Resources.Templates.EntityFramework.Text;
@@ -108,8 +107,7 @@ void GenerateValueSelector(SourceProductionContext context, ((ImmutableArray<Str
         var model = new SelectorModel(
             structIds.Select(x => new EFStructIdModel(x.TypeFullName,
                 !builtInEFTypes.Contains(x.ValueTypeFullName)
-                ? x.ValueTypeAllInterfaces.Contains("System.IParsable<T>") &&
-                  x.ValueTypeAllInterfaces.Contains("System.IFormattable")
+                ? UsesStringProvider(x)
                   ? "string" : x.ValueTypeFullName
                 : x.ValueTypeFullName)),
             customConverters.Select(x => new ConverterModel(x.TModel, x.TProvider, x.TConverter)),
@@ -127,6 +125,19 @@ record EFStructIdModel(string TSelf, string TValueType)
         public string TValue => builtInTypesMap.TryGetValue(TValueType, out var value) ? value : TValueType;
     }
 
+    static bool UsesStringProvider(StructIdModel model) =>
+        HasInterface(model, "System.IParsable") &&
+        HasInterface(model, "System.IFormattable");
+
+    static bool HasInterface(StructIdModel model, string interfaceType) =>
+        model.ValueTypeAllInterfaces.AsImmutableArray().Any(i => StripGenericArgs(i) == interfaceType);
+
+    static string StripGenericArgs(string name)
+    {
+        var idx = name.IndexOf('<');
+        return idx >= 0 ? name.Substring(0, idx) : name;
+    }
+
     record ConverterModel(string TModel, string TProvider, string TConverter);
 
     record TemplatizedModel(string TModel, string TConverter, string Code);

src/StructId.CodeFix/TemplateCodeFix.cs

@@ -49,10 +49,20 @@ protected override Task<Document> GetChangedDocumentAsync(CancellationToken canc
             var modifiers = declaration.Modifiers;
 
             if (!modifiers.Any(SyntaxKind.FileKeyword))
-                modifiers = modifiers.Insert(0, Token(SyntaxKind.FileKeyword));
+            {
+                var file = SpacedToken(SyntaxKind.FileKeyword);
+                if (modifiers.Count > 0)
+                {
+                    var firstModifier = modifiers[0];
+                    file = file.WithLeadingTrivia(firstModifier.LeadingTrivia);
+                    modifiers = modifiers.Replace(firstModifier, firstModifier.WithLeadingTrivia(TriviaList()));
+                }
+
+                modifiers = modifiers.Insert(0, file);
+            }
 
             if (!modifiers.Any(SyntaxKind.PartialKeyword))
-                modifiers = modifiers.Insert(1, Token(SyntaxKind.PartialKeyword));
+                modifiers = modifiers.Insert(1, SpacedToken(SyntaxKind.PartialKeyword));
 
             // Remove accessibility modifiers which are replaced by 'file' visibility
             if (modifiers.FirstOrDefault(x => x.IsKind(SyntaxKind.PublicKeyword)) is { } @public)
@@ -63,16 +73,19 @@ protected override Task<Document> GetChangedDocumentAsync(CancellationToken canc
                 modifiers = modifiers.Remove(@private);
 
             if (declaration.Identifier.Text != "TSelf")
-                declaration = declaration.WithIdentifier(Identifier("TSelf"));
+                declaration = declaration.WithIdentifier(Identifier(
+                    declaration.Identifier.LeadingTrivia,
+                    "TSelf",
+                    declaration.Identifier.TrailingTrivia));
 
             if (!declaration.IsKind(SyntaxKind.RecordStructDeclaration))
             {
                 declaration = RecordDeclaration(
                     SyntaxKind.RecordStructDeclaration,
                     declaration.AttributeLists,
                     modifiers,
-                    Token(SyntaxKind.RecordKeyword),
-                    Token(SyntaxKind.StructKeyword),
+                    SpacedToken(SyntaxKind.RecordKeyword),
+                    SpacedToken(SyntaxKind.StructKeyword),
                     declaration.Identifier,
                     declaration.TypeParameterList,
                     declaration.ParameterList,
@@ -81,7 +94,8 @@ protected override Task<Document> GetChangedDocumentAsync(CancellationToken canc
                     declaration.OpenBraceToken,
                     declaration.Members,
                     declaration.CloseBraceToken,
-                    declaration.SemicolonToken);
+                    declaration.SemicolonToken)
+                    .WithTriviaFrom(original);
             }
             else if (modifiers != declaration.Modifiers)
             {
@@ -90,5 +104,8 @@ protected override Task<Document> GetChangedDocumentAsync(CancellationToken canc
 
             return Task.FromResult(document.WithSyntaxRoot(root.ReplaceNode(original, declaration)));
         }
+
+        static SyntaxToken SpacedToken(SyntaxKind kind)
+            => Token(TriviaList(), kind, TriviaList(Space));
     }
-}
+}