ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-14 18:46:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 79a1f5a5ca0c6c53db617aa1fa5a2396d2caebe2

Browse Source
This commit is contained in:
ADS Merger
2020-05-31 19:47:51 +00:00
parent 84492049e8
commit 28be33cfea
913 changed files with 28242 additions and 15549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/editor/browser/widget/diffEditorWidget.ts
View File

@@ -7,7 +7,7 @@ import 'vs/css!./media/diffEditor';
import * as nls from 'vs/nls';
import * as dom from 'vs/base/browser/dom';
import { FastDomNode, createFastDomNode } from 'vs/base/browser/fastDomNode';
import { ISashEvent, IVerticalSashLayoutProvider, Sash, SashState } from 'vs/base/browser/ui/sash/sash';
import { ISashEvent, IVerticalSashLayoutProvider, Sash, SashState, Orientation } from 'vs/base/browser/ui/sash/sash';
import { RunOnceScheduler } from 'vs/base/common/async';
import { Color } from 'vs/base/common/color';
import { Emitter, Event } from 'vs/base/common/event';
@@ -50,6 +50,7 @@ import { IEditorProgressService, IProgressRunner } from 'vs/platform/progress/co
import { ElementSizeObserver } from 'vs/editor/browser/config/elementSizeObserver';
import { reverseLineChanges } from 'sql/editor/browser/diffEditorHelper';
import { Codicon, registerIcon } from 'vs/base/common/codicons';
import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from 'vs/base/browser/ui/mouseCursor/mouseCursor';
interface IEditorDiffDecorations {
decorations: IModelDeltaDecoration[];
@@ -892,7 +893,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
this._cleanViewZonesAndDecorations();
}
public trigger(source: string, handlerId: string, payload: any): void {
public trigger(source: string | null | undefined, handlerId: string, payload: any): void {
this.modifiedEditor.trigger(source, handlerId, payload);
}
@@ -1675,7 +1676,7 @@ class DiffEditorWidgetSideBySide extends DiffEditorWidgetStyle implements IDiffE
this._sashRatio = null;
this._sashPosition = null;
this._startSashPosition = null;
this._sash = this._register(new Sash(this._dataSource.getContainerDomNode(), this));
this._sash = this._register(new Sash(this._dataSource.getContainerDomNode(), this, { orientation: Orientation.VERTICAL }));
if (this._disableSash) {
this._sash.state = SashState.Disabled;
@@ -2113,7 +2114,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
maxCharsPerLine += this.modifiedEditorOptions.get(EditorOption.scrollBeyondLastColumn);
let domNode = document.createElement('div');
domNode.className = 'view-lines line-delete';
domNode.className = `view-lines line-delete ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`;
domNode.innerHTML = sb.build();
Configuration.applyFontInfoSlow(domNode, fontInfo);