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

Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2 (#8911)

Browse Source 
* Merge from vscode a234f13c45b40a0929777cb440ee011b7549eed2

* update distro

* fix layering

* update distro

* fix tests
This commit is contained in:
Anthony Dresser
2020-01-22 13:42:37 -08:00
committed by GitHub
parent 977111eb21
commit bd7aac8ee0
895 changed files with 24651 additions and 14520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1130,11 +1130,11 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
let scrollTop = this.modifiedEditor.getScrollTop();
let scrollHeight = this.modifiedEditor.getScrollHeight();
let computedAvailableSize = Math.max(0, layoutInfo.contentHeight);
let computedAvailableSize = Math.max(0, layoutInfo.height);
let computedRepresentableSize = Math.max(0, computedAvailableSize - 2 * 0);
let computedRatio = scrollHeight > 0 ? (computedRepresentableSize / scrollHeight) : 0;
let computedSliderSize = Math.max(0, Math.floor(layoutInfo.contentHeight * computedRatio));
let computedSliderSize = Math.max(0, Math.floor(layoutInfo.height * computedRatio));
let computedSliderPosition = Math.floor(scrollTop * computedRatio);
return {
@@ -1629,7 +1629,7 @@ const DECORATIONS = {
}),
lineInsertWithSign: ModelDecorationOptions.register({
className: 'line-insert',
linesDecorationsClassName: 'insert-sign',
linesDecorationsClassName: 'insert-sign codicon codicon-add',
marginClassName: 'line-insert',
isWholeLine: true
}),
@@ -1641,7 +1641,7 @@ const DECORATIONS = {
}),
lineDeleteWithSign: ModelDecorationOptions.register({
className: 'line-delete',
linesDecorationsClassName: 'delete-sign',
linesDecorationsClassName: 'delete-sign codicon codicon-remove',
marginClassName: 'line-delete',
isWholeLine: true
@@ -2100,7 +2100,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
if (this.renderIndicators) {
let index = lineNumber - lineChange.originalStartLineNumber;
marginHTML = marginHTML.concat([
`<div class="delete-sign" style="position:absolute;top:${index * lineHeight}px;width:${lineDecorationsWidth}px;height:${lineHeight}px;right:0;"></div>`
`<div class="delete-sign codicon codicon-remove" style="position:absolute;top:${index * lineHeight}px;width:${lineDecorationsWidth}px;height:${lineHeight}px;right:0;"></div>`
]);
}
}
@@ -2162,6 +2162,7 @@ class InlineViewZonesComputer extends ViewZonesComputer {
lineTokens,
actualDecorations,
tabSize,
0,
fontInfo.spaceWidth,
options.get(EditorOption.stopRenderingLineAfter),
options.get(EditorOption.renderWhitespace),