ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-21 04:20:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/editor/contrib/zoneWidget/zoneWidget.ts
View File

@@ -210,6 +210,7 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
}
this.editor.deltaDecorations(this._positionMarkerId, []);
this._positionMarkerId = [];
}
public create(): void {
@@ -280,10 +281,14 @@ export abstract class ZoneWidget implements IHorizontalSashLayoutProvider {
public get position(): Position {
const [id] = this._positionMarkerId;
if (id) {
return this.editor.getModel().getDecorationRange(id).getStartPosition();
if (!id) {
return undefined;
}
return undefined;
const range = this.editor.getModel().getDecorationRange(id);
if (!range) {
return undefined;
}
return range.getStartPosition();
}
protected _isShowing: boolean = false;