From ac30127317a2df3d1a28e66fe6cdbb95b068b65e Mon Sep 17 00:00:00 2001
From: Andrew Branch <andrew@wheream.io>
Date: Thu, 12 Sep 2019 09:47:22 -0700
Subject: [PATCH] Rename option

---
 src/server/protocol.ts           | 2 +-
 src/services/formatting/rules.ts | 4 ++--
 src/services/textChanges.ts      | 2 +-
 src/services/types.ts            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/server/protocol.ts b/src/server/protocol.ts
index c791eebf7d2..63e0ca1744f 100644
--- a/src/server/protocol.ts
+++ b/src/server/protocol.ts
@@ -2978,7 +2978,7 @@ namespace ts.server.protocol {
         placeOpenBraceOnNewLineForFunctions?: boolean;
         placeOpenBraceOnNewLineForControlBlocks?: boolean;
         insertSpaceBeforeTypeAnnotation?: boolean;
-        semicolonPreference?: SemicolonPreference
+        semicolons?: SemicolonPreference;
     }
 
     export interface UserPreferences {
diff --git a/src/services/formatting/rules.ts b/src/services/formatting/rules.ts
index a1ffc4659ea..0672fd5609f 100644
--- a/src/services/formatting/rules.ts
+++ b/src/services/formatting/rules.ts
@@ -313,8 +313,8 @@ namespace ts.formatting {
 
             rule("SpaceBeforeTypeAnnotation", anyToken, SyntaxKind.ColonToken, [isOptionEnabled("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], RuleAction.Space),
             rule("NoSpaceBeforeTypeAnnotation", anyToken, SyntaxKind.ColonToken, [isOptionDisabledOrUndefined("insertSpaceBeforeTypeAnnotation"), isNonJsxSameLineTokenContext, isTypeAnnotationContext], RuleAction.DeleteTrivia),
-            rule("NoOptionalSemicolon", SyntaxKind.SemicolonToken, anyTokenIncludingEOF, [optionEquals("semicolonPreference", SemicolonPreference.Remove), isSemicolonDeletionContext], RuleAction.DeleteToken),
-            rule("OptionalSemicolon", anyToken, anyTokenIncludingEOF, [optionEquals("semicolonPreference", SemicolonPreference.Insert), isSemicolonInsertionContext], RuleAction.TrailingSemicolon),
+            rule("NoOptionalSemicolon", SyntaxKind.SemicolonToken, anyTokenIncludingEOF, [optionEquals("semicolons", SemicolonPreference.Remove), isSemicolonDeletionContext], RuleAction.DeleteToken),
+            rule("OptionalSemicolon", anyToken, anyTokenIncludingEOF, [optionEquals("semicolons", SemicolonPreference.Insert), isSemicolonInsertionContext], RuleAction.TrailingSemicolon),
         ];
 
         // These rules are lower in priority than user-configurable. Rules earlier in this list have priority over rules later in the list.
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
index 71d5f289e24..cf10d01b8d6 100644
--- a/src/services/textChanges.ts
+++ b/src/services/textChanges.ts
@@ -838,7 +838,7 @@ namespace ts.textChanges {
                 // If the user has no semicolon preference defined and the file doesn’t use semicolons,
                 // make the formatter remove them. Otherwise, ignore semicolons in the formatter because
                 // the writer will insert them by default.
-                semicolonPreference: context.options.semicolonPreference === SemicolonPreference.Remove || (!context.options.semicolonPreference || context.options.semicolonPreference === SemicolonPreference.Ignore) && !probablyUsesSemicolons(sourceFile)
+                semicolons: context.options.semicolons === SemicolonPreference.Remove || (!context.options.semicolons || context.options.semicolons === SemicolonPreference.Ignore) && !probablyUsesSemicolons(sourceFile)
                     ? SemicolonPreference.Remove
                     : SemicolonPreference.Ignore,
             };
diff --git a/src/services/types.ts b/src/services/types.ts
index eb6ffd2871e..a73b21db692 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -740,7 +740,7 @@ namespace ts {
         readonly placeOpenBraceOnNewLineForControlBlocks?: boolean;
         readonly insertSpaceBeforeTypeAnnotation?: boolean;
         readonly indentMultiLineObjectLiteralBeginningOnBlankLine?: boolean;
-        readonly semicolonPreference?: SemicolonPreference;
+        readonly semicolons?: SemicolonPreference;
     }
 
     export function getDefaultFormatCodeSettings(newLineCharacter?: string): FormatCodeSettings {
@@ -764,7 +764,7 @@ namespace ts {
             insertSpaceBeforeFunctionParenthesis: false,
             placeOpenBraceOnNewLineForFunctions: false,
             placeOpenBraceOnNewLineForControlBlocks: false,
-            semicolonPreference: SemicolonPreference.Ignore,
+            semicolons: SemicolonPreference.Ignore,
         };
     }