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

Change all null checking expressions to use 'is' and 'is not'. #18176

Merged
merged 9 commits into from
May 5, 2023
Merged

Change all null checking expressions to use 'is' and 'is not'. #18176

merged 9 commits into from
May 5, 2023

Conversation

rolfbjarne
Copy link
Member

Change all null checking expressions to use 'is null' and 'is not null'
instead of '== null' and '!= null'.

This was mostly done with sed, so code can probably be improved in many other
ways with manual inspection, but that will come over time.

@rolfbjarne
Change all null checking expressions to use 'is' and 'is not'.
92e5992 
Change all null checking expressions to use 'is null' and 'is not null'
instead of '== null' and '!= null'.
@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
@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
@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
@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
stephen-hawley
stephen-hawley reviewed May 4, 2023
View reviewed changes
Copy link
Contributor

@stephen-hawley stephen-hawley left a comment

Choose a reason for hiding this comment

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

This is a big PR - taking it in pieces.

src/Foundation/NSFileManager.cs
return null;
return k.BoolValue;
}

internal static uint? fetch_uint (NSDictionary dict, NSString key)
{
var k = dict.ObjectForKey (key) as NSNumber;
if (k == null)
if (k is null)
Copy link
Contributor

Choose a reason for hiding this comment

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

all the fetch_mumble methods could be

return (dict.ObjectForKey (key) as NSNumber)?.UInt32Value;

stephen-hawley
stephen-hawley requested changes May 4, 2023
View reviewed changes
Copy link
Contributor

@stephen-hawley stephen-hawley left a comment

Choose a reason for hiding this comment

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

I know this is a pain, but since it looks like we're committed to nullable, I'd like to see a test that greps through all the source code for == null, != null, null ==, and null != just so that we keep ourselves honest.

@rolfbjarne
Copy link
Member Author

@stephen-hawley

I know this is a pain, but since it looks like we're committed to nullable, I'd like to see a test that greps through all the source code for == null, != null, null ==, and null != just so that we keep ourselves honest.

I made it better than a test: automatically fix it (using autoformat): xamarin/xamarin-macios@2f91cd0 (#18176)

Note I only handle the two first cases (null as the second operator), because:

  • It's much more complex to handle null as the first operator, because you have to switch the order (null == x => x is null)
  • It's a very rare thing to do in our code base (I found it in two files: one is fixed, and the other is actually correct because it's a test testing equality operators and the code shouldn't be changed).

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [CI Build] Windows Integration Tests passed 💻

✅ All Windows Integration Tests passed.

Pipeline on Agent
Hash: 2f91cd0875e4b062e2a32e7e55bd0b0ebf6667cd [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

💻 [PR Build] Tests on macOS M1 - Mac Ventura (13.0) passed 💻

✅ All tests on macOS M1 - Mac Ventura (13.0) passed.

Pipeline on Agent
Hash: [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: [PR build]

@vs-mobiletools-engineering-service2
Copy link
Collaborator

📚 [PR Build] Artifacts 📚

Packages generated

View packages

Pipeline on Agent
Hash: [PR build]

@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: 2f91cd0875e4b062e2a32e7e55bd0b0ebf6667cd [PR build]

@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. 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. Html Report (VSDrops) Download
✅ install_source: All 1 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 65 tests passed. 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: 2f91cd0875e4b062e2a32e7e55bd0b0ebf6667cd [PR build]

@rolfbjarne rolfbjarne merged commit 36af029 into xamarin:main May 5, 2023
@rolfbjarne rolfbjarne deleted the to-be-null-or-not-to-be-null branch May 5, 2023 15:52
filipnavara pushed a commit to filipnavara/xamarin-macios that referenced this pull request May 9, 2023
@rolfbjarne @filipnavara
Change all null checking expressions to use 'is' and 'is not'. (xamar…
c83bdbf 
…in#18176)

Change all null checking expressions to use 'is null' and 'is not null'
instead of '== null' and '!= null'.

This was mostly done with sed, so code can probably be improved in many
other ways with manual inspection, but that will come over time.

Also add code to the autoformat script to automatically fix these issues in the future.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@tj-devel709 tj-devel709 tj-devel709 approved these changes

@stephen-hawley stephen-hawley stephen-hawley approved these changes

@emaf emaf emaf approved these changes

@mauroa mauroa mauroa approved these changes

@dalexsoto dalexsoto dalexsoto approved these changes

@mandel-macaque mandel-macaque Awaiting requested review from mandel-macaque mandel-macaque is a code owner

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

Successfully merging this pull request may close these issues.
8 participants
@rolfbjarne @vs-mobiletools-engineering-service2 @dalexsoto @mauroa @emaf @stephen-hawley @tj-devel709 @haritha-mohan