use GetInterceptorFilePath preferred implementation

DapperLib · Oct 22, 2023 · 52fa213 · 52fa213
1 parent bd6ab89
commit 52fa213
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Dapper.AOT.Analyzers/CodeAnalysis/DapperInterceptorGenerator.cs b/src/Dapper.AOT.Analyzers/CodeAnalysis/DapperInterceptorGenerator.cs
@@ -240,10 +240,12 @@ internal void Generate(in GenerateState ctx)
                 var loc = op.Location.GetLineSpan();
                 var start = loc.StartLinePosition;
                 sb.Append("[global::System.Runtime.CompilerServices.InterceptsLocationAttribute(")
-                    .AppendVerbatimLiteral(loc.Path).Append(", ").Append(start.Line + 1).Append(", ").Append(start.Character + 1).Append(")]").NewLine();
+                    .AppendVerbatimLiteral(ctx.GetInterceptorFilePath(op.Location.SourceTree)).Append(", ").Append(start.Line + 1).Append(", ").Append(start.Character + 1).Append(")]").NewLine();
                 usageCount++;
             }
 
+
+
             if (usageCount == 0)
             {
                 continue; // empty group?

diff --git a/src/Dapper.AOT.Analyzers/CodeAnalysis/ParseState.cs b/src/Dapper.AOT.Analyzers/CodeAnalysis/ParseState.cs
@@ -1,6 +1,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Text;
+using System;
 using System.Collections.Immutable;
 using System.Text;
 using System.Threading;
@@ -105,6 +106,13 @@ internal void AddSource(string hintName, string text)
             ctx.AddSource(hintName, SourceText.From(text, Encoding.UTF8));
         }
     }
+
+    // see https://github.com/dotnet/roslyn/blob/main/docs/features/interceptors.md#file-paths
+    internal string GetInterceptorFilePath(SyntaxTree? tree)
+    {
+        if (tree is null) return "";
+        return Compilation.Options.SourceReferenceResolver?.NormalizePath(tree.FilePath, baseFilePath: null) ?? tree.FilePath;
+    }
 }