Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -245,7 +245,7 @@ export class QueryEditorService implements IQueryEditorService {
let index: number = group.indexOf(editor.input);
let position: Position = editor.position;
let options: IQueryEditorOptions = editor.options ? editor.options : {};
options.index = index;
options = Object.assign(options, { index: index });
options.pinned = group.isPinned(index);
// Return a promise that will resovle when the old editor has been replaced by a new editor