remove some vscode differences (#12146)

src/vs/base/browser/ui/selectBox/selectBoxCustom.ts

@@ -704,8 +704,8 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 		let elementWidth = 0;
 
 		if (container) {
-			let longest = -1;
-			let longestLength = -1;
+			let longest = 0;
+			let longestLength = 0;
 
 			this.options.forEach((option, index) => {
 				const len = option.text.length + (!!option.decoratorRight ? option.decoratorRight.length : 0);
@@ -715,9 +715,8 @@ export class SelectBoxList extends Disposable implements ISelectBoxDelegate, ILi
 				}
 			});
 
-			if (longest >= 0) {
-				container.innerHTML = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
-			}
+
+			container.innerHTML = this.options[longest].text + (!!this.options[longest].decoratorRight ? (this.options[longest].decoratorRight + ' ') : '');
 
 			elementWidth = dom.getTotalWidth(container);
 		}

src/vs/base/browser/ui/tree/objectTreeModel.ts

@@ -189,7 +189,7 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
 		let childrenNodes = [...node.children] as ITreeNode<T, TFilterData>[];
 
 		if (recursive || first) {
-			childrenNodes = mergeSort(childrenNodes, this.sorter!.compare.bind(this.sorter)) as ITreeNode<T, TFilterData>[];
+			childrenNodes = mergeSort(childrenNodes, this.sorter!.compare.bind(this.sorter)) as ITreeNode<T, TFilterData>[]; // {{SQL CARBON EDIT}} strict-null-checks
 		}
 
 		return Iterable.map<ITreeNode<T | null, TFilterData>, ITreeElement<T>>(childrenNodes, node => ({

src/vs/base/common/uri.ts

@@ -383,7 +383,7 @@ export class URI implements UriComponents {
 	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null;
 	static revive(data: UriComponents | URI | undefined | null): URI | undefined | null {
 		if (!data) {
-			// {{SQL CARBON EDIT}} @todo chlafren change back to data when we enable strict null checks
+			// {{SQL CARBON EDIT}} strict-null-check
 			return undefined;
 		} else if (data instanceof URI) {
 			return data;

src/vs/base/parts/ipc/electron-main/ipc.electron-main.ts

@@ -18,7 +18,7 @@ interface IIPCEvent {
 function createScopedOnMessageEvent(senderId: number, eventName: string): Event<VSBuffer | null> {
 	const onMessage = Event.fromNodeEventEmitter<IIPCEvent>(ipcMain, eventName, (event, message) => ({ event, message }));
 	const onMessageFromSender = Event.filter(onMessage, ({ event }) => event.sender.id === senderId);
-	// {{SQL CARBON EDIT}} cast message as null since typescript isn't saying its always null
+	// {{SQL CARBON EDIT}} strict-null-checks
 	return Event.map(onMessageFromSender, ({ message }) => message ? VSBuffer.wrap(message) : message as null);
 }