Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164 (#6892)

* Merge from vscode 0f73473c08055054f317c1c94502f7f39fdbb164

* fix tslinting

src/sql/base/browser/ui/table/table.ts

@@ -41,7 +41,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
 	private _container: HTMLElement;
 	private _tableContainer: HTMLElement;
 
-	private _classChangeTimeout: NodeJS.Timer;
+	private _classChangeTimeout: any;
 
 	private _onContextMenu = new Emitter<ITableMouseEvent>();
 	public readonly onContextMenu: Event<ITableMouseEvent> = this._onContextMenu.event;

src/sql/platform/tasks/common/tasksService.ts

@@ -162,7 +162,7 @@ export class TaskService implements ITaskService {
 				this.dialogService.show(Severity.Warning, message, options).then(choice => {
 					switch (choice) {
 						case 0:
-							let timeout: NodeJS.Timer;
+							let timeout: any;
 							let isTimeout = false;
 							this.cancelAllTasks().then(() => {
 								clearTimeout(timeout);

src/sql/workbench/parts/editData/browser/editData.component.ts

@@ -45,7 +45,7 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
 	private refreshGridTimeoutInMs = 200;
 
 	// The timeout handle for the refresh grid task
-	private refreshGridTimeoutHandle: NodeJS.Timer;
+	private refreshGridTimeoutHandle: any;
 
 	// Optimized for the edit top 200 rows scenario, only need to retrieve the data once
 	// to make the scroll experience smoother

src/sql/workbench/parts/objectExplorer/browser/treeSelectionHandler.ts

@@ -16,7 +16,7 @@ export class TreeSelectionHandler {
 	// progressRunner: IProgressRunner;
 
 	private _lastClicked: any[];
-	private _clickTimer: NodeJS.Timer = undefined;
+	private _clickTimer: any = undefined;
 
 	// constructor(@IProgressService private _progressService: IProgressService) {
 

src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts

@@ -83,7 +83,7 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas
 
 	private _resizeSash: Sash;
 
-	private searchTimeoutHandle: NodeJS.Timer;
+	private searchTimeoutHandle: any;
 
 	constructor(
 		tableController: ITableController,