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

Fix regex to optionally ignore quoted strings when checking for deprecated Text.lineColor annotation (CI) #4183

Merged
merged 1 commit into from
Sep 5, 2023

Conversation

beutlich
Copy link
Member

Previously, a Text.lineColor annotation was not detected, if there was a closing parenthesis (within a quoted Text.textString annotation), e.g.

Text(extent={{-100,80},{-80,60}}, textString="1)", lineColor={0,0,255})

See #4181.

@beutlich beutlich added the CI Issue that addresses continuous integration label Aug 16, 2023
@beutlich beutlich added this to the MSL4.1.0 milestone Aug 16, 2023
Copy link
Contributor

@HansOlsson HansOlsson left a comment

Choose a reason for hiding this comment

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

Looks good. I noticed that it currently causes an issue in CI since the library is not yet correct, and that indicates that the code works!

@tobolar
Copy link
Contributor

tobolar commented Sep 5, 2023

The "deprecation_checks" failed. This is due to presence of deprecated Text.lineColor annotation in

  • File "Modelica/Mechanics/Translational/Examples/Friction.mo": line 70
  • File "Modelica/Mechanics/Translational/Examples/Friction.mo": line 73
  • File "Modelica/Mechanics/Translational/Examples/SignConvention.mo": line 83
  • File "Modelica/Mechanics/Translational/Examples/SignConvention.mo": line 86
  • File "Modelica/Mechanics/Translational/Examples/SignConvention.mo": line 89

A corresponding PR #4181 fix this. Once that PR is merged, this PR can be rebased and all checks shall pass.

Previously, a Text.lineColor annotation was not detected, if there was a closing parenthesis (within a quoted Text.textString annotation), e.g.

```
Text(extent={{-100,80},{-80,60}}, textString="1)", lineColor={0,0,255})
```
@beutlich beutlich enabled auto-merge (squash) September 5, 2023 15:42
@beutlich beutlich merged commit 76ec102 into modelica:master Sep 5, 2023
@beutlich beutlich deleted the fix-lineColor-regex branch September 5, 2023 15:45
tobolar added a commit to tobolar/PlanarMechanics that referenced this pull request Sep 22, 2023
tobolar added a commit to dzimmer/PlanarMechanics that referenced this pull request Sep 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Issue that addresses continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants