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.

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

#6537 add null protection #6538

Merged
merged 3 commits into from
May 24, 2022
Merged

#6537 add null protection #6538

merged 3 commits into from
May 24, 2022

Conversation

davidradl
Copy link
Member

Signed-off-by: David Radley dgradley@gmail.com

Description

Related Issue(s)

Testing

Release Notes & Documentation

Additional notes

davidradl added 2 commits May 20, 2022 13:44
Signed-off-by: David Radley <dgradley@gmail.com>
Signed-off-by: David Radley <dgradley@gmail.com>
@davidradl davidradl self-assigned this May 20, 2022
@davidradl
Copy link
Member Author

@mandy-chessell @planetf1 I can work out how to get rid of the indentation issues:

  • it looks fine on my mac - i,e the formatting of the module
  • it comes through to git with strange indentation
  • I installed xcode to see the hex, but it messed up git looking for plugins so uninstalled
  • I pasted into text edit and manually put the right number of spaces in - making sure there are no tabs. But this is what you see.

@planetf1
Copy link
Member

planetf1 commented May 20, 2022

It's caused by a mix of tabs and spaces.

For me - probably using the default for spaces/tabs, it shows up correctly aligned - whilst the web UI looks wrong.

However if enable preferences->editor->appearance->white space & select the options I can see some of the code (that was there before) uses tabs, whilst other code (yours) uses spaces.

My feeling would be to replace the tabs with spaces (intelliJ can also do this automatically)

Screenshot 2022-05-20 at 15 41 58

@planetf1
Copy link
Member

Screenshot 2022-05-20 at 15 44 36

@planetf1
Copy link
Member

Screenshot 2022-05-20 at 15 47 04

@planetf1
Copy link
Member

Most of the code in that module already does use spaces but that segment had tabs introduced back in 2018

Signed-off-by: David Radley <dgradley@gmail.com>
@davidradl davidradl marked this pull request as ready for review May 23, 2022 20:26
@davidradl davidradl requested a review from mandy-chessell as a code owner May 23, 2022 20:26
@davidradl davidradl merged commit 3710383 into odpi:master May 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants