Manage cursor focus from viewModel

alexdima · alexdima · commit c71daba97829 · 2020-05-15T11:48:12.000+02:00
diff --git a/src/vs/editor/browser/controller/textAreaHandler.ts b/src/vs/editor/browser/controller/textAreaHandler.ts
@@ -307,10 +307,12 @@ export class TextAreaHandler extends ViewPart {
 		}));
 
 		this._register(this._textAreaInput.onFocus(() => {
+			this._context.model.setHasFocus(true);
 			this._context.privateViewEventBus.emit(new viewEvents.ViewFocusChangedEvent(true));
 		}));
 
 		this._register(this._textAreaInput.onBlur(() => {
+			this._context.model.setHasFocus(false);
 			this._context.privateViewEventBus.emit(new viewEvents.ViewFocusChangedEvent(false));
 		}));
 	}
diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts
@@ -316,7 +316,6 @@ export class View extends ViewEventHandler {
 	}
 	public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {
 		this.domNode.setClassName(this.getEditorClassName());
-		this._context.model.setHasFocus(e.isFocused);
 		if (e.isFocused) {
 			this.outgoingEvents.emitViewFocusGained();
 		} else {
diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts
@@ -1595,9 +1595,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		}
 
 		const onDidChangeTextFocus = (textFocus: boolean) => {
-			if (this._modelData) {
-				this._modelData.viewModel.cursor.setHasFocus(textFocus);
-			}
 			this._editorTextFocus.setValue(textFocus);
 		};
 
diff --git a/src/vs/editor/common/viewModel/viewModelImpl.ts b/src/vs/editor/common/viewModel/viewModelImpl.ts
@@ -160,6 +160,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel
 
 	public setHasFocus(hasFocus: boolean): void {
 		this.hasFocus = hasFocus;
+		this.cursor.setHasFocus(hasFocus);
 	}
 
 	private _onConfigurationChanged(eventsCollector: viewEvents.ViewEventsCollector, e: ConfigurationChangedEvent): void {

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,6 @@ export class View extends ViewEventHandler {`
`316`	`316`	`}`
`317`	`317`	`public onFocusChanged(e: viewEvents.ViewFocusChangedEvent): boolean {`
`318`	`318`	`this.domNode.setClassName(this.getEditorClassName());`
`319`		`- this._context.model.setHasFocus(e.isFocused);`
`320`	`319`	`if (e.isFocused) {`
`321`	`320`	`this.outgoingEvents.emitViewFocusGained();`
`322`	`321`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -1595,9 +1595,6 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE`
`1595`	`1595`	`}`
`1596`	`1596`
`1597`	`1597`	`const onDidChangeTextFocus = (textFocus: boolean) => {`
`1598`		`- if (this._modelData) {`
`1599`		`- this._modelData.viewModel.cursor.setHasFocus(textFocus);`
`1600`		`- }`
`1601`	`1598`	`this._editorTextFocus.setValue(textFocus);`
`1602`	`1599`	`};`
`1603`	`1600`
Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,7 @@ export class ViewModel extends viewEvents.ViewEventEmitter implements IViewModel`
`160`	`160`
`161`	`161`	`public setHasFocus(hasFocus: boolean): void {`
`162`	`162`	`this.hasFocus = hasFocus;`
	`163`	`+ this.cursor.setHasFocus(hasFocus);`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`private _onConfigurationChanged(eventsCollector: viewEvents.ViewEventsCollector, e: ConfigurationChangedEvent): void {`