Global object linting (#6857)

* add more linting

* fix linting issues

src/sql/workbench/api/browser/mainThreadNotebookDocumentsAndEditors.ts

@@ -21,7 +21,7 @@ import {
 	SqlMainContext, MainThreadNotebookDocumentsAndEditorsShape, SqlExtHostContext, ExtHostNotebookDocumentsAndEditorsShape,
 	INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData
 } from 'sql/workbench/api/common/sqlExtHost.protocol';
-import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
 import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService';
 import { ISingleNotebookEditOperation, NotebookChangeKind } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { disposed } from 'vs/base/common/errors';

src/sql/workbench/browser/modelComponents/table.component.ts

@@ -21,7 +21,7 @@ import { attachTableStyler } from 'sql/platform/theme/common/styler';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom';
 import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin';
-import { CheckboxSelectColumn, ICheckboxCellActionEventArgs, ActionOnCheck } from 'sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin';
+import { CheckboxSelectColumn, ICheckboxCellActionEventArgs } from 'sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin';
 import { Emitter, Event as vsEvent } from 'vs/base/common/event';
 
 @Component({
@@ -213,8 +213,8 @@ export default class TableComponent extends ComponentBase implements IComponent,
 			this._table.setSelectedRows(this.selectedRows);
 		}
 
-		for (let col in this._checkboxColumns) {
-			this.registerCheckboxPlugin(this._checkboxColumns[col]);
+		for (const col of this._checkboxColumns) {
+			this.registerCheckboxPlugin(col);
 		}
 
 		if (this.ariaRowCount === -1) {

src/sql/workbench/browser/taskUtilities.ts

@@ -9,12 +9,12 @@ import {
 	IConnectionCompletionOptions, ConnectionType,
 	RunQueryOnConnectionMode, IConnectionResult
 } from 'sql/platform/connection/common/connectionManagement';
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
 import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService';
 import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/common/dashboardInput';
+import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput';
 import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput';
 import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService';
 

src/sql/workbench/common/customInputConverter.ts

@@ -12,7 +12,7 @@ import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResults
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
 import { IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
-import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
 import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';

src/sql/workbench/electron-browser/scriptingUtils.ts

@@ -14,7 +14,7 @@ import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMess
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { IScriptingService, ScriptOperation } from 'sql/platform/scripting/common/scriptingService';
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
 
 // map for the version of SQL Server (default is 140)
 const scriptCompatibilityOptionMap = {
@@ -215,4 +215,4 @@ function getFilePath(metadata: azdata.ObjectMetadata): string {
 	} else {
 		return path.join(os.tmpdir(), `${objectName}_${timestamp}.txt`);
 	}
-}
+}

src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts

@@ -84,7 +84,7 @@ export class RecentConnectionTreeController extends DefaultController {
 
 	protected onRightClick(tree: ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean {
 		this.clickcb(element, eventish, origin);
-		this.showContextMenu(tree, element, event);
+		this.showContextMenu(tree, element, eventish);
 		return true;
 	}
 

src/sql/workbench/parts/connection/common/connectionActions.ts

@@ -13,8 +13,8 @@ import Severity from 'vs/base/common/severity';
 import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/common/dashboardInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
+import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
 import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService';

src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { DashboardEditor } from 'sql/workbench/parts/dashboard/browser/dashboardEditor';
-import { DashboardInput } from 'sql/workbench/parts/dashboard/common/dashboardInput';
+import { DashboardInput } from 'sql/workbench/parts/dashboard/browser/dashboardInput';
 
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor';

src/sql/workbench/parts/dashboard/browser/dashboardEditor.ts

@@ -11,7 +11,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
-import { DashboardInput } from '../common/dashboardInput';
+import { DashboardInput } from './dashboardInput';
 import { DashboardModule } from './dashboard.module';
 import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
 import { IDashboardComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams';

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

@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor';
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
 import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
-import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput';
 import { EditorDescriptor, IEditorRegistry, Extensions } from 'vs/workbench/browser/editor';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';

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

@@ -14,7 +14,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
 
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import * as queryContext from 'sql/workbench/parts/query/common/queryContext';
@@ -32,7 +32,7 @@ import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/c
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
 import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/workbench/parts/query/browser/flexibleSash';
 import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor';
-import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';

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

@@ -6,7 +6,6 @@
 import { EditorInput, EditorModel, ConfirmResult, EncodingMode } from 'vs/workbench/common/editor';
 import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryModelService } from 'sql/platform/query/common/queryModel';
-import { dispose } from 'vs/base/common/lifecycle';
 import { Event, Emitter } from 'vs/base/common/event';
 import { EditSessionReadyParams } from 'azdata';
 import { URI } from 'vs/base/common/uri';
@@ -14,7 +13,7 @@ import * as nls from 'vs/nls';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import Severity from 'vs/base/common/severity';
 import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput';
-import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput';
 import { IEditorViewState } from 'vs/editor/common/editorCommon';
 
 /**

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

@@ -20,7 +20,7 @@ import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResu
 import { IEditDataComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 import { EditDataModule } from 'sql/workbench/parts/editData/browser/editData.module';
 import { EDITDATA_SELECTOR } from 'sql/workbench/parts/editData/browser/editData.component';
-import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { IStorageService } from 'vs/platform/storage/common/storage';
 

src/sql/workbench/parts/jobManagement/browser/jobHistory.component.ts

@@ -14,7 +14,7 @@ import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/ag
 import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
 import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/browser/jobActions';
 import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
-import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities';
+import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities';
 import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
 import {
 	JobHistoryController, JobHistoryDataSource,

src/sql/workbench/parts/jobManagement/browser/jobsView.component.ts

@@ -15,7 +15,7 @@ import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/browser/ag
 import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView';
 import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService';
 import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/platform/jobManagement/browser/jobActions';
-import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities';
+import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities';
 import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin';
 import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
 import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/browser/jobManagementView';

src/sql/workbench/parts/notebook/browser/cellViews/output.component.ts

@@ -10,7 +10,7 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { Event } from 'vs/base/common/event';
 import { nb } from 'azdata';
 import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
-import * as outputProcessor from 'sql/workbench/parts/notebook/common/models/outputProcessor';
+import * as outputProcessor from 'sql/workbench/parts/notebook/browser/models/outputProcessor';
 import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
 import * as DOM from 'vs/base/browser/dom';
 import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';

src/sql/workbench/parts/notebook/browser/models/mimemodel.ts

@@ -3,7 +3,7 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 import { IRenderMime } from './renderMimeInterfaces';
-import { ReadonlyJSONObject } from './jsonext';
+import { ReadonlyJSONObject } from '../../common/models/jsonext';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 /**
@@ -96,4 +96,4 @@ export namespace MimeModel {
 		 */
 		themeService?: IThemeService;
 	}
-}
+}

src/sql/workbench/parts/notebook/browser/models/outputProcessor.ts

@@ -4,9 +4,9 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-import { JSONObject, isPrimitive } from './jsonext';
+import { JSONObject, isPrimitive } from '../../common/models/jsonext';
 import { MimeModel } from './mimemodel';
-import { nbformat } from './nbformat';
+import { nbformat } from '../../common/models/nbformat';
 import { nb } from 'azdata';
 
 /**
@@ -108,4 +108,4 @@ export interface IOutputModelOptions {
 	 * Whether the output is trusted.  The default is false.
 	 */
 	trusted?: boolean;
-}
+}

src/sql/workbench/parts/notebook/browser/models/renderMimeInterfaces.ts

@@ -3,7 +3,7 @@
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
-import { ReadonlyJSONObject } from './jsonext';
+import { ReadonlyJSONObject } from '../../common/models/jsonext';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
 
 /**

src/sql/workbench/parts/notebook/browser/notebook.common.contribution.ts

@@ -8,7 +8,7 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
 import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
 import { SyncActionDescriptor, registerAction } from 'vs/platform/actions/common/actions';
 
-import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
 import { NotebookEditor } from 'sql/workbench/parts/notebook/browser/notebookEditor';
 import { NewNotebookAction } from 'sql/workbench/parts/notebook/browser/notebookActions';
 import { KeyMod } from 'vs/editor/common/standalone/standaloneBase';

src/sql/workbench/parts/notebook/browser/notebookEditor.ts

@@ -11,7 +11,7 @@ import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapServic
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 
 import { CancellationToken } from 'vs/base/common/cancellation';
-import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
 import { NotebookModule } from 'sql/workbench/parts/notebook/browser/notebook.module';
 import { NOTEBOOK_SELECTOR } from 'sql/workbench/parts/notebook/browser/notebook.component';
 import { INotebookParams } from 'sql/workbench/services/notebook/common/notebookService';

src/sql/workbench/parts/notebook/browser/outputs/factories.ts

@@ -4,7 +4,7 @@
 |----------------------------------------------------------------------------*/
 
 import * as widgets from './widgets';
-import { IRenderMime } from '../../common/models/renderMimeInterfaces';
+import { IRenderMime } from '../models/renderMimeInterfaces';
 
 /**
  * A mime renderer factory for raw html.
@@ -92,4 +92,3 @@ export const standardRendererFactories: ReadonlyArray<IRenderMime.IRendererFacto
 	textRendererFactory,
 	dataResourceRendererFactory
 ];
-

src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts

@@ -25,7 +25,7 @@ import { IAction } from 'vs/base/common/actions';
 import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry';
 import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
-import { MimeModel } from 'sql/workbench/parts/notebook/common/models/mimemodel';
+import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel';
 import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState';
 import { GridTableBase } from 'sql/workbench/parts/query/browser/gridPanel';
 import { getErrorMessage } from 'vs/base/common/errors';

src/sql/workbench/parts/notebook/browser/outputs/mimeRegistry.ts

@@ -6,7 +6,7 @@ import { Type } from '@angular/core';
 
 import * as platform from 'vs/platform/registry/common/platform';
 import { ReadonlyJSONObject } from 'sql/workbench/parts/notebook/common/models/jsonext';
-import { MimeModel } from 'sql/workbench/parts/notebook/common/models/mimemodel';
+import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel';
 import * as types from 'vs/base/common/types';
 import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
 
@@ -191,4 +191,4 @@ function sortedTypes(map: RankMap): string[] {
 		}
 		return p1.id - p2.id;
 	});
-}
+}

src/sql/workbench/parts/notebook/browser/outputs/mimeRenderer.component.ts

@@ -6,7 +6,7 @@
 import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry';
 import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { ElementRef, forwardRef, Inject, Component, OnInit, Input } from '@angular/core';
-import { MimeModel } from 'sql/workbench/parts/notebook/common/models/mimemodel';
+import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel';
 import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
 import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry';
 import { localize } from 'vs/nls';

src/sql/workbench/parts/notebook/browser/outputs/plotlyOutput.component.ts

@@ -11,7 +11,7 @@ import * as types from 'vs/base/common/types';
 import { AngularDisposable } from 'sql/base/browser/lifecycle';
 import { IMimeComponent } from 'sql/workbench/parts/notebook/browser/outputs/mimeRegistry';
 import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
-import { MimeModel } from 'sql/workbench/parts/notebook/common/models/mimemodel';
+import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel';
 import { getErrorMessage } from 'vs/base/common/errors';
 
 type ObjectType = object;

src/sql/workbench/parts/notebook/browser/outputs/registry.ts

@@ -3,8 +3,8 @@
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
-import { IRenderMime } from '../../common/models/renderMimeInterfaces';
-import { MimeModel } from '../../common/models/mimemodel';
+import { IRenderMime } from '../models/renderMimeInterfaces';
+import { MimeModel } from '../models/mimemodel';
 import { ReadonlyJSONObject } from '../../common/models/jsonext';
 import { defaultSanitizer } from './sanitizer';
 

src/sql/workbench/parts/notebook/browser/outputs/renderers.ts

@@ -4,7 +4,7 @@
 |----------------------------------------------------------------------------*/
 
 import { default as AnsiUp } from 'ansi_up';
-import { IRenderMime } from '../../common/models/renderMimeInterfaces';
+import { IRenderMime } from '../models/renderMimeInterfaces';
 import { URLExt } from '../../common/models/url';
 import { URI } from 'vs/base/common/uri';
 

src/sql/workbench/parts/notebook/browser/outputs/widgets.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as renderers from './renderers';
-import { IRenderMime } from '../../common/models/renderMimeInterfaces';
+import { IRenderMime } from '../models/renderMimeInterfaces';
 import { ReadonlyJSONObject } from '../../common/models/jsonext';
 import * as tableRenderers from 'sql/workbench/parts/notebook/browser/outputs/tableRenderers';
 

src/sql/workbench/parts/notebook/common/models/notebookUtils.ts

@@ -18,11 +18,6 @@ export function isStream(output: nb.ICellOutput): output is nb.IStreamResult {
 	return output.output_type === 'stream';
 }
 
-export function getUserHome(): string {
-	return process.env.HOME || process.env.USERPROFILE;
-}
-
-
 export function getProvidersForFileName(fileName: string, notebookService: INotebookService): string[] {
 	let fileExt = path.extname(fileName);
 	let providers: string[];

src/sql/workbench/parts/notebook/electron-browser/outputs/markdownOutput.component.ts

@@ -16,7 +16,7 @@ import { INotebookService } from 'sql/workbench/services/notebook/common/noteboo
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { NotebookMarkdownRenderer } from 'sql/workbench/parts/notebook/electron-browser/outputs/notebookMarkdown';
-import { MimeModel } from 'sql/workbench/parts/notebook/common/models/mimemodel';
+import { MimeModel } from 'sql/workbench/parts/notebook/browser/models/mimemodel';
 import { ICellModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
 import { useInProcMarkdown, convertVscodeResourceToFileInSubDirectories } from 'sql/workbench/parts/notebook/common/models/notebookUtils';
 import { URI } from 'vs/base/common/uri';

src/sql/workbench/parts/query/browser/queryResultsView.ts

@@ -230,7 +230,7 @@ export class QueryResultsView extends Disposable {
 			this.hideChart();
 			this.hidePlan();
 			this.hideDynamicViewModelTabs();
-			this.input.state.visibleTabs = new Set();
+			this.input.state.visibleTabs.clear();
 			this.input.state.activeTab = this.resultsTab.identifier;
 		}));
 		this.runnerDisposables.add(runner.onQueryEnd(() => {

src/sql/workbench/parts/query/common/queryResultsInput.ts

@@ -5,7 +5,6 @@
 
 import { localize } from 'vs/nls';
 import { EditorInput } from 'vs/workbench/common/editor';
-import { Emitter } from 'vs/base/common/event';
 
 import { TopOperationsState } from 'sql/workbench/parts/queryPlan/common/topOperationsState';
 import { ChartState } from 'sql/workbench/parts/charts/common/interfaces';
@@ -15,15 +14,15 @@ import { GridPanelState } from 'sql/workbench/parts/query/common/gridPanelState'
 import { QueryModelViewState } from 'sql/workbench/parts/query/common/modelViewTab/modelViewState';
 
 export class ResultsViewState {
-	public gridPanelState: GridPanelState = new GridPanelState();
-	public messagePanelState: MessagePanelState = new MessagePanelState();
-	public chartState: ChartState = new ChartState();
-	public queryPlanState: QueryPlanState = new QueryPlanState();
-	public topOperationsState = new TopOperationsState();
-	public dynamicModelViewTabsState: Map<string, QueryModelViewState> = new Map<string, QueryModelViewState>();
+	public readonly gridPanelState: GridPanelState = new GridPanelState();
+	public readonly messagePanelState: MessagePanelState = new MessagePanelState();
+	public readonly chartState: ChartState = new ChartState();
+	public readonly queryPlanState: QueryPlanState = new QueryPlanState();
+	public readonly topOperationsState = new TopOperationsState();
+	public readonly dynamicModelViewTabsState: Map<string, QueryModelViewState> = new Map<string, QueryModelViewState>();
 
 	public activeTab: string;
-	public visibleTabs: Set<string> = new Set<string>();
+	public readonly visibleTabs: Set<string> = new Set<string>();
 
 	dispose() {
 		this.gridPanelState.dispose();
@@ -43,19 +42,6 @@ export class ResultsViewState {
  */
 export class QueryResultsInput extends EditorInput {
 
-	// Tracks if the editor that holds this input should be visible (i.e. true if a query has been run)
-	private _visible: boolean;
-
-	// Tracks if the editor has holds this input has has bootstrapped angular yet
-	private _hasBootstrapped: boolean;
-
-	// Holds the HTML content for the editor when the editor discards this input and loads another
-	private _editorContainer: HTMLElement;
-	public css: HTMLStyleElement;
-
-	public readonly onRestoreViewStateEmitter = new Emitter<void>();
-	public readonly onSaveViewStateEmitter = new Emitter<void>();
-
 	private _state = new ResultsViewState();
 
 	public get state(): ResultsViewState {
@@ -64,8 +50,6 @@ export class QueryResultsInput extends EditorInput {
 
 	constructor(private _uri: string) {
 		super();
-		this._visible = false;
-		this._hasBootstrapped = false;
 	}
 
 	close() {
@@ -98,56 +82,17 @@ export class QueryResultsInput extends EditorInput {
 		return false;
 	}
 
-	public setBootstrappedTrue(): void {
-		this._hasBootstrapped = true;
-	}
-
 	public dispose(): void {
-		this._disposeContainer();
 		super.dispose();
 	}
 
-	private _disposeContainer() {
-		if (!this._editorContainer) {
-			return;
-		}
-
-		let parentContainer = this._editorContainer.parentNode;
-		if (parentContainer) {
-			parentContainer.removeChild(this._editorContainer);
-			this._editorContainer = null;
-		}
-	}
-
 	//// Properties
 
 	static get ID() {
 		return 'workbench.query.queryResultsInput';
 	}
 
-	set container(container: HTMLElement) {
-		this._disposeContainer();
-		this._editorContainer = container;
-	}
-
-	get container(): HTMLElement {
-		return this._editorContainer;
-	}
-
-	get hasBootstrapped(): boolean {
-		return this._hasBootstrapped;
-	}
-
-	get visible(): boolean {
-		return this._visible;
-	}
-
-	set visible(visible: boolean) {
-		this._visible = visible;
-	}
-
 	get uri(): string {
 		return this._uri;
 	}
-
 }

src/sql/workbench/services/notebook/common/notebookService.ts

@@ -11,7 +11,7 @@ import { URI } from 'vs/base/common/uri';
 import { RenderMimeRegistry } from 'sql/workbench/parts/notebook/browser/outputs/registry';
 import { ModelFactory } from 'sql/workbench/parts/notebook/common/models/modelFactory';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput';
+import { NotebookInput } from 'sql/workbench/parts/notebook/browser/models/notebookInput';
 import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { ICellModel, INotebookModel } from 'sql/workbench/parts/notebook/common/models/modelInterfaces';
 import { NotebookChangeType } from 'sql/workbench/parts/notebook/common/models/contracts';

src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts

@@ -556,10 +556,10 @@ export class SQLFuture extends Disposable implements FutureInternal {
 			}
 			htmlString += '</tr>';
 		}
-		for (let row in d.resultSubset.rows) {
+		for (const row of d.resultSubset.rows) {
 			htmlString += '<tr>';
-			for (let column in columns) {
-				htmlString += '<td>' + escape(d.resultSubset.rows[row][column].displayValue) + '</td>';
+			for (let i = 0; i <= columns.length; i++) {
+				htmlString += '<td>' + escape(row[i].displayValue) + '</td>';
 			}
 			htmlString += '</tr>';
 		}

src/sql/workbench/services/queryEditor/browser/queryEditorService.ts

@@ -5,7 +5,7 @@
 
 import { QueryResultsInput } from 'sql/workbench/parts/query/common/queryResultsInput';
 import { QueryInput } from 'sql/workbench/parts/query/common/queryInput';
-import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput';
+import { EditDataInput } from 'sql/workbench/parts/editData/browser/editDataInput';
 import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService';
 import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput';
@@ -23,7 +23,7 @@ import paths = require('vs/base/common/extpath');
 import { isLinux } from 'vs/base/common/platform';
 import { Schemas } from 'vs/base/common/network';
 import { INotificationService } from 'vs/platform/notification/common/notification';
-import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput';
+import { EditDataResultsInput } from 'sql/workbench/parts/editData/browser/editDataResultsInput';
 import { IEditorInput, IEditor } from 'vs/workbench/common/editor';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { ILanguageSelection } from 'vs/editor/common/services/modeService';