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

Projects
None yet
4 participants
@fadeevab
Copy link
Contributor

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

Alexandr Fadeev
Update makefile colorize tests according to the latest grammar.
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

This comment has been minimized.

Copy link
Contributor

fadeevab commented Oct 27, 2018

@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

This comment has been minimized.

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",

This comment has been minimized.

@zoe704

This comment has been minimized.

@fadeevab

fadeevab Nov 5, 2018

Contributor

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

@alexr00

alexr00 approved these changes Nov 6, 2018

Copy link
Member

alexr00 left a comment

Thank you for the PR!

@alexr00 alexr00 merged commit e99942c into Microsoft:master Nov 6, 2018

2 checks passed

VS Code #20181106.32 succeeded
Details
license/cla All CLA requirements met.
Details
@fadeevab

This comment has been minimized.

Copy link
Contributor

fadeevab commented Nov 6, 2018

@alexr00 You're welcome!

@fadeevab

This comment has been minimized.

Copy link
Contributor

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 fadeevab:make-tests branch Dec 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment