ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-30 17:23:29 -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

36
src/vs/editor/test/common/viewLayout/viewLineRenderer.test.ts
View File

@@ -38,6 +38,7 @@ suite('viewLineRenderer.renderLine', () => {
[],
tabSize,
0,
0,
-1,
'none',
false,
@@ -88,6 +89,7 @@ suite('viewLineRenderer.renderLine', () => {
[],
tabSize,
0,
0,
-1,
'none',
false,
@@ -140,6 +142,7 @@ suite('viewLineRenderer.renderLine', () => {
]),
[],
4,
0,
10,
6,
'boundary',
@@ -232,6 +235,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'boundary',
@@ -295,6 +299,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -358,6 +363,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -398,6 +404,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -429,6 +436,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -530,6 +538,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -569,6 +578,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -599,6 +609,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -646,6 +657,7 @@ suite('viewLineRenderer.renderLine', () => {
lineParts,
[],
4,
0,
10,
-1,
'none',
@@ -728,6 +740,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens(tokens),
[],
4,
0,
10,
-1,
renderWhitespace,
@@ -754,6 +767,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(21, 3)]),
[new LineDecoration(1, 22, 'link', InlineDecorationType.Regular)],
4,
0,
10,
-1,
'none',
@@ -794,6 +808,7 @@ suite('viewLineRenderer.renderLine 2', () => {
new LineDecoration(13, 51, 'detected-link', InlineDecorationType.Regular)
],
4,
0,
10,
-1,
'none',
@@ -1209,6 +1224,7 @@ suite('viewLineRenderer.renderLine 2', () => {
new LineDecoration(2, 8, 'c', InlineDecorationType.Regular),
],
4,
0,
10,
-1,
'none',
@@ -1250,6 +1266,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(4, 3)]),
[new LineDecoration(1, 2, 'before', InlineDecorationType.Before)],
4,
0,
10,
-1,
'all',
@@ -1283,6 +1300,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(4, 3)]),
[new LineDecoration(2, 3, 'before', InlineDecorationType.Before)],
4,
0,
10,
-1,
'all',
@@ -1317,6 +1335,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(0, 3)]),
[new LineDecoration(1, 2, 'before', InlineDecorationType.Before)],
4,
0,
10,
-1,
'all',
@@ -1347,6 +1366,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(7, 3)]),
[new LineDecoration(7, 8, 'inline-folded', InlineDecorationType.After)],
2,
0,
10,
10000,
'none',
@@ -1365,7 +1385,7 @@ suite('viewLineRenderer.renderLine 2', () => {
assert.deepEqual(actual.html, expected);
});
test('issue #37401: Allow both before and after decorations on empty line', () => {
test('issue #37401 #40127: Allow both before and after decorations on empty line', () => {
let actual = renderViewLine(new RenderLineInput(
true,
@@ -1381,6 +1401,7 @@ suite('viewLineRenderer.renderLine 2', () => {
new LineDecoration(0, 1, 'after', InlineDecorationType.After),
],
2,
0,
10,
10000,
'none',
@@ -1391,7 +1412,8 @@ suite('viewLineRenderer.renderLine 2', () => {
let expected = [
'<span>',
'<span class="before after"></span>',
'<span class="before"></span>',
'<span class="after"></span>',
'</span>'
].join('');
@@ -1414,6 +1436,7 @@ suite('viewLineRenderer.renderLine 2', () => {
new LineDecoration(3, 3, 'ced-TextEditorDecorationType2-5e9b9b3f-4 ced-TextEditorDecorationType2-4', InlineDecorationType.After),
],
4,
0,
10,
10000,
'none',
@@ -1445,6 +1468,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(15, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1475,6 +1499,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(15, 3)]),
[],
4,
0,
10,
10000,
'all',
@@ -1511,6 +1536,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(53, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1541,6 +1567,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(100, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1573,6 +1600,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(105, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1604,6 +1632,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(59, 3)]),
[],
4,
0,
10,
10000,
'boundary',
@@ -1633,6 +1662,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(194, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1666,6 +1696,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens([createPart(194, 3)]),
[],
4,
0,
10,
10000,
'none',
@@ -1695,6 +1726,7 @@ suite('viewLineRenderer.renderLine 2', () => {
createViewLineTokens(parts),
[],
tabSize,
0,
10,
-1,
'none',