From 6cd78e2c761af7e8d6c143cf3d781f3173dcb3fd Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Thu, 11 Aug 2016 10:02:42 +0200 Subject: [PATCH] Revert "home, end in suggest" This reverts commit 82211b4d3d858cdd0292b74afaf4ee7d87107c31. fixes #10423 --- src/vs/base/browser/ui/list/listWidget.ts | 10 ----- .../editor/contrib/suggest/browser/suggest.ts | 36 ------------------ .../contrib/suggest/browser/suggestWidget.ts | 38 ------------------- 3 files changed, 84 deletions(-) diff --git a/src/vs/base/browser/ui/list/listWidget.ts b/src/vs/base/browser/ui/list/listWidget.ts index f1086897845..09b67f89d0c 100644 --- a/src/vs/base/browser/ui/list/listWidget.ts +++ b/src/vs/base/browser/ui/list/listWidget.ts @@ -376,16 +376,6 @@ export class List implements IDisposable { } } - focusFirst(): void { - if (this.length === 0) { return; } - this.setFocus(0); - } - - focusLast(): void { - if (this.length === 0) { return; } - this.setFocus(this.length - 1); - } - getFocus(): number[] { return this.focus.get(); } diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts index 53f964d0114..a9183eeac19 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.ts +++ b/src/vs/editor/contrib/suggest/browser/suggest.ts @@ -148,12 +148,6 @@ export class SuggestController implements IEditorContribution { } } - selectFirstSuggestion(): void { - if (this.widget) { - this.widget.selectFirst(); - } - } - selectPrevSuggestion(): void { if (this.widget) { this.widget.selectPrevious(); @@ -166,12 +160,6 @@ export class SuggestController implements IEditorContribution { } } - selectLastSuggestion(): void { - if (this.widget) { - this.widget.selectLast(); - } - } - toggleSuggestionDetails(): void { if (this.widget) { this.widget.toggleDetails(); @@ -265,18 +253,6 @@ CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ } })); -CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ - id: 'selectFirstSuggestion', - precondition: KbExpr.and(SuggestContext.Visible, SuggestContext.MultipleSuggestions), - handler: c => c.selectFirstSuggestion(), - kbOpts: { - weight: weight, - kbExpr: EditorContextKeys.TextFocus, - primary: KeyCode.Home, - secondary: [KeyMod.Alt | KeyCode.Home] - } -})); - CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ id: 'selectPrevSuggestion', precondition: KbExpr.and(SuggestContext.Visible, SuggestContext.MultipleSuggestions), @@ -302,18 +278,6 @@ CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ } })); -CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ - id: 'selectLastSuggestion', - precondition: KbExpr.and(SuggestContext.Visible, SuggestContext.MultipleSuggestions), - handler: c => c.selectLastSuggestion(), - kbOpts: { - weight: weight, - kbExpr: EditorContextKeys.TextFocus, - primary: KeyCode.End, - secondary: [KeyMod.Alt | KeyCode.End] - } -})); - CommonEditorRegistry.registerEditorCommand(new SuggestCommand({ id: 'toggleSuggestionDetails', precondition: SuggestContext.Visible, diff --git a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts index 8f50650e3dc..a1d8a83cd09 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestWidget.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestWidget.ts @@ -283,14 +283,6 @@ class SuggestionDetails { this.scrollUp(80); } - scrollHome(): void { - this.body.scrollTop = 0; - } - - scrollEnd(): void { - this.body.scrollTop = this.body.scrollHeight; - } - private configureFont() { const fontInfo = this.editor.getConfiguration().fontInfo; this.title.style.fontFamily = fontInfo.fontFamily; @@ -671,21 +663,6 @@ export class SuggestWidget implements IContentWidget, IDisposable { } } - selectLast(): boolean { - switch (this.state) { - case State.Hidden: - return false; - case State.Details: - this.details.scrollEnd(); - return true; - case State.Loading: - return !this.isAuto; - default: - this.list.focusLast(); - return true; - } - } - selectPreviousPage(): boolean { switch (this.state) { case State.Hidden: @@ -716,21 +693,6 @@ export class SuggestWidget implements IContentWidget, IDisposable { } } - selectFirst(): boolean { - switch (this.state) { - case State.Hidden: - return false; - case State.Details: - this.details.scrollHome(); - return true; - case State.Loading: - return !this.isAuto; - default: - this.list.focusFirst(); - return true; - } - } - acceptSelectedSuggestion(): boolean { switch (this.state) { case State.Hidden: -- GitLab