fix: extra space after position #732
Merged
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
p-spacek
commented
Jun 9, 2022
| @@ -115,7 +119,13 @@ export class SingleYAMLDocument extends JSONDocument { | |||
| return; | |||
| } | |||
|
|
|||
| if (range[0] <= positionOffset && range[1] >= positionOffset) { | |||
| const isNullNodeOnTheLine = (): boolean => | |||
There was a problem hiding this comment.
inside the function because the optimization
|
|
||
| this.arrayPrefixIndentation = ''; | ||
| let overwriteRange: Range = null; | ||
| if (node && isScalar(node) && node.value === 'null') { | ||
| if (areOnlySpacesAfterPosition) { | ||
| overwriteRange = Range.create(position, Position.create(position.line, lineContent.length)); |
There was a problem hiding this comment.
'remove' extra space after cursor
| if (node) { | ||
| // when the value is null but the cursor is between prop name and null value (cursor is not at the end of the line) | ||
| if (isMap(node) && node.items.length && isPair(node.items[0])) { |
There was a problem hiding this comment.
the mistake was to take only 0. index.
null node could be anywhere inside the collection. So there would have to be some complicated implementation to find the closest null node.
Same problem inside array fix
| @@ -1306,7 +1306,7 @@ describe('Auto Completion Tests', () => { | |||
| assert.equal(result.items.length, 1); | |||
| assert.deepEqual( | |||
| result.items[0], | |||
| createExpectedCompletion('- (array item)', '- name: ${1:test}', 3, 4, 3, 4, 9, 2, { | |||
| createExpectedCompletion('- (array item)', '- name: ${1:test}', 3, 4, 3, 5, 9, 2, { | |||
There was a problem hiding this comment.
4->5 because extra space will be removed after inserting the suggested item
evidolob
approved these changes
Jun 30, 2022
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.
What does this PR do?
fix another situation with extra space after the current cursor.
My previous fixes covered only some of the possible situations (#696, #697)
there were still problems in this type of yaml (2nd position)
This fix will solve this situation (for object, arrays in one place) by finding the correct node inside
getNodeFromPosition, instead of fixing it later and trying to find a better node (null node).Another part of this PR is to overwrite range - remove extra space
What issues does this PR fix or reference?
no ref
Is it tested? How?
modified and added unit tests