From d76a45a6aac0319ebdd5e31d4fb421778275977e Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Tue, 25 Feb 2020 14:32:41 -0500 Subject: [PATCH] Cherry-pick PR #36993 into release-3.8 (#37020) Component commits: 7721570861 Harden telemetryOnOpenFile 9535e7b258 Merge branch 'master' of https://github.com/RyanCavanaugh/TypeScript into fix36984 Co-authored-by: Ryan Cavanaugh --- src/server/editorServices.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts index 74108fa9bf558..e34aef3532946 100644 --- a/src/server/editorServices.ts +++ b/src/server/editorServices.ts @@ -3117,8 +3117,9 @@ namespace ts.server { return; } - const info: OpenFileInfo = { checkJs: !!project.getSourceFile(scriptInfo.path)!.checkJsDirective }; - this.eventHandler({ eventName: OpenFileInfoTelemetryEvent, data: { info } }); + const sourceFile = project.getSourceFile(scriptInfo.path); + const checkJs = !!sourceFile && !!sourceFile.checkJsDirective; + this.eventHandler({ eventName: OpenFileInfoTelemetryEvent, data: { info: { checkJs } } }); } /**