diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 4a2389a53b7..a7eaa8d1437 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -2064,7 +2064,7 @@ namespace ts {
         }
 
         const startLine = sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line;
-        const endLine = sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)).line;
+        const endLine = sourceFile.getLineAndCharacterOfPosition(nextToken.getStart(sourceFile)).line;
         return startLine !== endLine;
     }
 
diff --git a/tests/cases/fourslash/codeFixInferFromFunctionUsage.ts b/tests/cases/fourslash/codeFixInferFromFunctionUsage.ts
index 27a039878ba..99bbb35d0b7 100644
--- a/tests/cases/fourslash/codeFixInferFromFunctionUsage.ts
+++ b/tests/cases/fourslash/codeFixInferFromFunctionUsage.ts
@@ -2,7 +2,7 @@
 
 // @noImplicitAny: true
 ////function wrap( [| arr |] ) {
-////     arr.sort(function (a: number, b: number) { return a < b ? -1 : 1 })
+////     arr.sort(function (a: number, b: number) { return a < b ? -1 : 1 });
 //// }
 
 // https://github.com/Microsoft/TypeScript/issues/29330
diff --git a/tests/cases/fourslash/formatAddSemicolons1.ts b/tests/cases/fourslash/formatAddSemicolons1.ts
index 409524dfc60..a24c8673254 100644
--- a/tests/cases/fourslash/formatAddSemicolons1.ts
+++ b/tests/cases/fourslash/formatAddSemicolons1.ts
@@ -23,7 +23,7 @@
 ////declare module 'bar'
 ////type T = { x: string, y: number }
 
-format.setFormatOptions({ ...format.copyFormatOptions(), insertTrailingSemicolon: true });
+format.setFormatOptions({ ...format.copyFormatOptions(), semicolons: ts.SemicolonPreference.Insert });
 format.document();
 verify.currentFileContentIs(`console.log(1);
 console.log(2);
diff --git a/tests/cases/fourslash/formatRemoveSemicolons1.ts b/tests/cases/fourslash/formatRemoveSemicolons1.ts
index fe87970baa4..b80ecee7edb 100644
--- a/tests/cases/fourslash/formatRemoveSemicolons1.ts
+++ b/tests/cases/fourslash/formatRemoveSemicolons1.ts
@@ -37,7 +37,7 @@
 ////    ();
 ////}
 
-format.setFormatOptions({ ...format.copyFormatOptions(), insertTrailingSemicolon: false });
+format.setFormatOptions({ ...format.copyFormatOptions(), semicolons: ts.SemicolonPreference.Remove });
 format.document();
 verify.currentFileContentIs(`; (function f() { })()
 const a = 3;
diff --git a/tests/cases/fourslash/formatRemoveSemicolons2.ts b/tests/cases/fourslash/formatRemoveSemicolons2.ts
index 742a28a88d8..268a217e032 100644
--- a/tests/cases/fourslash/formatRemoveSemicolons2.ts
+++ b/tests/cases/fourslash/formatRemoveSemicolons2.ts
@@ -12,7 +12,7 @@
 ////}
 ////let z = 0; //
 
-format.setFormatOptions({ ...format.copyFormatOptions(), insertTrailingSemicolon: false });
+format.setFormatOptions({ ...format.copyFormatOptions(), semicolons: ts.SemicolonPreference.Remove });
 format.document();
 verify.currentFileContentIs(`namespace ts {
     let x = 0
diff --git a/tests/cases/fourslash/formatRemoveSemicolons3.ts b/tests/cases/fourslash/formatRemoveSemicolons3.ts
index 9b2266214e1..0987e088d5d 100644
--- a/tests/cases/fourslash/formatRemoveSemicolons3.ts
+++ b/tests/cases/fourslash/formatRemoveSemicolons3.ts
@@ -4,7 +4,7 @@
 ////// Start with signatures at empty array in case of recursive types
 ////(<InterfaceTypeWithDeclaredMembers>type).declaredCallSignatures = emptyArray;
 
-format.setFormatOptions({ ...format.copyFormatOptions(), insertTrailingSemicolon: false });
+format.setFormatOptions({ ...format.copyFormatOptions(), semicolons: ts.SemicolonPreference.Remove });
 format.document();
 verify.currentFileContentIs(`(<InterfaceTypeWithDeclaredMembers>type).declaredProperties = getNamedMembers(members);
 // Start with signatures at empty array in case of recursive types