Add more options

microsoft · jessetrinity · Jun 25, 2021 · Dec 23, 2020 · Dec 24, 2020 · Dec 24, 2020
commit df62a114b3c1a338cbacb80efece10ddfbf84960
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -8246,8 +8246,11 @@ namespace ts {
         readonly includePackageJsonAutoImports?: "auto" | "on" | "off";
         readonly provideRefactorNotApplicableReason?: boolean;
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeInlineDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean;
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
         readonly includeInlinePropertyDeclarationType?: boolean;
         readonly includeInlineFunctionLikeReturnType?: boolean;
         readonly includeInlineEnumMemberValue?: boolean;

diff --git a/src/services/inlineHints.ts b/src/services/inlineHints.ts
@@ -114,6 +114,10 @@ namespace ts.InlineHints {
             }
 
             const declarationType = checker.getTypeAtLocation(decl);
+            if (!preferences.includeInlineRequireAssignedVariableType || declarationType.symbol && (declarationType.symbol.flags & SymbolFlags.Module)) {
+                return;
+            }
+
             const typeDisplayString = printTypeInSingleLine(declarationType);
             if (typeDisplayString) {
                 addTypeHints(typeDisplayString, decl.name.end);
@@ -132,17 +136,24 @@ namespace ts.InlineHints {
             }
 
             for (let i = 0; i < expr.arguments.length; ++i) {
+                const arg = expr.arguments[i];
+                if (!preferences.includeInlineNonLiteralParameterName && !isHintableExpression(arg)) {
+                    continue;
+                }
+
                 const parameterName = checker.getParameterIdentifierNameAtPosition(signature, i);
                 if (parameterName) {
-                    const arg = expr.arguments[i];
-                    const argumentName = isIdentifier(arg) ? arg.text : undefined;
-                    if (!argumentName || argumentName !== parameterName) {
+                    if (preferences.includeInlineDuplicatedParameterName || !isIdentifier(arg) || arg.text !== parameterName) {
                         addNameHints(unescapeLeadingUnderscores(parameterName), expr.arguments[i].getStart());
                     }
                 }
             }
         }
 
+        function isHintableExpression(node: Node) {
+            return isLiteralExpression(node) || isFunctionExpressionLike(node) || isObjectLiteralExpression(node) || isArrayLiteralExpression(node);
+        }
+
         function visitFunctionDeclarationLikeForReturnType(decl: ArrowFunction | FunctionExpression | MethodDeclaration | FunctionDeclaration) {
             if (decl.type || !decl.body) {
                 return;

diff --git a/src/services/types.ts b/src/services/types.ts
@@ -566,8 +566,14 @@ namespace ts {
 
     export interface InlineHintsOptions extends UserPreferences {
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean,
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
+        readonly includeInlinePropertyDeclarationType?: boolean;
+        readonly includeInlineFunctionLikeReturnType?: boolean;
+        readonly includeInlineEnumMemberValue?: boolean;
     }
 
     export type SignatureHelpTriggerCharacter = "," | "(" | "<";

diff --git a/tests/baselines/reference/api/tsserverlibrary.d.ts b/tests/baselines/reference/api/tsserverlibrary.d.ts
@@ -3873,8 +3873,14 @@ declare namespace ts {
         readonly includePackageJsonAutoImports?: "auto" | "on" | "off";
         readonly provideRefactorNotApplicableReason?: boolean;
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeInlineDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean;
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
+        readonly includeInlinePropertyDeclarationType?: boolean;
+        readonly includeInlineFunctionLikeReturnType?: boolean;
+        readonly includeInlineEnumMemberValue?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
     export interface PseudoBigInt {
@@ -5608,8 +5614,14 @@ declare namespace ts {
     }
     interface InlineHintsOptions extends UserPreferences {
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean;
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
+        readonly includeInlinePropertyDeclarationType?: boolean;
+        readonly includeInlineFunctionLikeReturnType?: boolean;
+        readonly includeInlineEnumMemberValue?: boolean;
     }
     type SignatureHelpTriggerCharacter = "," | "(" | "<";
     type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")";

diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -3873,8 +3873,14 @@ declare namespace ts {
         readonly includePackageJsonAutoImports?: "auto" | "on" | "off";
         readonly provideRefactorNotApplicableReason?: boolean;
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeInlineDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean;
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
+        readonly includeInlinePropertyDeclarationType?: boolean;
+        readonly includeInlineFunctionLikeReturnType?: boolean;
+        readonly includeInlineEnumMemberValue?: boolean;
     }
     /** Represents a bigint literal value without requiring bigint support */
     export interface PseudoBigInt {
@@ -5608,8 +5614,14 @@ declare namespace ts {
     }
     interface InlineHintsOptions extends UserPreferences {
         readonly includeInlineParameterName?: boolean;
+        readonly includeInlineNonLiteralParameterName?: boolean;
+        readonly includeDuplicatedParameterName?: boolean;
         readonly includeInlineFunctionParameterType?: boolean;
         readonly includeInlineVariableType?: boolean;
+        readonly includeInlineRequireAssignedVariableType?: boolean;
+        readonly includeInlinePropertyDeclarationType?: boolean;
+        readonly includeInlineFunctionLikeReturnType?: boolean;
+        readonly includeInlineEnumMemberValue?: boolean;
     }
     type SignatureHelpTriggerCharacter = "," | "(" | "<";
     type SignatureHelpRetriggerCharacter = SignatureHelpTriggerCharacter | ")";