TheLanc3/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-09 05:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore(vscode): update to 1.53.2

Browse Source 
These conflicts will be resolved in the following commits. We do it this way so
that PR review is possible.
This commit is contained in:
Joe Previte
2021-02-25 11:27:27 -07:00
parent db3a13ba06 89b6e0164f
commit eae5d8c807
1900 changed files with 83066 additions and 64589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
lib/vscode/src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts
View File

@@ -36,17 +36,17 @@ suite('Untitled text editors', () => {
const input1 = instantiationService.createInstance(UntitledTextEditorInput, service.create());
await input1.resolve();
assert.equal(service.get(input1.resource), input1.model);
assert.strictEqual(service.get(input1.resource), input1.model);
assert.ok(service.get(input1.resource));
assert.ok(!service.get(URI.file('testing')));
const input2 = instantiationService.createInstance(UntitledTextEditorInput, service.create());
assert.equal(service.get(input2.resource), input2.model);
assert.strictEqual(service.get(input2.resource), input2.model);
// get()
assert.equal(service.get(input1.resource), input1.model);
assert.equal(service.get(input2.resource), input2.model);
assert.strictEqual(service.get(input1.resource), input1.model);
assert.strictEqual(service.get(input2.resource), input2.model);
// revert()
await input1.revert(0);
@@ -55,7 +55,7 @@ suite('Untitled text editors', () => {
// dirty
const model = await input2.resolve();
assert.equal(await service.resolve({ untitledResource: input2.resource }), model);
assert.strictEqual(await service.resolve({ untitledResource: input2.resource }), model);
assert.ok(service.get(model.resource));
assert.ok(!input2.isDirty());
@@ -66,12 +66,12 @@ suite('Untitled text editors', () => {
const resource = await resourcePromise;
assert.equal(resource.toString(), input2.resource.toString());
assert.strictEqual(resource.toString(), input2.resource.toString());
assert.ok(input2.isDirty());
assert.ok(workingCopyService.isDirty(input2.resource));
assert.equal(workingCopyService.dirtyCount, 1);
assert.strictEqual(workingCopyService.dirtyCount, 1);
await input1.revert(0);
await input2.revert(0);
@@ -81,7 +81,7 @@ suite('Untitled text editors', () => {
assert.ok(!model.isDirty());
assert.ok(!workingCopyService.isDirty(input2.resource));
assert.equal(workingCopyService.dirtyCount, 0);
assert.strictEqual(workingCopyService.dirtyCount, 0);
await input1.revert(0);
assert.ok(input1.isDisposed());
@@ -129,12 +129,12 @@ suite('Untitled text editors', () => {
const model = service.create({ associatedResource: file });
const untitled = instantiationService.createInstance(UntitledTextEditorInput, model);
assert.ok(untitled.isDirty());
assert.equal(model, onDidChangeDirtyModel);
assert.strictEqual(model, onDidChangeDirtyModel);
const resolvedModel = await untitled.resolve();
assert.ok(resolvedModel.hasAssociatedFilePath);
assert.equal(untitled.isDirty(), true);
assert.strictEqual(untitled.isDirty(), true);
untitled.dispose();
listener.dispose();
@@ -169,13 +169,13 @@ suite('Untitled text editors', () => {
assert.ok(!model1.isDirty());
const model2 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ initialValue: 'Hello World' })).resolve();
assert.equal(snapshotToString(model2.createSnapshot()!), 'Hello World');
assert.strictEqual(snapshotToString(model2.createSnapshot()!), 'Hello World');
const input = instantiationService.createInstance(UntitledTextEditorInput, service.create());
const model3 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ untitledResource: input.resource })).resolve();
assert.equal(model3.resource.toString(), input.resource.toString());
assert.strictEqual(model3.resource.toString(), input.resource.toString());
const file = URI.file(join('C:\\', '/foo/file44.txt'));
const model4 = await instantiationService.createInstance(UntitledTextEditorInput, service.create({ associatedResource: file })).resolve();
@@ -214,7 +214,7 @@ suite('Untitled text editors', () => {
// dirty
const model = await untitled.resolve();
assert.ok(model.isDirty());
assert.equal(workingCopyService.dirtyCount, 1);
assert.strictEqual(workingCopyService.dirtyCount, 1);
untitled.dispose();
model.dispose();
@@ -228,7 +228,7 @@ suite('Untitled text editors', () => {
const service = accessor.untitledTextEditorService;
const input = service.create();
assert.equal(input.getMode(), defaultLanguage);
assert.strictEqual(input.getMode(), defaultLanguage);
config.setUserConfiguration('files', { 'defaultLanguage': undefined });
@@ -244,7 +244,7 @@ suite('Untitled text editors', () => {
const service = accessor.untitledTextEditorService;
const model = service.create();
assert.equal(model.getMode(), 'typescript');
assert.strictEqual(model.getMode(), 'typescript');
config.setUserConfiguration('files', { 'defaultLanguage': undefined });
accessor.editorService.activeTextEditorMode = undefined;
@@ -261,7 +261,7 @@ suite('Untitled text editors', () => {
const service = accessor.untitledTextEditorService;
const input = service.create({ mode });
assert.equal(input.getMode(), mode);
assert.strictEqual(input.getMode(), mode);
config.setUserConfiguration('files', { 'defaultLanguage': undefined });
@@ -279,14 +279,14 @@ suite('Untitled text editors', () => {
const input = instantiationService.createInstance(UntitledTextEditorInput, service.create({ mode }));
assert.ok(input.model.hasModeSetExplicitly);
assert.equal(input.getMode(), mode);
assert.strictEqual(input.getMode(), mode);
const model = await input.resolve();
assert.equal(model.getMode(), mode);
assert.strictEqual(model.getMode(), mode);
input.setMode('plaintext');
assert.equal(input.getMode(), PLAINTEXT_MODE_ID);
assert.strictEqual(input.getMode(), PLAINTEXT_MODE_ID);
input.dispose();
model.dispose();
@@ -307,7 +307,7 @@ suite('Untitled text editors', () => {
input.setMode('plaintext');
assert.ok(input.model.hasModeSetExplicitly);
assert.equal(input.getMode(), PLAINTEXT_MODE_ID);
assert.strictEqual(input.getMode(), PLAINTEXT_MODE_ID);
input.dispose();
model.dispose();
@@ -321,13 +321,13 @@ suite('Untitled text editors', () => {
service.onDidChangeEncoding(model => {
counter++;
assert.equal(model.resource.toString(), input.resource.toString());
assert.strictEqual(model.resource.toString(), input.resource.toString());
});
// encoding
const model = await input.resolve();
model.setEncoding('utf16');
assert.equal(counter, 1);
assert.strictEqual(counter, 1);
input.dispose();
model.dispose();
});
@@ -340,13 +340,13 @@ suite('Untitled text editors', () => {
service.onDidChangeLabel(model => {
counter++;
assert.equal(model.resource.toString(), input.resource.toString());
assert.strictEqual(model.resource.toString(), input.resource.toString());
});
// label
const model = await input.resolve();
model.textEditorModel.setValue('Foo Bar');
assert.equal(counter, 1);
assert.strictEqual(counter, 1);
input.dispose();
model.dispose();
});
@@ -359,13 +359,13 @@ suite('Untitled text editors', () => {
service.onDidDispose(model => {
counter++;
assert.equal(model.resource.toString(), input.resource.toString());
assert.strictEqual(model.resource.toString(), input.resource.toString());
});
const model = await input.resolve();
assert.equal(counter, 0);
assert.strictEqual(counter, 0);
model.dispose();
assert.equal(counter, 1);
assert.strictEqual(counter, 1);
});
test('model#onDidChangeContent', async function () {
@@ -379,16 +379,16 @@ suite('Untitled text editors', () => {
model.textEditorModel.setValue('foo');
assert.equal(counter, 1, 'Dirty model should trigger event');
assert.strictEqual(counter, 1, 'Dirty model should trigger event');
model.textEditorModel.setValue('bar');
assert.equal(counter, 2, 'Content change when dirty should trigger event');
assert.strictEqual(counter, 2, 'Content change when dirty should trigger event');
model.textEditorModel.setValue('');
assert.equal(counter, 3, 'Manual revert should trigger event');
assert.strictEqual(counter, 3, 'Manual revert should trigger event');
model.textEditorModel.setValue('foo');
assert.equal(counter, 4, 'Dirty model should trigger event');
assert.strictEqual(counter, 4, 'Dirty model should trigger event');
input.dispose();
model.dispose();
@@ -421,43 +421,43 @@ suite('Untitled text editors', () => {
model.onDidChangeName(() => counter++);
model.textEditorModel.setValue('foo');
assert.equal(input.getName(), 'foo');
assert.equal(model.name, 'foo');
assert.strictEqual(input.getName(), 'foo');
assert.strictEqual(model.name, 'foo');
assert.equal(counter, 1);
assert.strictEqual(counter, 1);
model.textEditorModel.setValue('bar');
assert.equal(input.getName(), 'bar');
assert.equal(model.name, 'bar');
assert.strictEqual(input.getName(), 'bar');
assert.strictEqual(model.name, 'bar');
assert.equal(counter, 2);
assert.strictEqual(counter, 2);
model.textEditorModel.setValue('');
assert.equal(input.getName(), 'Untitled-1');
assert.equal(model.name, 'Untitled-1');
assert.strictEqual(input.getName(), 'Untitled-1');
assert.strictEqual(model.name, 'Untitled-1');
model.textEditorModel.setValue(' ');
assert.equal(input.getName(), 'Untitled-1');
assert.equal(model.name, 'Untitled-1');
assert.strictEqual(input.getName(), 'Untitled-1');
assert.strictEqual(model.name, 'Untitled-1');
model.textEditorModel.setValue('([]}'); // require actual words
assert.equal(input.getName(), 'Untitled-1');
assert.equal(model.name, 'Untitled-1');
assert.strictEqual(input.getName(), 'Untitled-1');
assert.strictEqual(model.name, 'Untitled-1');
model.textEditorModel.setValue('([]}hello '); // require actual words
assert.equal(input.getName(), '([]}hello');
assert.equal(model.name, '([]}hello');
assert.strictEqual(input.getName(), '([]}hello');
assert.strictEqual(model.name, '([]}hello');
model.textEditorModel.setValue('12345678901234567890123456789012345678901234567890'); // trimmed at 40chars max
assert.equal(input.getName(), '1234567890123456789012345678901234567890');
assert.equal(model.name, '1234567890123456789012345678901234567890');
assert.strictEqual(input.getName(), '1234567890123456789012345678901234567890');
assert.strictEqual(model.name, '1234567890123456789012345678901234567890');
model.textEditorModel.setValue('123456789012345678901234567890123456789🌞'); // do not break grapehems (#111235)
assert.equal(input.getName(), '123456789012345678901234567890123456789');
assert.equal(model.name, '123456789012345678901234567890123456789');
assert.strictEqual(input.getName(), '123456789012345678901234567890123456789');
assert.strictEqual(model.name, '123456789012345678901234567890123456789');
assert.equal(counter, 6);
assert.strictEqual(counter, 6);
model.textEditorModel.setValue('Hello\nWorld');
assert.equal(counter, 7);
assert.strictEqual(counter, 7);
function createSingleEditOp(text: string, positionLineNumber: number, positionColumn: number, selectionLineNumber: number = positionLineNumber, selectionColumn: number = positionColumn): IIdentifiedSingleEditOperation {
let range = new Range(
@@ -476,7 +476,7 @@ suite('Untitled text editors', () => {
}
model.textEditorModel.applyEdits([createSingleEditOp('hello', 2, 2)]);
assert.equal(counter, 7); // change was not on first line
assert.strictEqual(counter, 7); // change was not on first line
input.dispose();
model.dispose();
@@ -484,7 +484,7 @@ suite('Untitled text editors', () => {
const inputWithContents = instantiationService.createInstance(UntitledTextEditorInput, service.create({ initialValue: 'Foo' }));
model = await inputWithContents.resolve();
assert.equal(inputWithContents.getName(), 'Foo');
assert.strictEqual(inputWithContents.getName(), 'Foo');
inputWithContents.dispose();
model.dispose();
@@ -501,10 +501,10 @@ suite('Untitled text editors', () => {
model.textEditorModel.setValue('foo');
assert.equal(counter, 1, 'Dirty model should trigger event');
assert.strictEqual(counter, 1, 'Dirty model should trigger event');
model.textEditorModel.setValue('bar');
assert.equal(counter, 1, 'Another change does not fire event');
assert.strictEqual(counter, 1, 'Another change does not fire event');
input.dispose();
model.dispose();
@@ -521,10 +521,10 @@ suite('Untitled text editors', () => {
model.setEncoding('utf16');
assert.equal(counter, 1, 'Dirty model should trigger event');
assert.strictEqual(counter, 1, 'Dirty model should trigger event');
model.setEncoding('utf16');
assert.equal(counter, 1, 'Another change to same encoding does not fire event');
assert.strictEqual(counter, 1, 'Another change to same encoding does not fire event');
input.dispose();
model.dispose();