From 5402998c558a5832f861b92f74e95c7a77109bbd Mon Sep 17 00:00:00 2001 From: Jake Bailey <5341706+jakebailey@users.noreply.github.com> Date: Tue, 18 Apr 2023 14:10:30 -0700 Subject: [PATCH] Declare typingsInstaller as optional for ProjectService (#53896) --- src/server/editorServices.ts | 2 +- src/server/session.ts | 5 +++-- tests/baselines/reference/api/tsserverlibrary.d.ts | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 8e4443e2208..09975236e53 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -579,7 +579,7 @@ export interface ProjectServiceOptions { cancellationToken: HostCancellationToken; useSingleInferredProject: boolean; useInferredProjectPerProjectRoot: boolean; - typingsInstaller: ITypingsInstaller; + typingsInstaller?: ITypingsInstaller; eventHandler?: ProjectServiceEventHandler; suppressDiagnosticEvents?: boolean; throttleWaitMilliseconds?: number; diff --git a/src/server/session.ts b/src/server/session.ts index f016fab0c18..030a1941ccd 100644 --- a/src/server/session.ts +++ b/src/server/session.ts @@ -161,6 +161,7 @@ import { LogLevel, Msg, NormalizedPath, + nullTypingsInstaller, Project, ProjectInfoTelemetryEvent, ProjectKind, @@ -926,7 +927,7 @@ export interface SessionOptions { cancellationToken: ServerCancellationToken; useSingleInferredProject: boolean; useInferredProjectPerProjectRoot: boolean; - typingsInstaller: ITypingsInstaller; + typingsInstaller?: ITypingsInstaller; byteLength: (buf: string, encoding?: BufferEncoding) => number; hrtime: (start?: [number, number]) => [number, number]; logger: Logger; @@ -972,7 +973,7 @@ export class Session implements EventSender { constructor(opts: SessionOptions) { this.host = opts.host; this.cancellationToken = opts.cancellationToken; - this.typingsInstaller = opts.typingsInstaller; + this.typingsInstaller = opts.typingsInstaller || nullTypingsInstaller; this.byteLength = opts.byteLength; this.hrtime = opts.hrtime; this.logger = opts.logger; diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts index 7a7adbc8a07..249bd65f95a 100644 --- a/tests/baselines/reference/api/tsserverlibrary.d.ts +++ b/tests/baselines/reference/api/tsserverlibrary.d.ts @@ -3554,7 +3554,7 @@ declare namespace ts { cancellationToken: HostCancellationToken; useSingleInferredProject: boolean; useInferredProjectPerProjectRoot: boolean; - typingsInstaller: ITypingsInstaller; + typingsInstaller?: ITypingsInstaller; eventHandler?: ProjectServiceEventHandler; suppressDiagnosticEvents?: boolean; throttleWaitMilliseconds?: number; @@ -3826,7 +3826,7 @@ declare namespace ts { cancellationToken: ServerCancellationToken; useSingleInferredProject: boolean; useInferredProjectPerProjectRoot: boolean; - typingsInstaller: ITypingsInstaller; + typingsInstaller?: ITypingsInstaller; byteLength: (buf: string, encoding?: BufferEncoding) => number; hrtime: (start?: [ number,