Skip to content

Commit 7bb6c18

Browse files
author
Andy Hanson
committed
Simple fixes
1 parent c0e4a12 commit 7bb6c18

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/compiler/checker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6254,10 +6254,10 @@ namespace ts {
62546254
const parameterName = node.parameterName as Identifier;
62556255
return {
62566256
kind: TypePredicateKind.Identifier,
6257-
parameterName: parameterName ? <string>parameterName.text : undefined,
6257+
parameterName: parameterName ? parameterName.text : undefined,
62586258
parameterIndex: parameterName ? getTypePredicateParameterIndex((node.parent as SignatureDeclaration).parameters, parameterName) : undefined,
62596259
type: getTypeFromTypeNode(node.type)
6260-
};
6260+
} as IdentifierTypePredicate;
62616261
}
62626262
else {
62636263
return {

src/harness/projectsRunner.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ class ProjectRunner extends RunnerBase {
426426
compilerResult.program ?
427427
ts.filter(compilerResult.program.getSourceFiles(), sourceFile => !Harness.isDefaultLibraryFile(sourceFile.fileName)) :
428428
[]),
429-
sourceFile => ts.id<Harness.Compiler.TestFile>({
429+
(sourceFile): Harness.Compiler.TestFile => ({
430430
unitName: ts.isRootedDiskPath(sourceFile.fileName) ?
431431
RunnerBase.removeFullPaths(sourceFile.fileName) :
432432
sourceFile.fileName,

src/harness/unittests/matchFiles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ namespace ts {
109109
}
110110
{
111111
const actual = ts.parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack);
112-
expected.errors = expected.errors.map<Diagnostic>(error => ({
112+
expected.errors = expected.errors.map((error): Diagnostic => ({
113113
category: error.category,
114114
code: error.code,
115115
file: undefined,

src/harness/unittests/session.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,15 @@ namespace ts.server {
9393

9494
session.executeCommand(req);
9595

96-
expect(lastSent).to.deep.equal(id<protocol.Response>({
96+
const expected: protocol.Response = {
9797
command: CommandNames.Unknown,
9898
type: "response",
9999
seq: 0,
100100
message: "Unrecognized JSON command: foobar",
101101
request_seq: 0,
102102
success: false
103-
}));
103+
};
104+
expect(lastSent).to.deep.equal(expected);
104105
});
105106
it("should return a tuple containing the response and if a response is required on success", () => {
106107
const req: protocol.ConfigureRequest = {

src/server/typingsInstaller/typingsInstaller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ namespace ts.server.typingsInstaller {
309309
this.installRunCount++;
310310

311311
// send progress event
312-
this.sendResponse(<BeginInstallTypes>{
312+
this.sendResponse<BeginInstallTypes>({
313313
kind: EventBeginInstallTypes,
314314
eventId: requestId,
315315
typingsInstallerVersion: ts.version, // qualified explicitly to prevent occasional shadowing
@@ -428,7 +428,7 @@ namespace ts.server.typingsInstaller {
428428
}
429429

430430
protected abstract installWorker(requestId: number, args: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
431-
protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
431+
protected abstract sendResponse<T extends SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes>(response: T): void;
432432
}
433433

434434
/* @internal */

0 commit comments

Comments
 (0)