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

Jump to bottom

fix https://github.com/microsoft/vscode/issues/170041 #199942

Merged
merged 1 commit into from
Dec 4, 2023
Merged

fix https://github.com/microsoft/vscode/issues/170041 #199942

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/vs/workbench/api/browser/mainThreadEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { CodeEditorStateFlag, EditorState } from 'vs/editor/contrib/editorState/
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
import { SnippetParser } from 'vs/editor/contrib/snippet/browser/snippetParser';
import { MainThreadDocuments } from 'vs/workbench/api/browser/mainThreadDocuments';
import { ISnippetEdit } from 'vs/editor/contrib/snippet/browser/snippetSession';

export interface IFocusTracker {
onGainedFocus(): void;
Expand Down Expand Up @@ -530,16 +531,11 @@ export class MainThreadTextEditor {
return false;
}

// cancel previous snippet mode
// snippetController.leaveSnippet();

// set selection, focus editor
const selections = ranges.map(r => new Selection(r.startLineNumber, r.startColumn, r.endLineNumber, r.endColumn));
this._codeEditor.setSelections(selections);
this._codeEditor.focus();

// make modifications
snippetController.insert(template, {
// make modifications as snippet edit
const edits: ISnippetEdit[] = ranges.map(range => ({ range: Range.lift(range), template }));
snippetController.apply(edits, {
overwriteBefore: 0, overwriteAfter: 0,
undoStopBefore: opts.undoStopBefore, undoStopAfter: opts.undoStopAfter,
clipboardText
Expand Down