Skip to content

Fix Analyser to work with global types #9680

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
jonathanpeppers merged 4 commits into from
Jan 14, 2025
+20 −8
Merged

Fix Analyser to work with global types #9680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b86b243
Fix Analyser to work with global types
dellis1972 Jan 13, 2025
b9384a8
Handle namespaces correctly
dellis1972 Jan 14, 2025
02d0666
Add Alias for Android.Runtime to test
dellis1972 Jan 14, 2025
7aaf343
Update to handle different IntPtr types
dellis1972 Jan 14, 2025
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
15 changes: 12 additions & 3 deletions src/Microsoft.Android.Sdk.Analysis/Analyzers/CustomApplicationAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,20 @@ private static void AnalyzeClass (SyntaxNodeAnalysisContext context)
var parameters = constructor.ParameterList.Parameters;
if (parameters.Count != 2)
continue;
if (parameters [0].Type.ToString () != "IntPtr")
var type = parameters [0].Type switch {
IdentifierNameSyntax identifierNameSyntax => identifierNameSyntax.Identifier.Text,
QualifiedNameSyntax qualifiedNameSyntax => qualifiedNameSyntax.Right.Identifier.Text,
_ => parameters [0].Type.ToString ()
};
if (type != "IntPtr" && type != "nint")
continue;
var ns = Utilities.GetNamespaceForParameterType (parameters [1], context.SemanticModel);
var type = parameters [1].Type.ToString();
var isJniHandle = (ns == "Android.Runtime") && (type == "JniHandleOwnership") || (type == "Android.Runtime.JniHandleOwnership");
type = parameters [1].Type switch {
IdentifierNameSyntax identifierNameSyntax => identifierNameSyntax.Identifier.Text,
QualifiedNameSyntax qualifiedNameSyntax => qualifiedNameSyntax.Right.Identifier.Text,
_ => parameters [1].Type.ToString ()
};
var isJniHandle = (ns == "Android.Runtime") && (type == "JniHandleOwnership");
if (!isJniHandle)
continue;
foundActivationConstructor = true;
Expand Down
11 changes: 7 additions & 4 deletions src/Microsoft.Android.Sdk.Analysis/Tests/DNAA0001Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@ public async Task DNAA0001DoesNotShow ()
}

[Test]
[TestCase ("JniHandleOwnership")]
[TestCase ("Android.Runtime.JniHandleOwnership")]
public async Task DNAA0001DoesNotShowForExistingCode (string type)
[TestCase ("IntPtr", "JniHandleOwnership")]
[TestCase ("nint", "Android.Runtime.JniHandleOwnership")]
[TestCase ("global::System.IntPtr", "global::Android.Runtime.JniHandleOwnership")]
[TestCase ("System.IntPtr", "AR.JniHandleOwnership")]
public async Task DNAA0001DoesNotShowForExistingCode (string handle, string type)
{
var test = $@"
using System;
using Android.App;
using Android.Runtime;
using AR = Android.Runtime;
namespace ConsoleApplication1
{{
public class Foo : Application
{{
public Foo(IntPtr javaReference, {type} transfer) : base(javaReference, transfer)
public Foo({handle} javaReference, {type} transfer) : base(javaReference, transfer)
{{
}}
}}
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Android.Sdk.Analysis/Utilities/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ internal static string GetNamespaceForParameterType (ParameterSyntax parameterSy
}

// Get the symbol for the type of the parameter
var typeSymbol = semanticModel.GetSymbolInfo (parameterSyntax.Type).Symbol as ITypeSymbol;
var typeSymbol = semanticModel.GetTypeInfo (parameterSyntax.Type).Type;

if (typeSymbol == null) {
return null; // Unable to resolve the symbol
Expand Down