Skip to content

Python Node Editor Visual Update - part #3 - #13783

Merged
QilongTang merged 9 commits into
DynamoDS:masterfrom
dnenov:dnenov-pythonscript-colorscheme
Mar 14, 2023
Merged

QilongTang merged 9 commits into
DynamoDS:masterfrom
dnenov:dnenov-pythonscript-colorscheme

Conversation

@dnenov

@dnenov dnenov commented Feb 28, 2023 •

Copy link
Copy Markdown
Collaborator

Purpose

A continuation of Part 1 and Part 2. This PR only deals with the reserved words colors, aligning the color scheme used in design script editor and the python editor.

Color scheme as per Figma project

image

Declarations

Check these if you believe they are true

  • The codebase is in a better state after this PR
  • Is documented according to the standards
  • The level of testing this PR includes is appropriate
  • User facing strings, if any, are extracted into *.resx files
  • All tests pass using the self-service CI.
  • Snapshot of UI changes, if any.
  • Changes to the API follow Semantic Versioning and are documented in the API Changes document.
  • This PR modifies some build requirements and the readme is updated

Release Notes

  • aligns design script and python script reserved keywords
  • hyperlink highlight color

Reviewers

@sm6srw
@Amoursol

FYIs

@Jingyi-Wen

- aligns custom highlighting rules between design script and python script editors by reusing the same method
- assigned correct color values to python script keywords as per Figma (omitting the ones that are not used and shouldn't be reserved in Python, such as 'Imperative')
- changed hyperlink color for both editors
- now python script will follow the convention used in desingscript for function color
@dnenov dnenov mentioned this pull request Feb 28, 2023
5 of 8 tasks
@sm6srw
sm6srw marked this pull request as ready for review March 1, 2023 14:58
- aligned different pink colors to the default #F2A9F2
@sm6srw

sm6srw commented Mar 6, 2023

Copy link
Copy Markdown
Contributor

- changed if/else (no longer bold)
- changed def/class (reuse number blue)
- changed def (no longer italic)
@dnenov

dnenov commented Mar 6, 2023

Copy link
Copy Markdown
Collaborator Author

I think these are the final color changes for the moment and we should be good to Merge if everything else looks OK @sm6srw !

Comment thread src/DynamoCoreWpf/Views/CodeCompletion/CodeCompletionEditor.xaml.cs

@reddyashish reddyashish left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM once the conflicts are resolved.

@QilongTang QilongTang added this to the 2.18.0 milestone Mar 14, 2023
dnenov added 3 commits March 14, 2023 16:12
- removed unnecessary namespace statement
- now properly marks the script as saved when using Save and Run button
@reddyashish

Copy link
Copy Markdown
Collaborator

Jobs on master-5 are hanged, running self-service https://master-15.jenkins.autodesk.com/view/DYN/job/DYN-DevCI_Self_Service/1129/.

@QilongTang

Copy link
Copy Markdown
Contributor

DynamoCoreWpfTests.CoreUserInterfaceTests.WorkspaceContextMenu_TestIfOpenOnRightClick sporadit test failure reported. Merging.

@QilongTang
QilongTang merged commit 37185c8 into DynamoDS:master Mar 14, 2023
@reddyashish

Copy link
Copy Markdown
Collaborator

@dnenov was about to add a fix in this for the folding behavior you mentioned. May be in another PR.

@QilongTang

Copy link
Copy Markdown
Contributor

@dnenov was about to add a fix in this for the folding behavior you mentioned. May be in another PR.

Great! Let's use another one. I would love to test this before recharge sprint

sm6srw pushed a commit to sm6srw/Dynamo that referenced this pull request Mar 29, 2023
* Implemented CodeHighlightingRuleFactory for PythonScript

- aligns custom highlighting rules between design script and python script editors by reusing the same method
- assigned correct color values to python script keywords as per Figma (omitting the ones that are not used and shouldn't be reserved in Python, such as 'Imperative')

* Hyperlink color

- changed hyperlink color for both editors

* Match function colors

- now python script will follow the convention used in desingscript for function color

* Update DesignScript.Resources.SyntaxHighlighting.xshd

- aligned different pink colors to the default #F2A9F2

* Update ICSharpCode.PythonBinding.Resources.Python.xshd

- changed if/else (no longer bold)
- changed def/class (reuse number blue)
- changed def (no longer italic)

* Removed unnecessary namespace statement

- removed unnecessary namespace statement

* Fixed save on save and run

- now properly marks the script as saved when using Save and Run button
sm6srw pushed a commit that referenced this pull request Apr 5, 2023
* Implemented CodeHighlightingRuleFactory for PythonScript

- aligns custom highlighting rules between design script and python script editors by reusing the same method
- assigned correct color values to python script keywords as per Figma (omitting the ones that are not used and shouldn't be reserved in Python, such as 'Imperative')

* Hyperlink color

- changed hyperlink color for both editors

* Match function colors

- now python script will follow the convention used in desingscript for function color

* Update DesignScript.Resources.SyntaxHighlighting.xshd

- aligned different pink colors to the default #F2A9F2

* Update ICSharpCode.PythonBinding.Resources.Python.xshd

- changed if/else (no longer bold)
- changed def/class (reuse number blue)
- changed def (no longer italic)

* Removed unnecessary namespace statement

- removed unnecessary namespace statement

* Fixed save on save and run

- now properly marks the script as saved when using Save and Run button
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