Skip to content

Commit bfadadb

Browse files
Charles-GagnonCharles-Gagnon
authored
Enable noUnusedLocals (#17035)
* Enable noUnusedLocals * remove one more * More fixes
1 parent d13b65c commit bfadadb

32 files changed

+373
-473
lines changed

‎src/azure/accountService.ts

+1-11
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,14 @@ import { IAccount, IAccountKey } from '../models/contracts/azure/accountInterfac
88
import SqlToolsServiceClient from '../languageservice/serviceclient';
99
import { IAzureSession } from '../models/interfaces';
1010
import * as Constants from '../constants/constants';
11-
import VscodeWrapper from '../controllers/vscodeWrapper';
1211
import { AzureController } from './azureController';
1312
import { AccountStore } from './accountStore';
1413
import providerSettings from '../azure/providerSettings';
15-
import { Tenant, Token } from 'ads-adal-library';
14+
import { Tenant } from 'ads-adal-library';
1615

1716
export class AccountService {
1817

1918
private _account: IAccount = undefined;
20-
private _token = undefined;
2119
private _isStale: boolean;
2220
protected readonly commonTenant: Tenant = {
2321
id: 'common',
@@ -26,7 +24,6 @@ export class AccountService {
2624

2725
constructor(
2826
private _client: SqlToolsServiceClient,
29-
private _vscodeWrapper: VscodeWrapper,
3027
private _context: vscode.ExtensionContext,
3128
private _accountStore: AccountStore
3229
) {}
@@ -43,13 +40,6 @@ export class AccountService {
4340
return this._client;
4441
}
4542

46-
/**
47-
* Public for testing purposes only
48-
*/
49-
public set token(value: any) {
50-
this._token = value;
51-
}
52-
5343
public convertToAzureAccount(azureSession: IAzureSession): IAccount {
5444
let tenant = {
5545
displayName: Constants.tenantDisplayName,

‎src/azure/azureAuthRequest.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export class AzureAuthRequest implements AuthRequest {
129129
const selection = await this._vscodeWrapper.showInformationMessage(msg, LocalizedConstants.msgCopyAndOpenWebpage);
130130
if (selection === LocalizedConstants.msgCopyAndOpenWebpage) {
131131
this._vscodeWrapper.clipboardWriteText(userCode);
132-
let test = await vscode.env.openExternal(vscode.Uri.parse(verificationUrl));
132+
await vscode.env.openExternal(vscode.Uri.parse(verificationUrl));
133133
console.log(msg);
134134
console.log(userCode);
135135
console.log(verificationUrl);

‎src/azure/azureController.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { CredentialStore } from '../credentialstore/credentialstore';
1414
import { StorageService } from './StorageService';
1515
import * as utils from '../models/utils';
1616
import { IAccount } from '../models/contracts/azure/accountInterfaces';
17-
import { AADResource, AzureAuthType, AzureCodeGrant, AzureDeviceCode, ProviderSettings, Token } from 'ads-adal-library';
17+
import { AADResource, AzureAuthType, AzureCodeGrant, AzureDeviceCode, Token } from 'ads-adal-library';
1818
import { ConnectionProfile } from '../models/connectionProfile';
1919
import { AccountStore } from './accountStore';
2020
import providerSettings from '../azure/providerSettings';

‎src/controllers/connectionManager.ts

+1-23
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default class ConnectionManager {
126126
}
127127

128128
// Initiate the firewall service
129-
this._accountService = new AccountService(this.client, this.vscodeWrapper, context, this._accountStore);
129+
this._accountService = new AccountService(this.client, context, this._accountStore);
130130
this._firewallService = new FirewallService(this._accountService);
131131
this._failedUriToFirewallIpMap = new Map<string, string>();
132132

@@ -274,15 +274,6 @@ export default class ConnectionManager {
274274
// Using a lambda here to perform variable capture on the 'this' reference
275275
return (event: LanguageServiceContracts.IntelliSenseReadyParams): void => {
276276
this._statusView.languageServiceStatusChanged(event.ownerUri, LocalizedConstants.intelliSenseUpdatedStatus);
277-
let connection = this.getConnectionInfo(event.ownerUri);
278-
if (connection !== undefined) {
279-
let numberOfCharacters: number = 0;
280-
if (this.vscodeWrapper.activeTextEditor !== undefined
281-
&& this.vscodeWrapper.activeTextEditor.document !== undefined) {
282-
let document = this.vscodeWrapper.activeTextEditor.document;
283-
numberOfCharacters = document.getText().length;
284-
}
285-
}
286277
};
287278
}
288279

@@ -821,18 +812,5 @@ export default class ConnectionManager {
821812
this.azureController.removeToken(answers.account);
822813
}
823814
});
824-
825-
826-
}
827-
828-
private getIsServerLinux(osVersion: string): string {
829-
if (osVersion) {
830-
if (osVersion.indexOf('Linux') !== -1) {
831-
return 'Linux';
832-
} else {
833-
return 'Windows';
834-
}
835-
}
836-
return '';
837815
}
838816
}

‎src/controllers/mainController.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default class MainController implements vscode.Disposable {
5656
private _queryHistoryProvider: QueryHistoryProvider;
5757
private _scriptingService: ScriptingService;
5858
private _queryHistoryRegistered: boolean = false;
59-
private _sqlTasksService: SqlTasksService;
59+
public sqlTasksService: SqlTasksService;
6060
public dacFxService: DacFxService;
6161
public schemaCompareService: SchemaCompareService;
6262

@@ -150,7 +150,7 @@ export default class MainController implements vscode.Disposable {
150150

151151
this.initializeQueryHistory();
152152

153-
this._sqlTasksService = new SqlTasksService(SqlToolsServerClient.instance, this._untitledSqlDocumentService);
153+
this.sqlTasksService = new SqlTasksService(SqlToolsServerClient.instance, this._untitledSqlDocumentService);
154154
this.dacFxService = new DacFxService(SqlToolsServerClient.instance);
155155
this.schemaCompareService = new SchemaCompareService(SqlToolsServerClient.instance);
156156

‎src/models/connectionProfile.ts

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ export class ConnectionProfile extends ConnectionCredentials implements IConnect
5151
profile.authenticationType = authOptions[0].value;
5252
}
5353
let azureController = new AzureController(context);
54-
let azureAuthChoices: INameValueChoice[] = ConnectionProfile.getAzureAuthChoices();
5554
let azureAccountChoices: INameValueChoice[] = ConnectionProfile.getAccountChoices(accountStore);
5655
let accountAnswer: IAccount;
5756
azureAccountChoices.unshift({ name: LocalizedConstants.azureAddAccount, value: 'addAccount'});

‎src/models/utils.ts

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ const msInS = 1000;
2525
const configTracingLevel = 'tracingLevel';
2626
const configLogRetentionMinutes = 'logRetentionMinutes';
2727
const configLogFilesRemovalLimit = 'logFilesRemovalLimit';
28-
const extensionConfigSectionName = 'mssql';
29-
const configLogDebugInfo = 'logDebugInfo';
3028

3129
// INTERFACES /////////////////////////////////////////////////////////////////////////////////////
3230

‎src/objectExplorer/objectExplorerService.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ export class ObjectExplorerService {
436436
await this._connectionManager.vscodeWrapper.showErrorMessage(
437437
errorMessage, LocalizedConstants.refreshTokenLabel).then(async result => {
438438
if (result === LocalizedConstants.refreshTokenLabel) {
439-
let refreshedProfile = await azureController.getTokens(
439+
await azureController.getTokens(
440440
profile, this._connectionManager.accountStore, providerSettings.resources.databaseResource);
441441

442442
} else {

‎src/prompts/adapter.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// License: https://github.com/DonJayamanne/bowerVSCode/blob/master/LICENSE
33

44
import { OutputChannel } from 'vscode';
5-
import * as Constants from '../constants/constants';
65
import * as nodeUtil from 'util';
76
import PromptFactory from './factory';
87
import EscapeException from '../utils/EscapeException';

‎src/queryHistory/queryHistoryNode.ts

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as vscode from 'vscode';
77
import * as path from 'path';
88
import * as LocalizedConstants from '../constants/localizedConstants';
9-
import { queryHistory } from '../constants/constants';
109

1110
/**
1211
* Empty Node shown when no queries are available

‎src/queryHistory/queryHistoryProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export class QueryHistoryProvider implements vscode.TreeDataProvider<any> {
3838
) {
3939
const config = this._vscodeWrapper.getConfiguration(Constants.extensionConfigSectionName);
4040
this._queryHistoryLimit = config.get(Constants.configQueryHistoryLimit);
41-
this._queryHistoryUI = new QueryHistoryUI(this._prompter, this._vscodeWrapper);
41+
this._queryHistoryUI = new QueryHistoryUI(this._prompter);
4242
}
4343

4444
clearAll(): void {

‎src/views/connectionUI.ts

-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ import { AccountStore } from '../azure/accountStore';
2121
import { AzureController } from '../azure/azureController';
2222
import { IAccount } from '../models/contracts/azure/accountInterfaces';
2323
import providerSettings from '../azure/providerSettings';
24-
import * as ConnectionContracts from '../models/contracts/connection';
2524
import { IConnectionInfo } from 'vscode-mssql';
26-
import { Deferred } from '../protocol';
2725

2826
/**
2927
* The different tasks for managing connection profiles.

‎src/views/htmlcontent/src/js/components/app.component.ts

+26-30
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* ------------------------------------------------------------------------------------------ */
55

66
import { Component, OnInit, Inject, forwardRef, ViewChild, ViewChildren, QueryList, ElementRef,
7-
EventEmitter, ChangeDetectorRef, AfterViewChecked } from '@angular/core';
7+
EventEmitter, AfterViewChecked } from '@angular/core';
88
import { IObservableCollection, SlickGrid, VirtualizedCollection } from 'angular2-slickgrid';
99
import { ISlickRange, FieldType, IColumnDefinition, IGridDataRow,
1010
IGridIcon, IMessage, IRange, ISelectionData, DbCellValue } from '../../../../../models/interfaces';
@@ -153,19 +153,18 @@ export class AppComponent implements OnInit, AfterViewChecked {
153153
private scrollTimeOutTime = 200;
154154
private windowSize = 50;
155155
private maxScrollGrids = 8;
156-
private selectionModel = 'DragRowSelectionModel';
157-
private slickgridPlugins = ['AutoColumnSize'];
156+
public selectionModel = 'DragRowSelectionModel';
157+
public slickgridPlugins = ['AutoColumnSize'];
158158
private _rowHeight = 29;
159159
private _resultsPaneBoundary = 22;
160160
private _defaultNumShowingRows = 8;
161-
private Constants = Constants;
162-
private Utils = Utils;
163-
private _messagesPaneHeight: number;
161+
public Constants = Constants;
162+
public Utils = Utils;
164163

165164
// the function implementations of keyboard available events
166165
private shortcutfunc = {
167166
'event.focusResultsGrid': () => {
168-
this.slickgrids.toArray()[this.activeGrid]._grid.setActiveCell(0, 1);
167+
this.slickgrids.toArray()[this.activeGrid]['_grid'].setActiveCell(0, 1);
169168
},
170169
'event.toggleResultPane': () => {
171170
this.resultActive = !this.resultActive;
@@ -276,7 +275,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
276275
}
277276
];
278277

279-
private startString = new Date().toLocaleTimeString();
278+
public startString = new Date().toLocaleTimeString();
280279
private config;
281280

282281
// FIELDS
@@ -289,21 +288,21 @@ export class AppComponent implements OnInit, AfterViewChecked {
289288
private messages: IMessage[] = [];
290289
private scrollTimeOut: NodeJS.Timeout;
291290
private messagesAdded = false;
292-
private resizing = false;
293-
private resizeHandleTop = 0;
294-
private scrollEnabled = true;
291+
public resizing = false;
292+
public resizeHandleTop = 0;
293+
public scrollEnabled = true;
295294
private resultActive = true;
296295
private _messageActive = true;
297296
private firstRender = true;
298-
private resultsScrollTop = 0;
297+
public resultsScrollTop = 0;
299298
private activeGrid = 0;
300-
private messageShortcut;
301-
private resultShortcut;
302-
private totalElapsedTimeSpan: number;
303-
private complete = false;
299+
public messageShortcut;
300+
public resultShortcut;
301+
public totalElapsedTimeSpan: number;
302+
public complete = false;
304303
private uri: string;
305304
private hasRunQuery: boolean = false;
306-
private resultsFontSize;
305+
public resultsFontSize;
307306
@ViewChild('contextmenu') contextMenu: ContextMenu;
308307
@ViewChild('messagescontextmenu') messagesContextMenu: MessagesContextMenu;
309308
@ViewChildren('slickgrid') slickgrids: QueryList<SlickGrid>;
@@ -321,8 +320,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
321320

322321
constructor(@Inject(forwardRef(() => DataService)) public dataService: DataService,
323322
@Inject(forwardRef(() => ShortcutService)) private shortcuts: ShortcutService,
324-
@Inject(forwardRef(() => ElementRef)) private _el: ElementRef,
325-
@Inject(forwardRef(() => ChangeDetectorRef)) private cd: ChangeDetectorRef) {}
323+
@Inject(forwardRef(() => ElementRef)) private _el: ElementRef) {}
326324

327325
/**
328326
* Called by Angular when the component is initialized
@@ -469,7 +467,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
469467
* Toggle the messages pane
470468
*/
471469
private toggleMessagesPane(): void {
472-
this.messageActive = !this.messageActive
470+
this.messageActive = !this.messageActive;
473471
if (this.messageActive) {
474472
this.resizeResults();
475473
}
@@ -501,7 +499,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
501499
/**
502500
* Handles toggling messages via key event
503501
*/
504-
private handleMessagesKeydown(event: KeyboardEvent): void {
502+
public handleMessagesKeydown(event: KeyboardEvent): void {
505503
if (this.handleKeydown(event)) {
506504
this.toggleMessagesPane();
507505
}
@@ -510,7 +508,7 @@ export class AppComponent implements OnInit, AfterViewChecked {
510508
/**
511509
* Handles toggling messages via key event
512510
*/
513-
private handleResultsKeydown(event: KeyboardEvent): void {
511+
public handleResultsKeydown(event: KeyboardEvent): void {
514512
if (this.handleKeydown(event)) {
515513
this.toggleResultsPane();
516514
}
@@ -793,22 +791,20 @@ export class AppComponent implements OnInit, AfterViewChecked {
793791
* Sets up the resize for the messages/results panes bar
794792
*/
795793
setupResizeBind(): void {
796-
const self = this;
797-
let $resizeHandle = $(self._el.nativeElement.querySelector('#messageResizeHandle'));
798-
let $messagePane = $(self._el.nativeElement.querySelector('#messages'));
794+
let $resizeHandle = $(this._el.nativeElement.querySelector('#messageResizeHandle'));
795+
let $messagePane = $(this._el.nativeElement.querySelector('#messages'));
799796
$resizeHandle.bind('dragstart', (e) => {
800-
self.resizing = true;
801-
self.resizeHandleTop = e.pageY;
802-
this._messagesPaneHeight = $('#messages').get(0).clientHeight;
797+
this.resizing = true;
798+
this.resizeHandleTop = e.pageY;
803799
return true;
804800
});
805801

806802
$resizeHandle.bind('drag', (e) => {
807-
self.resizeHandleTop = e.pageY;
803+
this.resizeHandleTop = e.pageY;
808804
});
809805

810806
$resizeHandle.bind('dragend', (e) => {
811-
self.resizing = false;
807+
this.resizing = false;
812808
// redefine the min size for the messages based on the final position
813809
$messagePane.css('min-height', $(window).height() - (e.pageY + 22));
814810
this.resizeResults();

‎src/views/htmlcontent/src/js/components/contextmenu.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const template = `
3737

3838
export class ContextMenu implements OnInit {
3939
// tslint:disable-next-line:no-unused-variable
40-
private Constants = Constants;
40+
public Constants = Constants;
4141

4242
@Output() clickEvent: EventEmitter<{type: string, batchId: number, resultId: number, index: number, selection: ISlickRange[]}>
4343
= new EventEmitter<{type: string, batchId: number, resultId: number, index: number, selection: ISlickRange[]}>();
@@ -46,8 +46,8 @@ export class ContextMenu implements OnInit {
4646
private index: number;
4747
private selection: ISlickRange[];
4848
private isDisabled: boolean;
49-
private position: {x: number, y: number} = {x: 0, y: 0};
50-
private visible: boolean = false;
49+
public position: {x: number, y: number} = {x: 0, y: 0};
50+
public visible: boolean = false;
5151
private keys = {
5252
'event.saveAsCSV': '',
5353
'event.saveAsJSON': '',

‎src/views/htmlcontent/src/js/components/messagescontextmenu.component.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ const template = `
2727
})
2828

2929
export class MessagesContextMenu implements OnInit {
30-
private Utils = Utils;
31-
private Constants = Constants;
30+
public Utils = Utils;
31+
public Constants = Constants;
3232

3333
@Output() clickEvent: EventEmitter<{type: string, selectedRange: IRange }>
3434
= new EventEmitter<{type: string, selectedRange: IRange}>();
3535
private selectedRange: IRange;
3636
private isDisabled: boolean;
37-
private position: {x: number, y: number} = {x: 0, y: 0};
38-
private visible: boolean = false;
37+
public position: {x: number, y: number} = {x: 0, y: 0};
38+
public visible: boolean = false;
3939
private keys = {
4040
'event.copySelection': ''
4141
};

‎src/views/queryHistoryUI.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import * as vscode from 'vscode';
77
import * as Utils from '../models/utils';
8-
import VscodeWrapper from '../controllers/vscodeWrapper';
98
import { IPrompter, IQuestion, QuestionTypes } from '../prompts/question';
109
import { QueryHistoryNode } from '../queryHistory/queryHistoryNode';
1110
import * as LocalizedConstants from '../constants/localizedConstants';
@@ -25,8 +24,7 @@ export interface QueryHistoryQuickPickItem extends vscode.QuickPickItem {
2524
export class QueryHistoryUI {
2625

2726
constructor(
28-
private _prompter: IPrompter,
29-
private _vscodeWrapper: VscodeWrapper
27+
private _prompter: IPrompter
3028
) {}
3129

3230
public convertToQuickPickItem(node: vscode.TreeItem): QueryHistoryQuickPickItem {

0 commit comments

Comments
 (0)