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

Implemented highlighting for embedded variables #586 #589

Closed
wants to merge 7 commits into from

Conversation

weltings
Copy link
Contributor

@weltings weltings commented Feb 27, 2022

Embedded variables were not highlighted in BDD type statements like:

Financial transaction ${type} should be completed with amount ${amount}

This is now implemented, see also #586

@fabioz
Copy link
Collaborator

fabioz commented Feb 28, 2022

It doesn't seem like this pull request is correct...

It's including the code for what was already merged. It's the same branch you pushed previously (and it has the same code that's already in master).

Note that the proper approach is checking out your master branch (which should always try to keep in sync with the master branch from https://github.com/robocorp/robotframework-lsp because usually your code will be squashed to a single commit when merging, so, you can't keep using the same branch) then update it (this can be done with git pull https://github.com/robocorp/robotframework-lsp.git master), then create a new branch, do your changes there and provide a pull request for that new branch.

As there's no new code in this branch I'm going to close it (waiting for the proper pull request...).

@fabioz fabioz closed this Feb 28, 2022
@fabioz
Copy link
Collaborator

fabioz commented Feb 28, 2022

p.s.: as you probably do have those commits locally, do the steps above to get a clean branch based on master and then use git cherry-pick to get the related commits in your new branch.

@weltings weltings deleted the gherking_highlighting branch February 28, 2022 18:47
@weltings
Copy link
Contributor Author

Thanks for the tips

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.

2 participants