Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2 (#9253)

* Merge from vscode e6a45f4242ebddb7aa9a229f85555e8a3bd987e2

* skip failing tests

* remove github-authentication extensions

* ignore github compile steps

* ignore github compile steps

* check in compiled files
This commit is contained in:
Anthony Dresser
2020-02-21 12:11:51 -08:00
committed by GitHub
parent c74bac3746
commit 1b78a9b1e0
179 changed files with 3200 additions and 1830 deletions

View File

@@ -319,7 +319,7 @@ suite('Debug - Breakpoints', () => {
test('decorations', () => {
const modelUri = uri.file('/myfolder/my file first.js');
const languageIdentifier = new LanguageIdentifier('testMode', LanguageId.PlainText);
const textModel = new TextModel(
const textModel = TextModel.createFromString(
['this is line one', 'this is line two', ' this is line three it has whitespace at start', 'this is line four', 'this is line five'].join('\n'),
TextModel.DEFAULT_CREATION_OPTIONS,
languageIdentifier

View File

@@ -8,7 +8,7 @@ import * as assert from 'assert';
import severity from 'vs/base/common/severity';
import { DebugModel, StackFrame, Thread } from 'vs/workbench/contrib/debug/common/debugModel';
import { MockRawSession, MockDebugAdapter } from 'vs/workbench/contrib/debug/test/common/mockDebug';
import { SimpleReplElement, RawObjectReplElement, ReplEvaluationInput, ReplModel, ReplEvaluationResult } from 'vs/workbench/contrib/debug/common/replModel';
import { SimpleReplElement, RawObjectReplElement, ReplEvaluationInput, ReplModel, ReplEvaluationResult, ReplGroup } from 'vs/workbench/contrib/debug/common/replModel';
import { RawDebugSession } from 'vs/workbench/contrib/debug/browser/rawDebugSession';
import { timeout } from 'vs/base/common/async';
import { createMockSession } from 'vs/workbench/contrib/debug/test/browser/callStack.test';
@@ -151,4 +151,42 @@ suite('Debug - REPL', () => {
assert.equal((<ReplEvaluationResult>session.getReplElements()[4]).value, '=after.2');
assert.equal((<SimpleReplElement>session.getReplElements()[5]).value, 'after.2');
});
test('repl groups', async () => {
const session = createMockSession(model);
const repl = new ReplModel();
repl.appendToRepl(session, 'first global line', severity.Info);
repl.startGroup('group_1', true);
repl.appendToRepl(session, 'first line in group', severity.Info);
repl.appendToRepl(session, 'second line in group', severity.Info);
const elements = repl.getReplElements();
assert.equal(elements.length, 2);
const group = elements[1] as ReplGroup;
assert.equal(group.name, 'group_1');
assert.equal(group.autoExpand, true);
assert.equal(group.hasChildren, true);
assert.equal(group.hasEnded, false);
repl.startGroup('group_2', false);
repl.appendToRepl(session, 'first line in subgroup', severity.Info);
repl.appendToRepl(session, 'second line in subgroup', severity.Info);
const children = group.getChildren();
assert.equal(children.length, 3);
assert.equal((<SimpleReplElement>children[0]).value, 'first line in group');
assert.equal((<SimpleReplElement>children[1]).value, 'second line in group');
assert.equal((<ReplGroup>children[2]).name, 'group_2');
assert.equal((<ReplGroup>children[2]).hasEnded, false);
assert.equal((<ReplGroup>children[2]).getChildren().length, 2);
repl.endGroup();
assert.equal((<ReplGroup>children[2]).hasEnded, true);
repl.appendToRepl(session, 'third line in group', severity.Info);
assert.equal(group.getChildren().length, 4);
assert.equal(group.hasEnded, false);
repl.endGroup();
assert.equal(group.hasEnded, true);
repl.appendToRepl(session, 'second global line', severity.Info);
assert.equal(repl.getReplElements().length, 3);
assert.equal((<SimpleReplElement>repl.getReplElements()[2]).value, 'second global line');
});
});