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

Merge from vscode 718331d6f3ebd1b571530ab499edb266ddd493d5

Browse Source
This commit is contained in:
ADS Merger
2020-02-08 04:50:58 +00:00
parent 8c61538a27
commit 2af13c18d2
752 changed files with 16458 additions and 10063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/vs/workbench/contrib/debug/test/browser/baseDebugView.test.ts
View File

@@ -4,17 +4,18 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { replaceWhitespace, renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
import { renderExpressionValue, renderVariable, renderViewTree } from 'vs/workbench/contrib/debug/browser/baseDebugView';
import * as dom from 'vs/base/browser/dom';
import { Expression, Variable, Scope, StackFrame, Thread, DebugModel } from 'vs/workbench/contrib/debug/common/debugModel';
import { MockSession } from 'vs/workbench/contrib/debug/test/common/mockDebug';
import { HighlightedLabel } from 'vs/base/browser/ui/highlightedlabel/highlightedLabel';
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { createMockSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
import { isStatusbarInDebugMode } from 'vs/workbench/contrib/debug/browser/statusbarColorProvider';
import { State } from 'vs/workbench/contrib/debug/common/debug';
import { isWindows } from 'vs/base/common/platform';
const $ = dom.$;
suite('Debug - Base Debug View', () => {
@@ -28,13 +29,6 @@ suite('Debug - Base Debug View', () => {
linkDetector = instantiationService.createInstance(LinkDetector);
});
test('replace whitespace', () => {
assert.equal(replaceWhitespace('hey there'), 'hey there');
assert.equal(replaceWhitespace('hey there\n'), 'hey there\\n');
assert.equal(replaceWhitespace('hey \r there\n\t'), 'hey \\r there\\n\\t');
assert.equal(replaceWhitespace('hey \r\t\n\t\t\n there'), 'hey \\r\\t\\n\\t\\t\\n there');
});
test('render view tree', () => {
const container = $('.container');
const treeContainer = renderViewTree(container);
@@ -47,7 +41,7 @@ suite('Debug - Base Debug View', () => {
test.skip('render expression value', () => { // {{SQL CARBON EDIT}} skip test
let container = $('.container');
renderExpressionValue('render \n me', container, { showHover: true, preserveWhitespace: true });
renderExpressionValue('render \n me', container, { showHover: true });
assert.equal(container.className, 'value');
assert.equal(container.title, 'render \n me');
assert.equal(container.textContent, 'render \n me');
@@ -76,7 +70,7 @@ suite('Debug - Base Debug View', () => {
renderExpressionValue(expression, container, { colorize: true, maxValueLength: 4, linkDetector });
assert.equal(container.textContent, 'this...');
expression.value = process.platform === 'win32' ? 'C:\\foo.js:5' : '/foo.js:5';
expression.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
container = $('.container');
renderExpressionValue(expression, container, { colorize: true, linkDetector });
assert.ok(container.querySelector('a'));
@@ -109,7 +103,7 @@ suite('Debug - Base Debug View', () => {
assert.equal(label.element.textContent, 'foo:');
assert.equal(label.element.title, 'string');
variable.value = process.platform === 'win32' ? 'C:\\foo.js:5' : '/foo.js:5';
variable.value = isWindows ? 'C:\\foo.js:5' : '/foo.js:5';
expression = $('.');
name = $('.');
value = $('.');

2
src/vs/workbench/contrib/debug/test/browser/linkDetector.test.ts
View File

@@ -5,7 +5,7 @@
import * as assert from 'assert';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
import { isWindows } from 'vs/base/common/platform';
import { WorkspaceFolder } from 'vs/platform/workspace/common/workspace';

2
src/vs/workbench/contrib/debug/test/browser/repl.test.ts
View File

@@ -135,7 +135,7 @@ suite('Debug - REPL', () => {
model.addSession(session);
const adapter = new MockDebugAdapter();
const raw = new RawDebugSession(adapter, undefined!, undefined!, undefined!, undefined!, undefined!);
const raw = new RawDebugSession(adapter, undefined!, undefined!, undefined!, undefined!, undefined!, undefined!);
session.initializeForTest(raw);
await session.addReplExpression(undefined, 'before.1');

27
src/vs/workbench/contrib/debug/test/common/debugUtils.test.ts
View File

@@ -103,15 +103,34 @@ suite('Debug - Utils', () => {
order: 500
}
});
configs.push({
type: 'node',
request: 'launch',
name: 'h',
presentation: {
order: 700
}
});
configs.push({
type: 'node',
request: 'launch',
name: 'i',
presentation: {
order: 1000
}
});
const sorted = getVisibleAndSorted(configs);
assert.equal(sorted.length, 7);
assert.equal(sorted.length, 9);
assert.equal(sorted[0].name, 'f');
assert.equal(sorted[1].name, 'd');
assert.equal(sorted[2].name, 'e');
assert.equal(sorted[3].name, 'g');
assert.equal(sorted[4].name, 'b');
assert.equal(sorted[5].name, 'p');
assert.equal(sorted[6].name, 'a');
assert.equal(sorted[4].name, 'h');
assert.equal(sorted[5].name, 'i');
assert.equal(sorted[6].name, 'b');
assert.equal(sorted[7].name, 'p');
assert.equal(sorted[8].name, 'a');
});
});

2
src/vs/workbench/contrib/debug/test/browser/debugANSIHandling.test.ts → src/vs/workbench/contrib/debug/test/electron-browser/debugANSIHandling.test.ts
View File

@@ -8,7 +8,7 @@ import * as dom from 'vs/base/browser/dom';
import { generateUuid } from 'vs/base/common/uuid';
import { appendStylizedStringToContainer, handleANSIOutput, calcANSI8bitColor } from 'vs/workbench/contrib/debug/browser/debugANSIHandling';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices';
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
import { LinkDetector } from 'vs/workbench/contrib/debug/browser/linkDetector';
import { Color, RGBA } from 'vs/base/common/color';
import { IThemeService } from 'vs/platform/theme/common/themeService';

2
src/vs/workbench/contrib/debug/test/node/debugger.test.ts
View File

@@ -11,7 +11,7 @@ import { Debugger } from 'vs/workbench/contrib/debug/common/debugger';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { URI } from 'vs/base/common/uri';
import { ExecutableDebugAdapter } from 'vs/workbench/contrib/debug/node/debugAdapter';
import { TestTextResourcePropertiesService } from 'vs/workbench/test/workbenchTestServices';
import { TestTextResourcePropertiesService } from 'vs/editor/test/common/services/modelService.test';
import { ExtensionIdentifier, IExtensionDescription } from 'vs/platform/extensions/common/extensions';