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

Update makefile colorize tests according to the latest grammar #61961

Merged
merged 2 commits into from Nov 6, 2018

Conversation

fadeevab
Copy link
Contributor

@fadeevab fadeevab commented Oct 27, 2018

  1. Handling the '!=' variable assignment operator.
  2. Handling the "#" (hashtag) in the quotes inside the recipe.
  3. Restore the recipe handling.

Issue: #60030, #61475

Recipe as it was:
makefile-grammar-shell-color-prev

Recipe is looking good now:
makefile-grammar-shell-color

1. Handling the '!=' variable assignment operator.
2. Handling the "#" (hashtag) in the quotes inside the recipe.
3. Restore the recipe handling.

Issue: #60030, #61475
@fadeevab
Copy link
Contributor Author

@aeschli
The pull request is about to fix 2 requested issues + 1 minor issue I found + improvement of recipes.

Test cases will pass after updating the makefile grammar from the upstream (https://github.com/fadeevab/make.tmbundle/). Thank you!

@aeschli aeschli assigned alexr00 and unassigned aeschli Oct 28, 2018
@fadeevab fadeevab changed the title Update makefile colorize tests according to the latest grammar. Update makefile colorize tests according to the latest grammar Oct 29, 2018
@alexr00
Copy link
Member

alexr00 commented Oct 29, 2018

@fadeevab, thanks for adding the test case! I'll pull in your grammar update and merge this in next week for the November 2018 milestone.

@@ -342,7 +342,7 @@
},
{
"c": "\tg++ main.o factorial.o hello.o -o hello",
"t": "source.makefile",
"t": "source.makefile meta.scope.recipe.makefile",
Copy link

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can't get what is this empty comment about? The line is passing into recipe meta scope, that is right.

Copy link
Member

@alexr00 alexr00 left a comment

Choose a reason for hiding this comment

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

Thank you for the PR!

@alexr00 alexr00 merged commit e99942c into microsoft:master Nov 6, 2018
@fadeevab
Copy link
Contributor Author

fadeevab commented Nov 6, 2018

@alexr00 You're welcome!

@fadeevab
Copy link
Contributor Author

fadeevab commented Nov 6, 2018

Just for information

How it was:
makefile-grammar-shell-color-prev

Recipe is looking good now:
makefile-grammar-shell-color

And a few other fixes.

@alexr00 alexr00 added this to the November 2018 milestone Nov 6, 2018
@fadeevab fadeevab deleted the make-tests branch December 23, 2018 22:39
@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants