ZEN-4367, ZEN-3845 - Resource templates don't populate schema reference correctly #473
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bug: stray quote in 2nd variable occurrence - If we leave the quotes in, we see this bug. It may be a KZOE bug, in which case we should aim to fix it. Bug: code assist prepends reference to selected text instead of replacing it. We only see this bug when we do not surround the template variable with quotes.
This reverts commit 62cc24b.
tfesenko
changed the title
tfesenko
changed the title
tfesenko
requested review from
andylowry and
ghillairet
and removed request for
andylowry
|
@ghillairet , this PR is ready for your review |
ghillairet
reviewed
Sep 12, 2018
|
|
||
| } | ||
|
|
||
| /*============ Code below copied from utils.Cursors, otherwise Xtend won't compile ============= */ |
There was a problem hiding this comment.
@tfesenko Any clue why it does not compile for you? I have it working.
ghillairet
requested changes
Sep 12, 2018
There was a problem hiding this comment.
@tfesenko Looks good. It works as expected, although I would prefer we remove the duplicate in the tests.
Covered by https://modelsolv.atlassian.net/browse/ZEN-4428, will be fixed later. Merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Problem
ZEN-3845: Code assist should replace selected text
KZOE doesn't seem to have an option to overwrite the selected text. The CTRL key doesn't seem to have any effect.
I would even go further and say that the idea of an "insert" mode is quite counterintuitive. If I have text selected when I invoke code assist, I would fully expect that whatever I select from the suggestion list will replace the selected text. If it doesn't, it seems like a bug. I would never think to hold down the CTRL key, even if it worked. And I would not think to look for an option in preferences to make code assist replace instead of insert. I would just assume it's a bug. Apparently Andy Lowry make the same assumption in ZEN-4367 .
I think "replace mode" should be at least the default mode, and probably the only mode. It's not worth any extra effort to provide an option key (like Ctrl) or a preference setting for "insert mode" in code assist; I don't see the point.
ZEN-4367: Resource templates don't populate schema reference correctly
I tried inserting and filling in the collection resource code template, and found that there were warnings due to invalid references.
The first $ref variable is between single quotes; the second is within double quotes. After using code assist to choose a valid reference, the second one looks like this:
$ref: "'#/components/schemas/TaxFiling"There is a stray single quote after the opening double quote.
The Object Resource template has a similar problem.
Changes Overview
The major changes are done in
StyledCompletionProposalandProposalDescriptorProposal->ProposalDescriptorwith fluent syntax to set all the values, addedtoString()StyledCompletionProposalinstancesStyledCompletionProposal: added newpreSelectedRegionLengthto address ZEN-3845 Code assist should replace selected textTests
JsonReferenceProposalProvider_Quotes_Testprovides integration tests for code assist for elements with quotes (references), it also checks the document state after the code assist proposal have been applied.