Skip to content

Commit 8694df6

Browse files
author
Kartik Raj
committed
corrected
1 parent 6df5f89 commit 8694df6

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

‎src/client/unittests/common/services/unitTestDiagnosticService.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { TestStatus } from '../types';
1212
@injectable()
1313
export class UnitTestDiagnosticService implements IUnitTestDiagnosticService {
1414
private MessageTypes = new Map<TestStatus, DiagnosticMessageType>();
15-
private MessageSeverities = new Map<PythonUnitTestMessageSeverity, DiagnosticSeverity>();
16-
private MessagePrefixes = new Map<DiagnosticMessageType, string>();
15+
private MessageSeverities = new Map<PythonUnitTestMessageSeverity, DiagnosticSeverity | null>();
16+
private MessagePrefixes = new Map<DiagnosticMessageType | undefined, string>();
1717

1818
constructor() {
1919
this.MessageTypes.set(TestStatus.Error, DiagnosticMessageType.Error);
@@ -29,10 +29,11 @@ export class UnitTestDiagnosticService implements IUnitTestDiagnosticService {
2929
this.MessagePrefixes.set(DiagnosticMessageType.Skipped, localize.UnitTests.testSkippedDiagnosticMessage());
3030
this.MessagePrefixes.set(DiagnosticMessageType.Pass, '');
3131
}
32-
public getMessagePrefix(status: TestStatus): string {
33-
return this.MessagePrefixes.get(this.MessageTypes.get(status));
32+
public getMessagePrefix(status: TestStatus): string | undefined{
33+
const hello = this.MessageTypes.get(status);
34+
return this.MessagePrefixes.get(hello);
3435
}
35-
public getSeverity(unitTestSeverity: PythonUnitTestMessageSeverity): DiagnosticSeverity {
36+
public getSeverity(unitTestSeverity: PythonUnitTestMessageSeverity): DiagnosticSeverity | null | undefined {
3637
return this.MessageSeverities.get(unitTestSeverity);
3738
}
3839
}

‎src/client/unittests/configuration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export class UnitTestConfigurationService implements IUnitTestConfigurationServi
7777
// tslint:disable-next-line:prefer-type-cast
7878
return selectedTestRunner ? selectedTestRunner.product as UnitTestProduct : undefined;
7979
}
80-
public enableTest(wkspace: Uri, product: UnitTestProduct) {
80+
public async enableTest(wkspace: Uri, product: UnitTestProduct): Promise<void> {
8181
const factory = this.serviceContainer.get<ITestConfigurationManagerFactory>(ITestConfigurationManagerFactory);
8282
const configMgr = factory.create(wkspace, product);
8383
const pythonConfig = this.workspaceService.getConfiguration('python', wkspace);

‎src/client/unittests/types.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ export const IUnitTestConfigurationService = Symbol('IUnitTestConfigurationServi
1212
export interface IUnitTestConfigurationService {
1313
displayTestFrameworkError(wkspace: Uri): Promise<void>;
1414
selectTestRunner(placeHolderMessage: string): Promise<UnitTestProduct | undefined>;
15-
enableTest(wkspace: Uri, product: UnitTestProduct);
16-
promptToEnableAndConfigureTestFramework(wkspace: Uri);
15+
enableTest(wkspace: Uri, product: UnitTestProduct): Promise<void>;
16+
promptToEnableAndConfigureTestFramework(wkspace: Uri): Promise<void>;
1717
}
1818

1919
export const ITestResultDisplay = Symbol('ITestResultDisplay');
@@ -112,8 +112,8 @@ export interface IUnitTestHelper {
112112

113113
export const IUnitTestDiagnosticService = Symbol('IUnitTestDiagnosticService');
114114
export interface IUnitTestDiagnosticService {
115-
getMessagePrefix(status: TestStatus): string;
116-
getSeverity(unitTestSeverity: PythonUnitTestMessageSeverity): DiagnosticSeverity;
115+
getMessagePrefix(status: TestStatus): string | undefined;
116+
getSeverity(unitTestSeverity: PythonUnitTestMessageSeverity): DiagnosticSeverity | null | undefined;
117117
}
118118

119119
export interface IPythonUnitTestMessage {

‎src/client/workspaceSymbols/parser.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { fsExistsAsync } from '../common/utils/fs';
44
import { Tag } from './contracts';
55

66
// tslint:disable:no-require-imports no-var-requires no-suspicious-comment
7+
// tslint:disable:no-any
78
// TODO: Turn these into imports.
89
const LineByLineReader = require('line-by-line');
910
const NamedRegexp = require('named-js-regexp');
@@ -20,7 +21,7 @@ export interface IRegexGroup {
2021
line: number;
2122
}
2223

23-
export function matchNamedRegEx(data, regex): IRegexGroup | null {
24+
export function matchNamedRegEx(data: String, regex: String): IRegexGroup | null {
2425
const compiledRegexp = NamedRegexp(regex, 'g');
2526
const rawMatch = compiledRegexp.exec(data);
2627
if (rawMatch !== null) {
@@ -96,10 +97,10 @@ CTagKinMapping.set('_singleton methods', vscode.SymbolKind.Method);
9697

9798
const newValuesAndKeys = {};
9899
CTagKinMapping.forEach((value, key) => {
99-
newValuesAndKeys[key.substring(1)] = value;
100+
(newValuesAndKeys as any)[key.substring(1)] = value;
100101
});
101102
Object.keys(newValuesAndKeys).forEach(key => {
102-
CTagKinMapping.set(key, newValuesAndKeys[key]);
103+
CTagKinMapping.set(key, (newValuesAndKeys as any)[key]);
103104
});
104105

105106
export function parseTags(
@@ -119,11 +120,11 @@ export function parseTags(
119120
let lineNumber = 0;
120121
const tags: Tag[] = [];
121122

122-
lr.on('error', (err) => {
123+
lr.on('error', (err: Error) => {
123124
reject(err);
124125
});
125126

126-
lr.on('line', (line) => {
127+
lr.on('line', (line: string) => {
127128
lineNumber = lineNumber + 1;
128129
if (token.isCancellationRequested) {
129130
lr.close();

‎src/test/activation/activationService.unit.test.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
LanguageServerActivator
1919
} from '../../client/activation/types';
2020
import { LSNotSupportedDiagnosticServiceId } from '../../client/application/diagnostics/checks/lsNotSupported';
21-
import { IDiagnosticsService } from '../../client/application/diagnostics/types';
21+
import { IDiagnostic, IDiagnosticsService } from '../../client/application/diagnostics/types';
2222
import { IApplicationShell, ICommandManager, IWorkspaceService } from '../../client/common/application/types';
2323
import { IPlatformService } from '../../client/common/platform/types';
2424
import { IConfigurationService, IDisposable, IDisposableRegistry, IOutputChannel, IPythonSettings, Resource } from '../../client/common/types';
@@ -101,7 +101,7 @@ suite('Activation - ActivationService', () => {
101101
if (lsSupported && !jediIsEnabled) {
102102
activatorName = LanguageServerActivator.DotNet;
103103
}
104-
let diagnostics;
104+
let diagnostics : IDiagnostic[];
105105
if (!lsSupported && !jediIsEnabled) {
106106
diagnostics = [TypeMoq.It.isAny()];
107107
} else {
@@ -155,7 +155,6 @@ suite('Activation - ActivationService', () => {
155155

156156
activator
157157
.setup(a => a.dispose())
158-
.returns(() => Promise.resolve())
159158
.verifiable(TypeMoq.Times.once());
160159

161160
activationService.dispose();
@@ -311,7 +310,7 @@ suite('Activation - ActivationService', () => {
311310
const activatorDotNet = TypeMoq.Mock.ofType<ILanguageServerActivator>();
312311
const activatorJedi = TypeMoq.Mock.ofType<ILanguageServerActivator>();
313312
const activationService = new LanguageServerExtensionActivationService(serviceContainer.object);
314-
const diagnostics = [];
313+
const diagnostics: IDiagnostic[] = [];
315314
lsNotSupportedDiagnosticService
316315
.setup(l => l.diagnose(undefined))
317316
.returns(() => Promise.resolve(diagnostics));
@@ -372,7 +371,7 @@ suite('Activation - ActivationService', () => {
372371
.verifiable(TypeMoq.Times.atLeastOnce());
373372
workspaceService
374373
.setup(w => w.getWorkspaceFolderIdentifier(resource, ''))
375-
.returns(() => resource.fsPath)
374+
.returns(() => resource!.fsPath)
376375
.verifiable(TypeMoq.Times.atLeastOnce());
377376

378377
await activationService.activate(resource);

‎src/test/application/diagnostics/checks/macPythonInterpreter.unit.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ suite('Application Diagnostics - Checks Python Interpreter', () => {
309309
test('Event Handler is registered and invoked', async () => {
310310
let invoked = false;
311311
let callbackHandler!: (e: ConfigurationChangeEvent) => Promise<void>;
312-
const workspaceService = { onDidChangeConfiguration: cb => callbackHandler = cb } as any;
312+
const workspaceService = { onDidChangeConfiguration: (cb : (e: ConfigurationChangeEvent) => Promise<void>) => callbackHandler = cb } as any;
313313
const serviceContainerObject = createContainer();
314314
serviceContainer.setup(s => s.get(typemoq.It.isValue(IWorkspaceService)))
315315
.returns(() => workspaceService);
@@ -348,16 +348,16 @@ suite('Application Diagnostics - Checks Python Interpreter', () => {
348348
serviceContainer.setup(s => s.get(typemoq.It.isValue(IWorkspaceService)))
349349
.returns(() => workspaceService.object);
350350
const diagnosticSvc = new class extends InvalidMacPythonInterpreterService {
351-
constructor(arg1, arg2, arg3, arg4) {
351+
constructor(arg1: IServiceContainer, arg2: IInterpreterService, arg3: IPlatformService, arg4: IInterpreterHelper) {
352352
super(arg1, arg2, arg3, arg4);
353353
this.changeThrottleTimeout = 1;
354354
}
355-
public onDidChangeConfigurationEx = e => super.onDidChangeConfiguration(e);
355+
public onDidChangeConfigurationEx = (e: ConfigurationChangeEvent) => super.onDidChangeConfiguration(e);
356356
public diagnose(): Promise<any> {
357357
diagnoseInvocationCount += 1;
358358
return Promise.resolve();
359359
}
360-
}(serviceContainerObject, undefined, undefined, undefined);
360+
}(serviceContainerObject, typemoq.Mock.ofType<IInterpreterService>().object, typemoq.Mock.ofType<IPlatformService>().object, typemoq.Mock.ofType<IInterpreterHelper>().object);
361361

362362
event
363363
.setup(e => e.affectsConfiguration(typemoq.It.isValue('python.pythonPath'), typemoq.It.isAny()))
@@ -389,16 +389,16 @@ suite('Application Diagnostics - Checks Python Interpreter', () => {
389389
serviceContainer.setup(s => s.get(typemoq.It.isValue(IWorkspaceService)))
390390
.returns(() => workspaceService.object);
391391
const diagnosticSvc = new class extends InvalidMacPythonInterpreterService {
392-
constructor(arg1, arg2, arg3, arg4) {
392+
constructor(arg1: IServiceContainer, arg2: IInterpreterService, arg3: IPlatformService, arg4: IInterpreterHelper) {
393393
super(arg1, arg2, arg3, arg4);
394394
this.changeThrottleTimeout = 100;
395395
}
396-
public onDidChangeConfigurationEx = e => super.onDidChangeConfiguration(e);
396+
public onDidChangeConfigurationEx = (e: ConfigurationChangeEvent) => super.onDidChangeConfiguration(e);
397397
public diagnose(): Promise<any> {
398398
diagnoseInvocationCount += 1;
399399
return Promise.resolve();
400400
}
401-
}(serviceContainerObject, undefined, undefined, undefined);
401+
}(serviceContainerObject, typemoq.Mock.ofType<IInterpreterService>().object, typemoq.Mock.ofType<IPlatformService>().object, typemoq.Mock.ofType<IInterpreterHelper>().object);
402402

403403
event
404404
.setup(e => e.affectsConfiguration(typemoq.It.isValue('python.pythonPath'), typemoq.It.isAny()))

0 commit comments

Comments
 (0)