Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Expect mapped paths in InterceptsLocationAttribute #68242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 9, 2023
Merged

Expect mapped paths in InterceptsLocationAttribute #68242

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8eb5ff6
Expect mapped paths in InterceptableAttribute
RikkiGibson May 22, 2023
6803108
Add end to end test
RikkiGibson May 22, 2023
ec5bd43
Test GetEnumerator/Dispose/Deconstruct
RikkiGibson May 22, 2023
43ee0bb
Fix spelling of prototype comment
RikkiGibson May 25, 2023
21fc324
Address feedback
RikkiGibson May 30, 2023
13b6964
Merge remote-tracking branch 'upstream/features/interceptors' into ic-6
RikkiGibson Jun 6, 2023
88fc265
Address feedback
RikkiGibson Jun 9, 2023
7c64b8a
Fix feature flag name
RikkiGibson Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address feedback
  • Loading branch information
@RikkiGibson
RikkiGibson committed Jun 9, 2023
commit 88fc265e6dd4d201ace4c177ed4d021a6a3947ca
12 changes: 10 additions & 2 deletions src/Compilers/CSharp/Portable/Symbols/Source/SourceMethodSymbolWithAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,11 @@ private void DecodeInterceptsLocationAttribute(DecodeWellKnownAttributeArguments
var unmappedMatch = syntaxTrees.FirstOrDefault(static (tree, filePath) => tree.FilePath == filePath, attributeFilePath);
if (unmappedMatch != null)
{
diagnostics.Add(ErrorCode.ERR_InterceptorPathNotInCompilationWithUnmappedCandidate, attributeData.GetAttributeArgumentSyntaxLocation(filePathParameterIndex, attributeSyntax), attributeFilePath, mapPath(referenceResolver, unmappedMatch));
diagnostics.Add(
ErrorCode.ERR_InterceptorPathNotInCompilationWithUnmappedCandidate,
attributeData.GetAttributeArgumentSyntaxLocation(filePathParameterIndex, attributeSyntax),
attributeFilePath,
mapPath(referenceResolver, unmappedMatch));
return;
}

Expand All @@ -1012,7 +1016,11 @@ private void DecodeInterceptsLocationAttribute(DecodeWellKnownAttributeArguments
(referenceResolver, attributeFilePath: attributeFilePath.Replace('\\', '/')));
if (suffixMatch != null)
{
diagnostics.Add(ErrorCode.ERR_InterceptorPathNotInCompilationWithCandidate, attributeData.GetAttributeArgumentSyntaxLocation(filePathParameterIndex, attributeSyntax), attributeFilePath, mapPath(referenceResolver, suffixMatch));
diagnostics.Add(
ErrorCode.ERR_InterceptorPathNotInCompilationWithCandidate,
attributeData.GetAttributeArgumentSyntaxLocation(filePathParameterIndex, attributeSyntax),
attributeFilePath,
mapPath(referenceResolver, suffixMatch));
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Compilers/CSharp/Test/Semantic/Semantics/InterceptorsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3662,7 +3662,7 @@ public static void M0()
""";

var pathPrefix1 = PlatformInformation.IsWindows ? """C:\My\Machine\Specific\Path1\""" : "/My/Machine/Specific/Path1/";
var pathPrefix2 = PlatformInformation.IsWindows ? """C:\My\Machine\Specific\Path1\""" : "/My/Machine/Specific/Path2/";
var pathPrefix2 = PlatformInformation.IsWindows ? """C:\My\Machine\Specific\Path2\""" : "/My/Machine/Specific/Path2/";
var path1 = pathPrefix1 + "Program.cs";
var path2 = pathPrefix2 + "Program.cs";
var pathMap = ImmutableArray.Create(
Expand Down