From 0bc6ea5f77a36ee51640bfc1bcdb55200e2903e0 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 28 Feb 2018 11:40:25 +0100 Subject: [PATCH] Revert "Merge pull request #42647 from Microsoft/joao/fix-42494" fixes Microsoft/monaco-editor#739 This reverts commit 04f5a8c4d69e722f86c6248f38303f74b2b46a4f, reversing changes made to f8b2e22b89f13b5bd3eefc4e8781478337ef711a. --- build/gulpfile.hygiene.js | 1 - src/vs/editor/contrib/suggest/suggestWidget.ts | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index b9815408fb6..4549611ecbd 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -102,7 +102,6 @@ const copyrightFilter = [ '!**/*.disabled', '!**/*.code-workspace', '!build/**/*.init', - '!resources/linux/snap/electron-launch', '!resources/linux/snap/snapcraft.yaml', '!resources/win32/bin/code.js', '!extensions/markdown/media/tomorrow.css', diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts index 32b174c1ac0..180d53dc16a 100644 --- a/src/vs/editor/contrib/suggest/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/suggestWidget.ts @@ -731,17 +731,18 @@ export class SuggestWidget implements IContentWidget, IDelegate */ this.telemetryService.publicLog('suggestWidget', { ...stats, ...this.editor.getTelemetryData() }); + this.focusedItem = null; + this.focusedItemIndex = null; + this.list.splice(0, this.list.length, this.completionModel.items); + this.list.reveal(selectionIndex, selectionIndex); + if (isFrozen) { this.setState(State.Frozen); } else { this.setState(State.Open); } - this.focusedItem = null; - this.focusedItemIndex = null; - this.list.splice(0, this.list.length, this.completionModel.items); this.list.setFocus([selectionIndex]); - this.list.reveal(selectionIndex, selectionIndex); // Reset focus border if (this.detailsBorderColor) {