mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-29 01:25:37 -05:00
Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)
This commit is contained in:
@@ -178,7 +178,7 @@ export class MainThreadTextEditor {
|
||||
private readonly _focusTracker: IFocusTracker;
|
||||
private readonly _codeEditorListeners = new DisposableStore();
|
||||
|
||||
private _properties: MainThreadTextEditorProperties;
|
||||
private _properties: MainThreadTextEditorProperties | null;
|
||||
private readonly _onPropertiesChanged: Emitter<IEditorPropertiesChangeData>;
|
||||
|
||||
constructor(
|
||||
@@ -191,6 +191,7 @@ export class MainThreadTextEditor {
|
||||
this._id = id;
|
||||
this._model = model;
|
||||
this._codeEditor = null;
|
||||
this._properties = null;
|
||||
this._focusTracker = focusTracker;
|
||||
this._modelService = modelService;
|
||||
|
||||
@@ -289,7 +290,7 @@ export class MainThreadTextEditor {
|
||||
}
|
||||
|
||||
public getProperties(): MainThreadTextEditorProperties {
|
||||
return this._properties;
|
||||
return this._properties!;
|
||||
}
|
||||
|
||||
public get onPropertiesChanged(): Event<IEditorPropertiesChangeData> {
|
||||
@@ -304,7 +305,7 @@ export class MainThreadTextEditor {
|
||||
|
||||
const newSelections = selections.map(Selection.liftSelection);
|
||||
this._setProperties(
|
||||
new MainThreadTextEditorProperties(newSelections, this._properties.options, this._properties.visibleRanges),
|
||||
new MainThreadTextEditorProperties(newSelections, this._properties!.options, this._properties!.visibleRanges),
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user