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.

Sign up for GitHub

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

Fix completion on part of existing string #1941

Merged
merged 5 commits into from
Sep 28, 2020
Merged

Fix completion on part of existing string #1941

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a329ce5
Fix completion on part of existing string
nohwnd Sep 14, 2020
e21a232
Use text edit for main insert text
333fred Sep 18, 2020
255a883
Add more tests for override spans within the original typed text, com…
333fred Sep 18, 2020
252f79a
Merge pull request #1 from 333fred/textedit-completion
nohwnd Sep 18, 2020
6c2a86f
Merge branch 'master' into completion-on-part-of-typed-text
nohwnd Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/OmniSharp.Roslyn.CSharp/Services/Completion/CompletionService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,19 @@ public async Task<CompletionResponse> Handle(CompletionRequest request)
break;
}

// If the span we are using is re-using part of the typed text we just need to grab the completion an prefix it
// with the existing text. Such as Onenabled -> OnEnabled, this will re-use On of the typed text
if (typedSpan.Start < change.TextChange.Span.Start && typedSpan.Start < change.TextChange.Span.End && typedSpan.End == change.TextChange.Span.End)
{
var prefix = typedText.Substring(0, change.TextChange.Span.Start - typedSpan.Start);

(insertText, insertTextFormat) = getAdjustedInsertTextWithPosition(change, position, newOffset: 0);

insertText = prefix + insertText;
Copy link
Member

Choose a reason for hiding this comment

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

what about a situation where insertText should correct the letter casing of the typed text?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would that be triggered in this case? I don't think it will because that is covered by the if above this one, then then typedSpan is replaced as a whole. In this case the part of the span is already correct so the suggestion only contains the part that needs to be added. At least that is what I saw when trying one<tab> vs One<tab>. In the first case one gets OnEnabled() ... suggestion, but One gets Enabled() ... suggestion. The span of the first suggestion is identical to the typedSpan, while the span of the second suggestion starts 2 characters after th typedSpan, because you already have On in the text.


break;
}

int additionalEditEndOffset;
(additionalTextEdits, additionalEditEndOffset) = await GetAdditionalTextEdits(change, sourceText, (CSharpParseOptions)syntax!.Options, typedSpan, completion.DisplayText, providerName);

Expand Down