add on protocol.ts + renaming

Author: saschanaz

src/harness/fourslash.ts

@@ -376,7 +376,7 @@ namespace FourSlash {
                 insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
                 insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
                 insertSpaceAfterTypeAssertion: false,
-                indentInsideTernaryOperator: false,
+                indentConditionalExpressionFalseBranch: false,
                 placeOpenBraceOnNewLineForFunctions: false,
                 placeOpenBraceOnNewLineForControlBlocks: false,
             };

src/server/protocol.ts

@@ -2321,6 +2321,7 @@ namespace ts.server.protocol {
         insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
         insertSpaceAfterTypeAssertion?: boolean;
         insertSpaceBeforeFunctionParenthesis?: boolean;
+        indentConditionalExpressionFalseBranch?: boolean;
         placeOpenBraceOnNewLineForFunctions?: boolean;
         placeOpenBraceOnNewLineForControlBlocks?: boolean;
     }

src/server/utilities.ts

@@ -90,7 +90,7 @@ namespace ts.server {
             insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces: false,
             insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces: false,
             insertSpaceBeforeFunctionParenthesis: false,
-            indentInsideTernaryOperator: false,
+            indentConditionalExpressionFalseBranch: false,
             placeOpenBraceOnNewLineForFunctions: false,
             placeOpenBraceOnNewLineForControlBlocks: false,
         };

src/services/formatting/smartIndenter.ts

@@ -512,7 +512,7 @@ namespace ts.formatting {
                 case SyntaxKind.JsxElement:
                     return childKind !== SyntaxKind.JsxClosingElement;
                 case SyntaxKind.ConditionalExpression:
-                    return options.indentInsideTernaryOperator || (parent as ConditionalExpression).whenFalse !== child;
+                    return options.indentConditionalExpressionFalseBranch || (parent as ConditionalExpression).whenFalse !== child;
             }
             // No explicit rule for given nodes so the result will follow the default value argument
             return indentByDefault;

src/services/types.ts

@@ -472,7 +472,7 @@ namespace ts {
         insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces?: boolean;
         insertSpaceAfterTypeAssertion?: boolean;
         insertSpaceBeforeFunctionParenthesis?: boolean;
-        indentInsideTernaryOperator?: boolean;
+        indentConditionalExpressionFalseBranch?: boolean;
         placeOpenBraceOnNewLineForFunctions?: boolean;
         placeOpenBraceOnNewLineForControlBlocks?: boolean;
     }

tests/cases/fourslash/formattingOptionsChangeTernary.ts

@@ -13,7 +13,7 @@
 ////    ? ScanAction.RescanJsxText
 ////    : ScanAction.Scan;
 
-format.setOption("indentInsideTernaryOperator", false);
+format.setOption("indentConditionalExpressionFalseBranch", false);
 format.document();
 verify.currentFileContentIs(`const expectedScanAction =
     shouldRescanGreaterThanToken(n)
@@ -28,7 +28,7 @@ verify.currentFileContentIs(`const expectedScanAction =
         ? ScanAction.RescanJsxText
         : ScanAction.Scan;`)
 
-format.setOption("indentInsideTernaryOperator", true);
+format.setOption("indentConditionalExpressionFalseBranch", true);
 format.document();
 verify.currentFileContentIs(`const expectedScanAction =
     shouldRescanGreaterThanToken(n)