suggest: cleanup

src/vs/editor/contrib/suggest/browser/suggest.ts

@@ -60,11 +60,11 @@ export class SuggestController implements IEditorContribution {
 		this.update();
 	}
 
-	public getId(): string {
+	getId(): string {
 		return SuggestController.ID;
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.toDispose = dispose(this.toDispose);
 		this.triggerCharacterListeners = dispose(this.triggerCharacterListeners);
 
@@ -138,50 +138,50 @@ export class SuggestController implements IEditorContribution {
 		}
 	}
 
-	public triggerSuggest(triggerCharacter?: string, groups?: ISuggestSupport[][]): TPromise<boolean> {
+	triggerSuggest(triggerCharacter?: string, groups?: ISuggestSupport[][]): TPromise<boolean> {
 		this.model.trigger(false, triggerCharacter, false, groups);
 		this.editor.focus();
 
 		return TPromise.as(false);
 	}
 
-	public acceptSelectedSuggestion(): void {
+	acceptSelectedSuggestion(): void {
 		if (this.widget) {
 			this.widget.acceptSelectedSuggestion();
 		}
 	}
 
-	public cancelSuggestWidget(): void {
+	cancelSuggestWidget(): void {
 		if (this.widget) {
 			this.widget.cancel();
 		}
 	}
 
-	public selectNextSuggestion(): void {
+	selectNextSuggestion(): void {
 		if (this.widget) {
 			this.widget.selectNext();
 		}
 	}
 
-	public selectNextPageSuggestion(): void {
+	selectNextPageSuggestion(): void {
 		if (this.widget) {
 			this.widget.selectNextPage();
 		}
 	}
 
-	public selectPrevSuggestion(): void {
+	selectPrevSuggestion(): void {
 		if (this.widget) {
 			this.widget.selectPrevious();
 		}
 	}
 
-	public selectPrevPageSuggestion(): void {
+	selectPrevPageSuggestion(): void {
 		if (this.widget) {
 			this.widget.selectPreviousPage();
 		}
 	}
 
-	public toggleSuggestionDetails(): void {
+	toggleSuggestionDetails(): void {
 		if (this.widget) {
 			this.widget.toggleDetails();
 		}
@@ -196,11 +196,11 @@ export class TriggerSuggestAction extends EditorAction {
 		super(descriptor, editor);
 	}
 
-	public isSupported(): boolean {
+	isSupported(): boolean {
 		return SuggestRegistry.has(this.editor.getModel()) && !this.editor.getConfiguration().readOnly;
 	}
 
-	public run(): TPromise<boolean> {
+	run(): TPromise<boolean> {
 		return SuggestController.getSuggestController(this.editor).triggerSuggest();
 	}
 }

src/vs/editor/contrib/suggest/browser/suggestModel.ts

@@ -41,16 +41,16 @@ export interface IAcceptEvent {
 
 class Context {
 
-	public lineNumber: number;
-	public column: number;
-	public isInEditableRange: boolean;
+	lineNumber: number;
+	column: number;
+	isInEditableRange: boolean;
 
 	private isAutoTriggerEnabled: boolean;
-	public lineContentBefore: string;
-	public lineContentAfter: string;
+	lineContentBefore: string;
+	lineContentAfter: string;
 
-	public wordBefore: string;
-	public wordAfter: string;
+	wordBefore: string;
+	wordAfter: string;
 
 	constructor(editor: ICommonCodeEditor, private auto: boolean) {
 		const model = editor.getModel();
@@ -85,7 +85,7 @@ class Context {
 		this.isAutoTriggerEnabled = supports.some(s => s.shouldAutotriggerSuggest);
 	}
 
-	public shouldAutoTrigger(): boolean {
+	shouldAutoTrigger(): boolean {
 		if (!this.isAutoTriggerEnabled) {
 			// Support disallows it
 			return false;
@@ -109,7 +109,7 @@ class Context {
 		return true;
 	}
 
-	public isDifferentContext(context: Context): boolean {
+	isDifferentContext(context: Context): boolean {
 		if (this.lineNumber !== context.lineNumber) {
 			// Line number has changed
 			return true;
@@ -133,7 +133,7 @@ class Context {
 		return false;
 	}
 
-	public shouldRetrigger(context: Context): boolean {
+	shouldRetrigger(context: Context): boolean {
 		if (!startsWith(this.lineContentBefore, context.lineContentBefore) || this.lineContentAfter !== context.lineContentAfter) {
 			// Doesn't look like the same line
 			return false;
@@ -175,16 +175,16 @@ export class SuggestModel implements IDisposable {
 	private incomplete: boolean;
 
 	private _onDidCancel: Emitter<ICancelEvent> = new Emitter();
-	public get onDidCancel(): Event<ICancelEvent> { return this._onDidCancel.event; }
+	get onDidCancel(): Event<ICancelEvent> { return this._onDidCancel.event; }
 
 	private _onDidTrigger: Emitter<ITriggerEvent> = new Emitter();
-	public get onDidTrigger(): Event<ITriggerEvent> { return this._onDidTrigger.event; }
+	get onDidTrigger(): Event<ITriggerEvent> { return this._onDidTrigger.event; }
 
 	private _onDidSuggest: Emitter<ISuggestEvent> = new Emitter();
-	public get onDidSuggest(): Event<ISuggestEvent> { return this._onDidSuggest.event; }
+	get onDidSuggest(): Event<ISuggestEvent> { return this._onDidSuggest.event; }
 
 	private _onDidAccept: Emitter<IAcceptEvent> = new Emitter();
-	public get onDidAccept(): Event<IAcceptEvent> { return this._onDidAccept.event; }
+	get onDidAccept(): Event<IAcceptEvent> { return this._onDidAccept.event; }
 
 	constructor(private editor: ICommonCodeEditor) {
 		this.state = State.Idle;
@@ -203,7 +203,7 @@ export class SuggestModel implements IDisposable {
 		this.onEditorConfigurationChange();
 	}
 
-	public cancel(silent: boolean = false, retrigger: boolean = false): boolean {
+	cancel(silent: boolean = false, retrigger: boolean = false): boolean {
 		const actuallyCanceled = this.state !== State.Idle;
 
 		if (this.triggerAutoSuggestPromise) {
@@ -229,7 +229,7 @@ export class SuggestModel implements IDisposable {
 		return actuallyCanceled;
 	}
 
-	public getRequestPosition(): Position {
+	getRequestPosition(): Position {
 		if (!this.context) {
 			return null;
 		}
@@ -296,7 +296,7 @@ export class SuggestModel implements IDisposable {
 		this.trigger(this.state === State.Auto, undefined, true);
 	}
 
-	public trigger(auto: boolean, triggerCharacter?: string, retrigger: boolean = false, groups?: ISuggestSupport[][]): void {
+	trigger(auto: boolean, triggerCharacter?: string, retrigger: boolean = false, groups?: ISuggestSupport[][]): void {
 		const model = this.editor.getModel();
 		const characterTriggered = !!triggerCharacter;
 		groups = groups || SuggestRegistry.orderedGroups(model);
@@ -376,7 +376,7 @@ export class SuggestModel implements IDisposable {
 		}
 	}
 
-	public accept(suggestion: ISuggestion, overwriteBefore: number, overwriteAfter: number): boolean {
+	accept(suggestion: ISuggestion, overwriteBefore: number, overwriteAfter: number): boolean {
 		if (this.raw === null) {
 			return false;
 		}
@@ -399,7 +399,7 @@ export class SuggestModel implements IDisposable {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.cancel(true);
 		this.toDispose = dispose(this.toDispose);
 	}

src/vs/editor/contrib/suggest/browser/suggestWidget.ts

@@ -308,7 +308,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 	static LOADING_MESSAGE: string = nls.localize('suggestWidget.loading', "Loading...");
 	static NO_SUGGESTIONS_MESSAGE: string = nls.localize('suggestWidget.noSuggestions', "No suggestions.");
 
-	public allowEditorOverflow: boolean = true; // Editor.IContentWidget.allowEditorOverflow
+	allowEditorOverflow: boolean = true; // Editor.IContentWidget.allowEditorOverflow
 
 	private state: State;
 	private isAuto: boolean;
@@ -334,7 +334,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 	private toDispose: IDisposable[];
 
 	private _onDidVisibilityChange: Emitter<boolean> = new Emitter();
-	public get onDidVisibilityChange(): Event<boolean> { return this._onDidVisibilityChange.event; }
+	get onDidVisibilityChange(): Event<boolean> { return this._onDidVisibilityChange.event; }
 
 	constructor(
 		private editor: ICodeEditor,
@@ -657,7 +657,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public selectNextPage(): boolean {
+	selectNextPage(): boolean {
 		switch (this.state) {
 			case State.Hidden:
 				return false;
@@ -672,7 +672,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public selectNext(): boolean {
+	selectNext(): boolean {
 		switch (this.state) {
 			case State.Hidden:
 				return false;
@@ -687,7 +687,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public selectPreviousPage(): boolean {
+	selectPreviousPage(): boolean {
 		switch (this.state) {
 			case State.Hidden:
 				return false;
@@ -702,7 +702,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public selectPrevious(): boolean {
+	selectPrevious(): boolean {
 		switch (this.state) {
 			case State.Hidden:
 				return false;
@@ -713,11 +713,11 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 				return !this.isAuto;
 			default:
 				this.list.focusPrevious(1, true);
-				return true;
+				return false;
 		}
 	}
 
-	public acceptSelectedSuggestion(): boolean {
+	acceptSelectedSuggestion(): boolean {
 		switch (this.state) {
 			case State.Hidden:
 				return false;
@@ -736,7 +736,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public toggleDetails(): void {
+	toggleDetails(): void {
 		if (this.state === State.Details) {
 			this.setState(State.Open);
 			this.editor.focus();
@@ -771,7 +771,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		removeClass(this.element, 'visible');
 	}
 
-	public cancel(): void {
+	cancel(): void {
 		if (this.state === State.Details) {
 			this.toggleDetails();
 		} else {
@@ -779,7 +779,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public getPosition(): IContentWidgetPosition {
+	getPosition(): IContentWidgetPosition {
 		if (this.state === State.Hidden) {
 			return null;
 		}
@@ -790,11 +790,11 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		};
 	}
 
-	public getDomNode(): HTMLElement {
+	getDomNode(): HTMLElement {
 		return this.element;
 	}
 
-	public getId(): string {
+	getId(): string {
 		return SuggestWidget.ID;
 	}
 
@@ -834,7 +834,7 @@ export class SuggestWidget implements IContentWidget, IDisposable {
 		}
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.state = null;
 		this.suggestionSupportsAutoAccept = null;
 		this.currentSuggestionDetails = null;