From 9f03d7bad7e10a425edcc232a1e9be562f23916a Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Tue, 26 May 2020 17:34:38 -0700
Subject: [PATCH] Use getFileAndLanguageServiceForSyntacticOperation

---
 src/server/session.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/server/session.ts b/src/server/session.ts
index e631578fb51..900564f934d 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -2202,35 +2202,35 @@ namespace ts.server {
         }
 
         private toggleLineComment(args: protocol.FileRangeRequestArgs): TextChange[] {
-            const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file)!;
+            const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
+            const scriptInfo = this.projectService.getScriptInfo(file)!;
             const textRange = this.getRange(args, scriptInfo);
 
-            return project.getLanguageService().toggleLineComment(file, textRange);
+            return languageService.toggleLineComment(file, textRange);
         }
 
         private toggleMultilineComment(args: protocol.FileRangeRequestArgs): TextChange[] {
-            const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file)!;
+            const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
+            const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!;
             const textRange = this.getRange(args, scriptInfo);
 
-            return project.getLanguageService().toggleMultilineComment(file, textRange);
+            return languageService.toggleMultilineComment(file, textRange);
         }
 
         private commentSelection(args: protocol.FileRangeRequestArgs): TextChange[] {
-            const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file)!;
+            const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
+            const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!;
             const textRange = this.getRange(args, scriptInfo);
 
-            return project.getLanguageService().commentSelection(file, textRange);
+            return languageService.commentSelection(file, textRange);
         }
 
         private uncommentSelection(args: protocol.FileRangeRequestArgs): TextChange[] {
-            const { file, project } = this.getFileAndProject(args);
-            const scriptInfo = project.getScriptInfoForNormalizedPath(file)!;
+            const { file, languageService } = this.getFileAndLanguageServiceForSyntacticOperation(args);
+            const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!;
             const textRange = this.getRange(args, scriptInfo);
 
-            return project.getLanguageService().uncommentSelection(file, textRange);
+            return languageService.uncommentSelection(file, textRange);
         }
 
         private mapSelectionRange(selectionRange: SelectionRange, scriptInfo: ScriptInfo): protocol.SelectionRange {