Skip to content
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

Jump to bottom

[Generator] Refactor TypeManager and add nullability. #17559

Merged
merged 16 commits into from
Mar 7, 2023
Merged

[Generator] Refactor TypeManager and add nullability. #17559

merged 16 commits into from
Mar 7, 2023

Conversation

mandel-macaque
Copy link
Member

This has several small changes:

  1. Move the maps to the TypeManager which makes more sense.
  2. Enable nullability which triggers a number of changes, the biggest one, in a dict TKey is not nullable (makes perfect sense).

@mandel-macaque
[Generator] Refactor TypeManager and add nullability.
fff7705 
This has several small changes:

1. Move the maps to the TypeManager which makes more sense.
2. Enable nullability which triggers a number of changes, the biggest
   one, in a dict TKey is not nullable (makes perfect sense).
@github-actions
Copy link
Contributor

⚠️ Your code has been reformatted. ⚠️

If this is not desired, add the actions-disable-autoformat label, and revert the reformatting commit.

If files unrelated to your change were modified, try reverting the reformatting commit + merging with the target branch (and push those changes).

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
rolfbjarne
rolfbjarne requested changes Feb 16, 2023
View reviewed changes
src/bgen/TypeManager.cs Outdated
@@ -152,149 +237,154 @@ public Type GetUnderlyingNullableType (Type type)
return type.GenericTypeArguments [0];
}

public void Initialize (BindingTouch binding_touch, Assembly api, Assembly corlib, Assembly platform)
public void Initialize (BindingTouch bindingTouch, Assembly api, Assembly corlib, Assembly platform)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you make this a constructor, you can avoid a lot of the nullable fields, since you'd be setting them in a constructor.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rolfbjarne is not that easy, the time manager is used by the Generator, and making such a change would make me do a lot of changes they way in which the main method is deal with. I would not like to touch that code yet until we have tests for all this.

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
dalexsoto
dalexsoto approved these changes Feb 16, 2023
View reviewed changes
src/bgen/TypeExtensions.cs Outdated Show resolved Hide resolved
src/bgen/TypeManager.cs
Comment on lines +139 to +141
new (System_nfloat, ".NFloatValue"),
new (System_nint, ".NIntValue"),
new (System_nuint, ".NUIntValue"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
new (System_nfloat, ".NFloatValue"),
new (System_nint, ".NIntValue"),
new (System_nuint, ".NUIntValue"),
new ( System_nfloat, ".NFloatValue" ),
new ( System_nint, ".NIntValue" ),
new ( System_nuint, ".NUIntValue" ),

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@github-actions
Copy link
Contributor

⚠️ Your code has been reformatted. ⚠️

If this is not desired, add the actions-disable-autoformat label, and revert the reformatting commit.

If files unrelated to your change were modified, try reverting the reformatting commit + merging with the target branch (and push those changes).

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@github-actions
Copy link
Contributor

⚠️ Your code has been reformatted. ⚠️

If this is not desired, add the actions-disable-autoformat label, and revert the reformatting commit.

If files unrelated to your change were modified, try reverting the reformatting commit + merging with the target branch (and push those changes).

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
rolfbjarne
rolfbjarne approved these changes Feb 28, 2023
View reviewed changes
Copy link
Member

@rolfbjarne rolfbjarne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but note that there are failing tests.

src/bgen/TypeManager.cs Outdated Show resolved Hide resolved
src/bgen/TypeManager.cs Outdated Show resolved Hide resolved
src/bgen/TypeManager.cs Outdated Show resolved Hide resolved
src/bgen/TypeManager.cs Outdated Show resolved Hide resolved
@mandel-macaque @dalexsoto @rolfbjarne
Apply suggestions from code review
9fc13cd 
Co-authored-by: Alex Soto <alex@alexsoto.me>
Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

✅ API diff for current PR / commit

Legacy Xamarin (No breaking changes)
  • iOS (no change detected)
  • tvOS (no change detected)
  • watchOS (no change detected)
  • macOS (no change detected)
NET (empty diffs)
  • iOS: (empty diff detected)
  • tvOS: (empty diff detected)
  • MacCatalyst: (empty diff detected)
  • macOS: (empty diff detected)

✅ API diff vs stable

Legacy Xamarin (No breaking changes)
.NET (No breaking changes)
Legacy Xamarin (stable) vs .NET

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 5896b016d04eb6c96a80a2f4ac0e01e5ad3afcd7 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Big Sur (11.5) passed 💻

✅ All tests on macOS M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Hash: 5896b016d04eb6c96a80a2f4ac0e01e5ad3afcd7 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

❌ [PR Build] Tests on macOS M1 - Mac Ventura (13.0) failed ❌

Failed tests are:

  • xammac_tests

Pipeline on Agent
Hash: 5896b016d04eb6c96a80a2f4ac0e01e5ad3afcd7 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent XAMBOT-1097.Monterey'
Hash: 5896b016d04eb6c96a80a2f4ac0e01e5ad3afcd7 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Collaborator

🚀 [CI Build] Test results 🚀

Test results

✅ All tests passed on VSTS: simulator tests.

🎉 All 225 tests passed 🎉

Tests counts

✅ bcl: All 69 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests: All 1 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 7 tests passed. Html Report (VSDrops) Download
✅ framework: All 8 tests passed. Html Report (VSDrops) Download
✅ generator: All 2 tests passed. Html Report (VSDrops) Download
✅ interdependent_binding_projects: All 7 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ mac_binding_project: All 1 tests passed. Html Report (VSDrops) Download
✅ mmp: All 2 tests passed. Html Report (VSDrops) Download
✅ mononative: All 12 tests passed. Html Report (VSDrops) Download
✅ monotouch: All 25 tests passed. Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ mtouch: All 1 tests passed. Html Report (VSDrops) Download
✅ xammac: All 3 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 8 tests passed. Html Report (VSDrops) Download
✅ xtro: All 2 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 5896b016d04eb6c96a80a2f4ac0e01e5ad3afcd7 [PR build]

@mandel-macaque mandel-macaque merged commit 30d9967 into xamarin:main Mar 7, 2023
@mandel-macaque mandel-macaque deleted the generator-type-manager-maps branch March 7, 2023 16:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalexsoto dalexsoto dalexsoto approved these changes

@rolfbjarne rolfbjarne rolfbjarne approved these changes

@haritha-mohan haritha-mohan haritha-mohan approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mandel-macaque @vs-mobiletools-engineering-service2 @dalexsoto @rolfbjarne @haritha-mohan