Skip to content

Generate editor keywords #526

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
Merged
merged 1 commit into from
Jul 1, 2022
Merged

Generate editor keywords #526

merged 1 commit into from
Jul 1, 2022

Conversation

xsebek
Copy link
Member

@xsebek xsebek commented Jul 1, 2022

@restyled-io restyled-io bot mentioned this pull request Jul 1, 2022
Merged
@xsebek
Copy link
Member Author

xsebek commented Jul 1, 2022

I updated the VS Code plugin to highlight the new keywords:
https://marketplace.visualstudio.com/items?itemName=xsebek.swarm-language

But it could use a bit more love - update the image link, CHANGELOG,...

@restyled-io restyled-io bot mentioned this pull request Jul 1, 2022
Merged
@xsebek xsebek marked this pull request as ready for review July 1, 2022 11:56
xsebek
xsebek commented Jul 1, 2022
View reviewed changes
editors/emacs/swarm-mode.el
"left" "right" "back" "forward" "north" "south" "east" "west" "down"
))
(x-builtins '(
"if"
Copy link
Member Author

Choose a reason for hiding this comment

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

@byorgey or @TristanCacqueray, do either of you use EMacs and could check this works, please?

Copy link
Member

Choose a reason for hiding this comment

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

Works great!

@xsebek xsebek force-pushed the generate-keywords branch from b6d5973 to 911af27 Compare July 1, 2022 12:08
@restyled-io restyled-io bot mentioned this pull request Jul 1, 2022
Merged
@xsebek xsebek mentioned this pull request Jul 1, 2022
Closed
7 tasks
xsebek
xsebek commented Jul 1, 2022
View reviewed changes
xsebek
xsebek commented Jul 1, 2022
View reviewed changes
editors/vscode/syntaxes/swarm.tmLanguage.json
@@ -56,7 +56,7 @@
},
{
"name": "keyword.other",
"match": "\\b(?i)(noop|wait|selfdestruct|move|turn|grab|place|give|install|make|has|count|drill|build|salvage|reprogram|say|log|view|appear|create|whereami|blocked|scan|upload|ishere|whoami|random|run|if|inl|inr|case|fst|snd|force|return|try|raise|not)\\b"
"match": "\\b(?i)(noop|wait|selfdestruct|move|turn|grab|harvest|place|give|install|make|has|count|drill|build|salvage|reprogram|say|log|view|appear|create|whereami|blocked|scan|upload|ishere|self|parent|base|whoami|setname|random|run|if|inl|inr|case|fst|snd|force|return|try|undefined|fail|not|format|teleport|as|robotnamed|robotnumbered|knows)\\b"
Copy link
Member Author

Choose a reason for hiding this comment

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

We could check those strings can be found in editor files in the integration test. 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Done ✔️

  editors
    VS Code
      operators:                                                        OK
      commands:                                                         OK
      directions:                                                       OK
    EMacs
      builtin:                                                          OK
      commands:                                                         OK
      directions:                                                       OK

byorgey
byorgey approved these changes Jul 1, 2022
View reviewed changes
Copy link
Member

@byorgey byorgey left a comment

Choose a reason for hiding this comment

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

All looks good, except---and this is being very nitpicky---could we do a search and replace to have Emacs instead of EMacs? Emacs is never written with a capital M and it looks strange to me.

test/integration/Main.hs
@@ -214,3 +219,38 @@ printAllLogs g =
mapM_
(\r -> forM_ (r ^. robotLog) (putStrLn . T.unpack . view leText))
(g ^. robotMap)

-- | Test that editor files are up-to-date.
testEditorFiles :: TestTree
Copy link
Member

Choose a reason for hiding this comment

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

👍

@xsebek xsebek added the merge me Trigger the merge process of the Pull request. label Jul 1, 2022
@xsebek
Copy link
Member Author

xsebek commented Jul 1, 2022

Weird, what's up with Mergify? 🤨

@byorgey
Copy link
Member

byorgey commented Jul 1, 2022

This happened to me once before. It took a while but it eventually worked.

@xsebek xsebek force-pushed the generate-keywords branch from 870a419 to 8774126 Compare July 1, 2022 18:36
@mergify mergify bot merged commit 3872c11 into main Jul 1, 2022
@mergify mergify bot deleted the generate-keywords branch July 1, 2022 18:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@byorgey byorgey byorgey approved these changes

@TristanCacqueray TristanCacqueray Awaiting requested review from TristanCacqueray

Assignees
No one assigned
Labels
merge me Trigger the merge process of the Pull request.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xsebek @byorgey