microsoft · DonJayamanne · Aug 16, 2019 · Aug 16, 2019 · Aug 16, 2019 · Aug 16, 2019
diff --git a/build/ci/templates/build_compile_steps.yml b/build/ci/templates/build_compile_steps.yml
@@ -56,7 +56,7 @@ steps:
           targets: "prePublishNonBundle"
       condition: and(succeeded(), eq(variables['build'], 'false'))
 
-    - bash: npx tslint ./src/**/*.ts{,x}
+    - bash: npx tslint --project tsconfig.json
       displayName: "code hygiene"
       condition: and(succeeded(), eq(variables['build'], 'false'))
 

diff --git a/src/client/activation/serviceRegistry.ts b/src/client/activation/serviceRegistry.ts
@@ -28,7 +28,7 @@ import { LanguageServerPackageService } from './languageServer/languageServerPac
 import { LanguageServerManager } from './languageServer/manager';
 import { LanguageServerOutputChannel } from './languageServer/outputChannel';
 import { PlatformData } from './languageServer/platformData';
-import { IDownloadChannelRule, IExtensionActivationManager, IExtensionActivationService, IExtensionSingleActivationService, ILanguageClientFactory, ILanguageServer, ILanguageServerActivator, ILanguageServerAnalysisOptions, ILanguageServerCompatibilityService as ILanagueServerCompatibilityService, ILanguageServerDownloader, ILanguageServerExtension, ILanguageServerFolderService, ILanguageServerManager, ILanguageServerPackageService, IPlatformData, LanguageClientFactory, LanguageServerActivator, ILanguageServerOutputChannel } from './types';
+import { IDownloadChannelRule, IExtensionActivationManager, IExtensionActivationService, IExtensionSingleActivationService, ILanguageClientFactory, ILanguageServer, ILanguageServerActivator, ILanguageServerAnalysisOptions, ILanguageServerCompatibilityService as ILanagueServerCompatibilityService, ILanguageServerDownloader, ILanguageServerExtension, ILanguageServerFolderService, ILanguageServerManager, ILanguageServerOutputChannel, ILanguageServerPackageService, IPlatformData, LanguageClientFactory, LanguageServerActivator } from './types';
 
 export function registerTypes(serviceManager: IServiceManager) {
     serviceManager.addSingleton<IExtensionActivationService>(IExtensionActivationService, LanguageServerExtensionActivationService);

diff --git a/src/client/common/application/types.ts b/src/client/common/application/types.ts
@@ -24,6 +24,7 @@ import {
     MessageItem,
     MessageOptions,
     OpenDialogOptions,
+    OutputChannel,
     Progress,
     ProgressOptions,
     QuickPick,
@@ -51,8 +52,7 @@ import {
     WorkspaceEdit,
     WorkspaceFolder,
     WorkspaceFolderPickOptions,
-    WorkspaceFoldersChangeEvent,
-    OutputChannel
+    WorkspaceFoldersChangeEvent
 } from 'vscode';
 import * as vsls from 'vsls/vscode';
 

diff --git a/src/client/common/featureDeprecationManager.ts b/src/client/common/featureDeprecationManager.ts
@@ -104,6 +104,7 @@ export class FeatureDeprecationManager implements IFeatureDeprecationManager {
 
         if (notify) {
             this.notifyDeprecation(deprecatedInfo)
+                // tslint:disable-next-line: no-console
                 .catch(ex => console.error('Python Extension: notifyDeprecation', ex));
         }
     }

diff --git a/src/client/common/net/socket/socketServer.ts b/src/client/common/net/socket/socketServer.ts
@@ -35,6 +35,7 @@ export class SocketServer extends EventEmitter implements ISocketServer {
         const port = typeof options.port === 'number' ? options.port! : 0;
         const host = typeof options.host === 'string' ? options.host! : 'localhost';
         this.socketServer!.on('error', ex => {
+            // tslint:disable-next-line: no-console
             console.error('Error in Socket Server', ex);
             const msg = `Failed to start the socket server. (Error: ${ex.message})`;
 

diff --git a/src/client/common/utils/multiStepInput.ts b/src/client/common/utils/multiStepInput.ts
@@ -33,6 +33,7 @@ export interface IQuickPickParameters<T extends QuickPickItem> {
     shouldResume?(): Promise<boolean>;
 }
 
+// tslint:disable-next-line: interface-name
 export interface InputBoxParameters {
     title: string;
     step?: number;

diff --git a/src/client/datascience/editor-integration/codeLensFactory.ts b/src/client/datascience/editor-integration/codeLensFactory.ts
@@ -99,6 +99,7 @@ export class CodeLensFactory implements ICodeLensFactory, IInteractiveWindowList
         return fullCommandList;
     }
 
+    // tslint:disable-next-line: max-func-body-length
     private createCodeLens(document: TextDocument, cellRange: { range: Range; cell_type: string }, commandName: string, isFirst: boolean): CodeLens | undefined {
         // We only support specific commands
         // Be careful here. These arguments will be serialized during liveshare sessions

diff --git a/src/client/datascience/interactive-window/interactiveWindow.ts b/src/client/datascience/interactive-window/interactiveWindow.ts
@@ -727,6 +727,7 @@ export class InteractiveWindow extends WebViewHost<IInteractiveWindowMapping> im
         }
     }
 
+    // tslint:disable-next-line: max-func-body-length
     private async submitCode(code: string, file: string, line: number, id?: string, _editor?: TextEditor, debug?: boolean): Promise<boolean> {
         let result = true;
 

diff --git a/src/client/debugger/debugAdapter/Common/debugStreamProvider.ts b/src/client/debugger/debugAdapter/Common/debugStreamProvider.ts
@@ -31,10 +31,12 @@ export class DebugStreamProvider implements IDebugStreamProvider {
                 // start as a server, and print to console in VS Code debugger for extension developer.
                 // Do not print this out when running unit tests.
                 if (!isTestExecution()) {
+                    // tslint:disable-next-line: no-console
                     console.error(`waiting for debug protocol on port ${debugPort}`);
                 }
                 this.server = createServer((socket) => {
                     if (!isTestExecution()) {
+                        // tslint:disable-next-line: no-console
                         console.error('>> accepted connection from client');
                     }
                     resolve(socket);

diff --git a/src/client/debugger/debugAdapter/DebugClients/LocalDebugClient.ts b/src/client/debugger/debugAdapter/DebugClients/LocalDebugClient.ts
@@ -90,6 +90,7 @@ export class LocalDebugClient extends DebugClient<LaunchRequestArguments> {
                     // Only once connected do we know that the application has successfully launched.
                     this.debugServer!.DebugClientConnected
                         .then(resolve)
+                        // tslint:disable-next-line: no-console
                         .catch(ex => console.error('Python Extension: debugServer.DebugClientConnected', ex));
                 }
             }

diff --git a/src/client/debugger/extension/configuration/providers/pyramidLaunch.ts b/src/client/debugger/extension/configuration/providers/pyramidLaunch.ts
@@ -35,7 +35,7 @@ export class PyramidLaunchDebugConfigurationProvider implements IDebugConfigurat
             name: DebugConfigStrings.pyramid.snippet.name(),
             type: DebuggerTypeName,
             request: 'launch',
-            module: "pyramid.scripts.pserve",
+            module: 'pyramid.scripts.pserve',
             args: [
                 iniPath || defaultIni
             ],

diff --git a/src/client/debugger/extension/configuration/types.ts b/src/client/debugger/extension/configuration/types.ts
@@ -6,7 +6,6 @@
 import { CancellationToken, DebugConfiguration, WorkspaceFolder } from 'vscode';
 import { DebugConfigurationType, IDebugConfigurationProvider } from '../types';
 
-
 export const IDebugConfigurationResolver = Symbol('IDebugConfigurationResolver');
 export interface IDebugConfigurationResolver<T extends DebugConfiguration> {
     resolveDebugConfiguration(folder: WorkspaceFolder | undefined, debugConfiguration: T, token?: CancellationToken): Promise<T | undefined>;

diff --git a/src/client/formatters/baseFormatter.ts b/src/client/formatters/baseFormatter.ts
@@ -5,6 +5,7 @@ import { IApplicationShell, IWorkspaceService } from '../common/application/type
 import { STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import '../common/extensions';
 import { isNotInstalledError } from '../common/helpers';
+import { traceError } from '../common/logger';
 import { IPythonToolExecutionService } from '../common/process/types';
 import { IDisposableRegistry, IInstaller, IOutputChannel, Product } from '../common/types';
 import { IServiceContainer } from '../ioc/types';
@@ -93,7 +94,7 @@ export abstract class BaseFormatter {
             const isInstalled = await installer.isInstalled(this.product, resource);
             if (!isInstalled) {
                 customError += `\nYou could either install the '${this.Id}' formatter, turn it off or use another formatter.`;
-                installer.promptToInstall(this.product, resource).catch(ex => console.error('Python Extension: promptToInstall', ex));
+                installer.promptToInstall(this.product, resource).catch(ex => traceError('Python Extension: promptToInstall', ex));
             }
         }
 

diff --git a/src/client/interpreter/configuration/pythonPathUpdaterService.ts b/src/client/interpreter/configuration/pythonPathUpdaterService.ts
@@ -1,6 +1,7 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { ConfigurationTarget, Uri, window } from 'vscode';
+import { traceError } from '../../common/logger';
 import { InterpreterInfomation, IPythonExecutionFactory } from '../../common/process/types';
 import { StopWatch } from '../../common/utils/stopWatch';
 import { IServiceContainer } from '../../ioc/types';
@@ -31,11 +32,11 @@ export class PythonPathUpdaterService implements IPythonPathUpdaterServiceManage
             // tslint:disable-next-line:no-unsafe-any prefer-type-cast
             const message = reason && typeof reason.message === 'string' ? reason.message as string : '';
             window.showErrorMessage(`Failed to set 'pythonPath'. Error: ${message}`);
-            console.error(reason);
+            traceError(reason);
         }
         // do not wait for this to complete
         this.sendTelemetry(stopWatch.elapsedTime, failed, trigger, pythonPath)
-            .catch(ex => console.error('Python Extension: sendTelemetry', ex));
+            .catch(ex => traceError('Python Extension: sendTelemetry', ex));
     }
     private async sendTelemetry(duration: number, failed: boolean, trigger: 'ui' | 'shebang' | 'load', pythonPath: string) {
         const telemtryProperties: PythonInterpreterTelemetry = {

diff --git a/src/client/interpreter/contracts.ts b/src/client/interpreter/contracts.ts
@@ -135,6 +135,7 @@ export interface IInterpreterWatcherBuilder {
 }
 
 export const InterpreterLocatorProgressHandler = Symbol('InterpreterLocatorProgressHandler');
+// tslint:disable-next-line: interface-name
 export interface InterpreterLocatorProgressHandler {
     register(): void;
 }

diff --git a/src/client/interpreter/helpers.ts b/src/client/interpreter/helpers.ts
@@ -2,6 +2,7 @@ import { inject, injectable } from 'inversify';
 import { compare } from 'semver';
 import { ConfigurationTarget } from 'vscode';
 import { IDocumentManager, IWorkspaceService } from '../common/application/types';
+import { traceError } from '../common/logger';
 import { IFileSystem } from '../common/platform/types';
 import { InterpreterInfomation, IPythonExecutionFactory } from '../common/process/types';
 import { IPersistentStateFactory, Resource } from '../common/types';
@@ -72,7 +73,7 @@ export class InterpreterHelper implements IInterpreterHelper {
             await store.updateValue(details);
             return details;
         } catch (ex) {
-            console.error(`Failed to get interpreter information for '${pythonPath}'`, ex);
+            traceError(`Failed to get interpreter information for '${pythonPath}'`, ex);
             return;
         }
     }

diff --git a/src/client/interpreter/interpreterService.ts b/src/client/interpreter/interpreterService.ts
@@ -4,6 +4,7 @@ import * as path from 'path';
 import { Disposable, Event, EventEmitter, Uri } from 'vscode';
 import '../../client/common/extensions';
 import { IDocumentManager, IWorkspaceService } from '../common/application/types';
+import { traceError } from '../common/logger';
 import { getArchitectureDisplayName } from '../common/platform/registry';
 import { IFileSystem } from '../common/platform/types';
 import { IPythonExecutionFactory } from '../common/process/types';
@@ -258,7 +259,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
             this.didChangeInterpreterEmitter.fire();
             const interpreterDisplay = this.serviceContainer.get<IInterpreterDisplay>(IInterpreterDisplay);
             interpreterDisplay.refresh()
-                .catch(ex => console.error('Python Extension: display.refresh', ex));
+                .catch(ex => traceError('Python Extension: display.refresh', ex));
         }
     }
     private async collectInterpreterDetails(pythonPath: string, resource: Uri | undefined) {

diff --git a/src/client/interpreter/locators/helpers.ts b/src/client/interpreter/locators/helpers.ts
@@ -1,5 +1,6 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
+import { traceError } from '../../common/logger';
 import { IS_WINDOWS } from '../../common/platform/constants';
 import { IFileSystem } from '../../common/platform/types';
 import { fsReaddirAsync } from '../../common/utils/fs';
@@ -12,7 +13,7 @@ export function lookForInterpretersInDirectory(pathToCheck: string): Promise<str
     return fsReaddirAsync(pathToCheck)
         .then(subDirs => subDirs.filter(fileName => CheckPythonInterpreterRegEx.test(path.basename(fileName))))
         .catch(err => {
-            console.error('Python Extension (lookForInterpretersInDirectory.fsReaddirAsync):', err);
+            traceError('Python Extension (lookForInterpretersInDirectory.fsReaddirAsync):', err);
             return [] as string[];
         });
 }

diff --git a/src/client/interpreter/locators/services/baseVirtualEnvService.ts b/src/client/interpreter/locators/services/baseVirtualEnvService.ts
@@ -63,7 +63,7 @@ export class BaseVirtualEnvService extends CacheableLocatorService {
                     return scriptOrBinDirs.length === 1 ? scriptOrBinDirs[0] : '';
                 })
                 .catch((err) => {
-                    console.error('Python Extension (getProspectiveDirectoriesForLookup):', err);
+                    traceError('Python Extension (getProspectiveDirectoriesForLookup):', err);
                     // Ignore exceptions.
                     return '';
                 }));

diff --git a/src/client/providers/jediProxy.ts b/src/client/providers/jediProxy.ts
@@ -21,7 +21,7 @@ import { IInterpreterService } from '../interpreter/contracts';
 import { IServiceContainer } from '../ioc/types';
 import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
-import { Logger } from './../common/logger';
+import { Logger, traceError } from './../common/logger';
 
 const pythonVSCodeTypeMappings = new Map<string, CompletionItemKind>();
 pythonVSCodeTypeMappings.set('none', CompletionItemKind.Value);
@@ -212,7 +212,7 @@ export class JediProxy implements Disposable {
             this.commands.set(executionCmd.id, executionCmd);
             this.commandQueue.push(executionCmd.id);
         } catch (ex) {
-            console.error(ex);
+            traceError(ex);
             //If 'This socket is closed.' that means process didn't start at all (at least not properly).
             if (ex.message === 'This socket is closed.') {
                 this.killProcess();
@@ -278,7 +278,7 @@ export class JediProxy implements Disposable {
                     this.pidUsageFailures.counter = 0;
                     this.pidUsageFailures.timer.reset();
                 }
-                console.error('Python Extension: (pidusage)', err);
+                traceError('Python Extension: (pidusage)', err);
             } else {
                 const limit = Math.min(Math.max(this.pythonSettings.jediMemoryLimit, 1024), 8192);
                 let restartJedi = false;
@@ -690,7 +690,7 @@ export class JediProxy implements Disposable {
             const filePaths = await Promise.all(filePathPromises);
             return filePaths.concat(...pythonPaths, ...resolvedPaths).filter(p => p.length > 0);
         } catch (ex) {
-            console.error('Python Extension: jediProxy.filePaths', ex);
+            traceError('Python Extension: jediProxy.filePaths', ex);
             return [];
         }
     }
@@ -872,7 +872,7 @@ export class JediProxyHandler<R extends ICommandResult> implements Disposable {
         executionCmd.token = cancellation.token;
 
         return this.jediProxy.sendCommand<R>(executionCmd).catch(reason => {
-            console.error(reason);
+            traceError(reason);
             return undefined;
         });
     }
@@ -885,7 +885,7 @@ export class JediProxyHandler<R extends ICommandResult> implements Disposable {
         }
 
         return this.jediProxy.sendCommand<R>(executionCmd).catch(reason => {
-            console.error(reason);
+            traceError(reason);
             return undefined;
         });
     }

diff --git a/src/client/providers/renameProvider.ts b/src/client/providers/renameProvider.ts
@@ -5,6 +5,7 @@ import {
 } from 'vscode';
 import { EXTENSION_ROOT_DIR, STANDARD_OUTPUT_CHANNEL } from '../common/constants';
 import { getWorkspaceEditsFromPatch } from '../common/editor';
+import { traceError } from '../common/logger';
 import { IConfigurationService, IInstaller, IOutputChannel, Product } from '../common/types';
 import { IServiceContainer } from '../ioc/types';
 import { RefactorProxy } from '../refactor/proxy';
@@ -61,7 +62,7 @@ export class PythonRenameProvider implements RenameProvider {
             if (reason === 'Not installed') {
                 const installer = this.serviceContainer.get<IInstaller>(IInstaller);
                 installer.promptToInstall(Product.rope, document.uri)
-                    .catch(ex => console.error('Python Extension: promptToInstall', ex));
+                    .catch(ex => traceError('Python Extension: promptToInstall', ex));
                 return Promise.reject('');
             } else {
                 window.showErrorMessage(reason);

diff --git a/src/client/providers/simpleRefactorProvider.ts b/src/client/providers/simpleRefactorProvider.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import { Commands } from '../common/constants';
 import { getTextEditsFromPatch } from '../common/editor';
+import { traceError } from '../common/logger';
 import { IConfigurationService, IInstaller, Product } from '../common/types';
 import { StopWatch } from '../common/utils/stopWatch';
 import { IServiceContainer } from '../ioc/types';
@@ -150,7 +151,7 @@ function extractName(textEditor: vscode.TextEditor, newName: string,
     }).catch(error => {
         if (error === 'Not installed') {
             installer.promptToInstall(Product.rope, textEditor.document.uri)
-                .catch(ex => console.error('Python Extension: simpleRefactorProvider.promptToInstall', ex));
+                .catch(ex => traceError('Python Extension: simpleRefactorProvider.promptToInstall', ex));
             return Promise.reject('');
         }
         let errorMessage = `${error}`;

diff --git a/src/client/providers/updateSparkLibraryProvider.ts b/src/client/providers/updateSparkLibraryProvider.ts
@@ -2,6 +2,7 @@
 import * as path from 'path';
 import * as vscode from 'vscode';
 import { Commands } from '../common/constants';
+import { traceError } from '../common/logger';
 import { sendTelemetryEvent } from '../telemetry';
 import { EventName } from '../telemetry/constants';
 
@@ -19,7 +20,7 @@ function updateSparkLibrary() {
         //Done
     }, reason => {
         vscode.window.showErrorMessage(`Failed to update ${extraLibPath}. Error: ${reason.message}`);
-        console.error(reason);
+        traceError(reason);
     });
     vscode.window.showInformationMessage('Make sure you have SPARK_HOME environment variable set to the root path of the local spark installation!');
     sendTelemetryEvent(EventName.UPDATE_PYSPARK_LIBRARY);

diff --git a/src/client/refactor/proxy.ts b/src/client/refactor/proxy.ts
@@ -4,6 +4,7 @@ import { ChildProcess } from 'child_process';
 import * as path from 'path';
 import { Disposable, Position, Range, TextDocument, TextEditorOptions, Uri, window } from 'vscode';
 import '../common/extensions';
+import { traceError } from '../common/logger';
 import { IS_WINDOWS } from '../common/platform/constants';
 import { IPythonExecutionFactory } from '../common/process/types';
 import { IPythonSettings } from '../common/types';
@@ -136,7 +137,7 @@ export class RefactorProxy extends Disposable {
             errorResponse = dataStr.split(/\r?\n/g).filter(line => line.length > 0).map(resp => JSON.parse(resp));
             this._previousStdErrData = '';
         } catch (ex) {
-            console.error(ex);
+            traceError(ex);
             // Possible we've only received part of the data, hence don't clear previousData
             return;
         }

diff --git a/src/client/terminals/codeExecution/codeExecutionManager.ts b/src/client/terminals/codeExecution/codeExecutionManager.ts
@@ -9,14 +9,14 @@ import { Disposable, Event, EventEmitter, Uri } from 'vscode';
 import { ICommandManager, IDocumentManager } from '../../common/application/types';
 import { Commands } from '../../common/constants';
 import '../../common/extensions';
+import { traceError } from '../../common/logger';
 import { IFileSystem } from '../../common/platform/types';
 import { BANNER_NAME_INTERACTIVE_SHIFTENTER, IDisposableRegistry, IPythonExtensionBanner, Resource } from '../../common/types';
 import { noop } from '../../common/utils/misc';
 import { IServiceContainer } from '../../ioc/types';
 import { captureTelemetry, sendTelemetryEvent } from '../../telemetry';
 import { EventName } from '../../telemetry/constants';
 import { ICodeExecutionHelper, ICodeExecutionManager, ICodeExecutionService } from '../../terminals/types';
-import { traceError } from '../../common/logger';
 
 @injectable()
 export class CodeExecutionManager implements ICodeExecutionManager {
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
+        // tslint:disable-next-line: max-func-body-length
         private async submitCode(code: string, file: string, line: number, id?: string, _editor?: TextEditor, debug?: boolean): Promise<boolean> {
             let result = true;
@@ Expand Down @@