Skip to content

Conversation

@shargon
Copy link
Member

@shargon shargon commented Jan 16, 2025

Added some style rules, not included into .editorconfig in this pr because I need to deal with testing artifacts, this can be done in a different PR

shargon and others added 6 commits January 16, 2025 15:53
…t into some-style

# Conflicts:
#	src/Neo.Compiler.CSharp/Optimizer/Analysers/InstructionCoverage.cs
#	tests/Neo.Compiler.CSharp.TestContracts/Contract_GoTo.cs
Hecate2
Hecate2 previously approved these changes Jan 21, 2025
Copy link
Contributor

@Hecate2 Hecate2 left a comment

Choose a reason for hiding this comment

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

I merged master into this branch, manually adding copyright comments in recent new files (Break and Continue contracts and unit tests). If not desired, please just git push --force origin some-style:some-style to drop my new commits.

@shargon shargon dismissed Hecate2’s stale review January 21, 2025 02:36

The merge-base changed after approval.

Hecate2
Hecate2 previously approved these changes Jan 21, 2025
Copy link
Contributor

@Hecate2 Hecate2 left a comment

Choose a reason for hiding this comment

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

I merged master into this branch, manually adding copyright comments in recent new files (Break and Continue contracts and unit tests). If not desired, please just git push --force origin some-style:some-style to drop my new commits.

@shargon shargon dismissed Hecate2’s stale review January 21, 2025 02:42

The merge-base changed after approval.

@Hecate2
Copy link
Contributor

Hecate2 commented Jan 21, 2025

Seems to be github automatically dismissing approvals. https://github.com/orgs/community/discussions/58535 says that, closing and re-opening the PR solves the problem.

Jim8y
Jim8y previously approved these changes Jan 21, 2025
@shargon shargon dismissed Jim8y’s stale review January 21, 2025 06:50

The merge-base changed after approval.

@Jim8y Jim8y closed this Jan 21, 2025
@Jim8y Jim8y reopened this Jan 21, 2025
@Jim8y
Copy link
Contributor

Jim8y commented Jan 21, 2025

Seems to be github automatically dismissing approvals. https://github.com/orgs/community/discussions/58535 says that, closing and re-opening the PR solves the problem.

it works~~~

@Jim8y Jim8y merged commit 110837e into master Jan 21, 2025
3 of 6 checks passed
@Jim8y Jim8y deleted the some-style branch January 21, 2025 06:57
Jim8y added a commit that referenced this pull request Feb 5, 2025
* master:
  fix: always check division overflow for int32 and int64 (#1287)
  Fix: some compiler warnings (#1288)
  use INC DEC (#1286)
  Update neo (#1285)
  Update: keep same sdk version with 'neo' (#1284)
  partially fix return in try; optimizer replaces JMP->ENDTRY with only ENDTRY (#1283)
  update to dotnet 9 (#1257)
  Added some styles (#1280)
  [`Fix`]: `checked(-x)` if x is int or long (#1281)
  Fix continue and goto (#1282)

# Conflicts:
#	tests/Neo.Compiler.CSharp.UnitTests/TestingArtifacts/Contract_Types_BigInteger.cs
Jim8y pushed a commit that referenced this pull request Aug 3, 2025
* Added some styles
* Fix ut
* Fix dbg info
* update to 2025
* add copyright comments for new files
---------
Co-authored-by: Hecate2 <[email protected]>
Co-authored-by: Jimmy <[email protected]>
Jim8y added a commit that referenced this pull request Aug 18, 2025
* Added some styles

* Fix ut

* Fix dbg info

* update to 2025

* add copyright comments for new files

---------

Co-authored-by: Hecate2 <[email protected]>
Co-authored-by: Jimmy <[email protected]>
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.

4 participants