Skip to content

Strict null checking for node/storage browser/ui/dataTree and browser/htmlContent #65503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjbvz merged 6 commits into from
Dec 24, 2018
Merged

Strict null checking for node/storage browser/ui/dataTree and browser/htmlContent #65503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4235f2
Enable strict null checking for String test
kerm1it Dec 20, 2018
a1fde6f
Merge branch 'master' of https://github.com/Microsoft/vscode
kerm1it Dec 20, 2018
56a14dc
Merge branch 'master' of https://github.com/Microsoft/vscode
kerm1it Dec 20, 2018
6b602b6
Enable strict null checking for node/storage test
kerm1it Dec 20, 2018
f9b74b2
Enable strict null checking for browser/htmlContent test
kerm1it Dec 20, 2018
a70e9f7
Enable strict null checking for browser/ui/dataTree test
kerm1it Dec 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/tsconfig.strictNullChecks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
"./vs/base/test/browser/browser.test.ts",
"./vs/base/test/browser/comparers.test.ts",
"./vs/base/test/browser/dom.test.ts",
"./vs/base/test/browser/htmlContent.test.ts",
"./vs/base/test/browser/highlightedLabel.test.ts",
"./vs/base/test/browser/progressBar.test.ts",
"./vs/base/test/browser/ui/contextview/contextview.test.ts",
Expand All @@ -115,6 +116,7 @@
"./vs/base/test/browser/ui/scrollbar/scrollbarState.test.ts",
"./vs/base/test/browser/ui/splitview/splitview.test.ts",
"./vs/base/test/browser/ui/tree/asyncDataTree.test.ts",
"./vs/base/test/browser/ui/tree/dataTree.test.ts",
"./vs/base/test/browser/ui/tree/indexTreeModel.test.ts",
"./vs/base/test/browser/ui/tree/objectTree.test.ts",
"./vs/base/test/browser/ui/tree/objectTreeModel.test.ts",
Expand Down Expand Up @@ -164,6 +166,7 @@
"./vs/base/test/node/processes/fixtures/fork.ts",
"./vs/base/test/node/processes/fixtures/fork_large.ts",
"./vs/base/test/node/processes/processes.test.ts",
"./vs/base/test/node/storage/storage.test.ts",
"./vs/base/test/node/stream/stream.test.ts",
"./vs/base/test/node/uri.test.perf.ts",
"./vs/base/test/node/utils.ts",
Expand Down
6 changes: 3 additions & 3 deletions src/vs/base/test/browser/htmlContent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ suite('HtmlContent', () => {
test('simple formatting', () => {
var result: HTMLElement = renderFormattedText('**bold**');
assert.strictEqual(result.children.length, 1);
assert.strictEqual(result.firstChild.textContent, 'bold');
assert.strictEqual(result.firstChild!.textContent, 'bold');
assert.strictEqual((<HTMLElement>result.firstChild).tagName, 'B');
assert.strictEqual(result.innerHTML, '<b>bold</b>');

Expand Down Expand Up @@ -62,7 +62,7 @@ suite('HtmlContent', () => {

var event: MouseEvent = <any>document.createEvent('MouseEvent');
event.initEvent('click', true, true);
result.firstChild.dispatchEvent(event);
result.firstChild!.dispatchEvent(event);
assert.strictEqual(callbackCalled, true);
});

Expand All @@ -81,7 +81,7 @@ suite('HtmlContent', () => {

var event: MouseEvent = <any>document.createEvent('MouseEvent');
event.initEvent('click', true, true);
result.firstChild.firstChild.firstChild.dispatchEvent(event);
result.firstChild!.firstChild!.firstChild!.dispatchEvent(event);
assert.strictEqual(callbackCalled, true);
});

Expand Down
86 changes: 43 additions & 43 deletions src/vs/base/test/browser/ui/tree/dataTree.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,34 +77,34 @@ suite('DataTree', function () {
tree.setInput(root);

let navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 10);
assert.equal(navigator.next().value, 11);
assert.equal(navigator.next().value, 12);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);

tree.collapse(root.children[0]);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 10);
assert.equal(navigator.next()!.value, 11);
assert.equal(navigator.next()!.value, 12);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

tree.collapse(root.children![0]);
navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

tree.setSelection([root.children[1]]);
tree.setFocus([root.children[2]]);
tree.setSelection([root.children![1]]);
tree.setFocus([root.children![2]]);

tree.setInput(empty);
tree.setInput(root);
navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 10);
assert.equal(navigator.next().value, 11);
assert.equal(navigator.next().value, 12);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 10);
assert.equal(navigator.next()!.value, 11);
assert.equal(navigator.next()!.value, 12);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

assert.deepEqual(tree.getSelection(), []);
assert.deepEqual(tree.getFocus(), []);
Expand All @@ -114,35 +114,35 @@ suite('DataTree', function () {
tree.setInput(root);

let navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 10);
assert.equal(navigator.next().value, 11);
assert.equal(navigator.next().value, 12);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);

tree.collapse(root.children[0]);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 10);
assert.equal(navigator.next()!.value, 11);
assert.equal(navigator.next()!.value, 12);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

tree.collapse(root.children![0]);
navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

tree.setSelection([root.children[1]]);
tree.setFocus([root.children[2]]);
tree.setSelection([root.children![1]]);
tree.setFocus([root.children![2]]);

const viewState = tree.getViewState();

tree.setInput(empty);
tree.setInput(root, viewState);
navigator = tree.navigate();
assert.equal(navigator.next().value, 0);
assert.equal(navigator.next().value, 1);
assert.equal(navigator.next().value, 2);
assert.equal(navigator.next(), null);
assert.equal(navigator.next()!.value, 0);
assert.equal(navigator.next()!.value, 1);
assert.equal(navigator.next()!.value, 2);
assert.equal(navigator.next()!, null);

assert.deepEqual(tree.getSelection(), [root.children[1]]);
assert.deepEqual(tree.getFocus(), [root.children[2]]);
assert.deepEqual(tree.getSelection(), [root.children![1]]);
assert.deepEqual(tree.getFocus(), [root.children![2]]);
});
});
4 changes: 2 additions & 2 deletions src/vs/base/test/node/storage/storage.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ suite('Storage Library', () => {
change.set('foo', void 0);
database.fireDidChangeItemsExternal({ items: change });
ok(changes.has('foo'));
equal(storage.get('foo', null), null);
equal(storage.get('foo', null!), null);
changes.clear();

// Nothing happens if changing to same value
Expand Down Expand Up @@ -263,7 +263,7 @@ suite('SQLite Storage Library', () => {
}

async function testDBBasics(path, logError?: (error) => void) {
let options: ISQLiteStorageDatabaseOptions;
let options!: ISQLiteStorageDatabaseOptions;
if (logError) {
options = {
logging: {
Expand Down