Skip to content

Commit d014a00

Browse files
author
Kartik Raj
authored
Fix all typescript errors when compiled in strict mode #1 (#4410)
* few errors * news entry * code reviews
1 parent d30269b commit d014a00

File tree

14 files changed

+19
-17
lines changed

14 files changed

+19
-17
lines changed

news/3 Code Health/611.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix all typescript errors when compiled in strict mode

src/client/activation/activationService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ export class LanguageServerExtensionActivationService implements IExtensionActiv
106106
const activatedWkspcFoldersRemoved = activatedWkspcKeys.filter(item => workspaceKeys.indexOf(item) < 0);
107107
if (activatedWkspcFoldersRemoved.length > 0) {
108108
for (const folder of activatedWkspcFoldersRemoved) {
109-
this.lsActivatedWorkspaces.get(folder).dispose();
110-
this.lsActivatedWorkspaces.delete(folder);
109+
this.lsActivatedWorkspaces.get(folder)!.dispose();
110+
this.lsActivatedWorkspaces!.delete(folder);
111111
}
112112
}
113113
}

src/client/activation/languageServer/languageServerExtension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class LanguageServerExtension implements ILanguageServerExtension {
2323
this.disposable.dispose();
2424
}
2525
}
26-
public register(): Promise<void> {
26+
public async register(): Promise<void> {
2727
if (this.disposable) {
2828
return;
2929
}

src/client/common/application/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import {
4747
} from 'vscode';
4848
import * as vsls from 'vsls/vscode';
4949

50-
import { IAsyncDisposable } from '../types';
50+
import { IAsyncDisposable, Resource } from '../types';
5151

5252
// tslint:disable:no-any unified-signatures
5353

@@ -581,7 +581,7 @@ export interface IWorkspaceService {
581581
* @param uri An uri.
582582
* @return A workspace folder or `undefined`
583583
*/
584-
getWorkspaceFolder(uri: Uri): WorkspaceFolder | undefined;
584+
getWorkspaceFolder(uri: Resource): WorkspaceFolder | undefined;
585585

586586
/**
587587
* Generate a key that's unique to the workspace folder (could be fsPath).

src/client/common/application/workspace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ export class WorkspaceService implements IWorkspaceService {
2626
public getConfiguration(section?: string, resource?: Uri): WorkspaceConfiguration {
2727
return workspace.getConfiguration(section, resource);
2828
}
29-
public getWorkspaceFolder(uri: Uri): WorkspaceFolder | undefined {
30-
return workspace.getWorkspaceFolder(uri);
29+
public getWorkspaceFolder(uri: Resource): WorkspaceFolder | undefined {
30+
return uri ? workspace.getWorkspaceFolder(uri) : undefined;
3131
}
3232
public asRelativePath(pathOrUri: string | Uri, includeWorkspaceFolder?: boolean): string {
3333
return workspace.asRelativePath(pathOrUri, includeWorkspaceFolder);

src/client/common/variables/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function parseEnvFile(
6868
baseVars?: EnvironmentVariables
6969
): EnvironmentVariables {
7070
const globalVars = baseVars ? baseVars : {};
71-
const vars = {};
71+
const vars : EnvironmentVariables = {};
7272
lines.toString().split('\n').forEach((line, idx) => {
7373
const [name, value] = parseEnvLine(line);
7474
if (name === '') {

src/client/datascience/cellMatcher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class CellMatcher {
3333
}
3434

3535
public exec(code: string) : string | undefined {
36-
let result: RegExpExecArray;
36+
let result: RegExpExecArray | null = null;
3737
if (this.codeMatchRegEx.test(code)) {
3838
this.codeExecRegEx.lastIndex = -1;
3939
result = this.codeExecRegEx.exec(code);

src/client/datascience/historyMessageListener.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ export class HistoryMessageListener implements IWebPanelMessageListener {
5050
}
5151

5252
private getHistoryMessages() : string [] {
53-
return Object.keys(HistoryMessages).map(k => HistoryMessages[k].toString());
53+
return Object.keys(HistoryMessages).map(k => (HistoryMessages as any)[k].toString());
5454
}
5555
}

src/client/datascience/liveshare/postOffice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ export class PostOffice implements IAsyncDisposable {
223223
const jsonArray = JSON.parse(a.args) as JSONArray;
224224
if (jsonArray !== null && jsonArray.length >= 2) {
225225
const firstArg = jsonArray[0]; // More stupid hygiene problems.
226-
const command = firstArg !== null ? firstArg.toString() : '';
226+
const command = firstArg !== null ? firstArg!.toString() : '';
227227
this.postCommand(command, ...jsonArray.slice(1)).ignoreErrors();
228228
}
229229
}

src/client/debugger/extension/configuration/resolvers/base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { IDebugConfigurationResolver } from '../types';
2020

2121
@injectable()
2222
export abstract class BaseConfigurationResolver<T extends DebugConfiguration> implements IDebugConfigurationResolver<T> {
23-
protected pythonPathSource: PythonPathSource;
23+
protected pythonPathSource: PythonPathSource = PythonPathSource.launchJson;
2424
constructor(protected readonly workspaceService: IWorkspaceService,
2525
protected readonly documentManager: IDocumentManager,
2626
protected readonly configurationService: IConfigurationService) { }

src/client/providers/jediProxy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class JediProxy implements Disposable {
173173
}
174174

175175
private static getProperty<T>(o: object, name: string): T {
176-
return <T>o[name];
176+
return <T>(o as any)[name];
177177
}
178178

179179
public dispose() {

src/client/providers/symbolProvider.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ function flattenSymbolTree(tree: DocumentSymbol, uri: Uri, containerName: string
3030
tree.name,
3131
// Type coercion is a bit fuzzy when it comes to enums, so we
3232
// play it safe by explicitly converting.
33-
SymbolKind[SymbolKind[kind]],
33+
// tslint:disable-next-line:no-any
34+
(SymbolKind as any)[(SymbolKind as any)[kind]],
3435
containerName,
3536
new Location(uri, range)
3637
);

src/client/terminals/codeExecution/djangoContext.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { IFileSystem } from '../../common/platform/types';
1111
@injectable()
1212
export class DjangoContextInitializer implements Disposable {
1313
private readonly isDjangoProject: ContextKey;
14-
private monitoringActiveTextEditor: boolean;
14+
private monitoringActiveTextEditor: boolean = false;
1515
private workspaceContextKeyValues = new Map<string, boolean>();
16-
private lastCheckedWorkspace: string;
16+
private lastCheckedWorkspace: string = '';
1717
private disposables: Disposable[] = [];
1818

1919
constructor(private documentManager: IDocumentManager,

src/client/typeFormatters/contracts.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export class BlockRegEx {
2-
constructor(private regEx: RegExp, public startWord) {
2+
constructor(private regEx: RegExp, public startWord: String) {
33

44
}
55
public test(value: string): boolean {

0 commit comments

Comments
 (0)