feat(33792): add new quick fix service to handle missing call in condition

Author: a-tarasyuk

src/compiler/diagnosticMessages.json

@@ -5357,6 +5357,14 @@
  "category": "Message",
  "code": 95066
  },
+ "Add missing call": {
+ "category": "Message",
+ "code": 95067
+ },
+ "Add all missing calls": {
+ "category": "Message",
+ "code": 95068
+ },
  "Add 'unknown' conversion for non-overlapping types": {
  "category": "Message",
  "code": 95069

src/services/codefixes/fixMissingCallInCondition.ts

@@ -0,0 +1,45 @@
+/* @internal */
+namespace ts.codefix {
+ const fixId = "fixMissingCallInCondition";
+ const errorCodes = [
+ Diagnostics.This_condition_will_always_return_true_since_the_function_is_always_defined_Did_you_mean_to_call_it_instead.code,
+ ];
+
+ registerCodeFix({
+ errorCodes,
+ fixIds: [fixId],
+ getCodeActions(context) {
+ const { sourceFile, span } = context;
+ const callName = getCallName(sourceFile, span.start);
+ if (!callName) return;
+
+ const changes = textChanges.ChangeTracker.with(context, t => doChange(t, context.sourceFile, callName));
+ return [createCodeFixAction(fixId, changes, Diagnostics.Add_missing_call, fixId, Diagnostics.Add_all_missing_calls)];
+ },
+ getAllCodeActions: context => codeFixAll(context, errorCodes, (changes, diag) => {
+ const callName = getCallName(diag.file, diag.start);
+ if (callName) doChange(changes, diag.file, callName);
+ })
+ });
+
+ function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, name: Identifier | PrivateIdentifier): void {
+ changes.replaceNode(sourceFile, name, createCall(createIdentifier(name.text), /*typeArguments*/ undefined, /*argumentsArray*/ undefined));
+ }
+
+ function getCallName(sourceFile: SourceFile, start: number): Identifier | PrivateIdentifier | undefined {
+ const token = getTokenAtPosition(sourceFile, start);
+ if (isPropertyAccessExpression(token.parent)) {
+ let current: PropertyAccessExpression = token.parent;
+ while (isPropertyAccessExpression(current.parent)) {
+ current = current.parent;
+ }
+ return current.name;
+ }
+
+ if (isIdentifier(token)) {
+ return token;
+ }
+
+ return undefined;
+ }
+}

src/services/tsconfig.json

@@ -80,6 +80,7 @@
  "codefixes/fixUnreachableCode.ts",
  "codefixes/fixUnusedLabel.ts",
  "codefixes/fixJSDocTypes.ts",
+ "codefixes/fixMissingCallInCondition.ts",
  "codefixes/fixAwaitInSyncFunction.ts",
  "codefixes/disableJsDiagnostics.ts",
  "codefixes/helpers.ts",

tests/cases/fourslash/codeFixMissingCallInCondition1.ts

@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////function foo(fn: () => boolean) {
+//// fn/**/ ? console.log('test') : undefined;
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`function foo(fn: () => boolean) {
+ fn() ? console.log('test') : undefined;
+}`,
+});

tests/cases/fourslash/codeFixMissingCallInCondition10.ts

@@ -0,0 +1,29 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////class Foo {
+//// #test = () => true;
+//// run() {
+//// if (this.#test/**/) {
+//// console.log('test')
+//// }
+//// }
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`class Foo {
+ #test = () => true;
+ run() {
+ if (this.#test()) {
+ console.log('test')
+ }
+ }
+}`,
+});

tests/cases/fourslash/codeFixMissingCallInCondition11.ts

@@ -0,0 +1,55 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////class Foo {
+//// #test = () => true;
+//// run() {
+//// if (this.#test) {
+//// console.log('test')
+//// }
+//// }
+////}
+////
+////function foo() {
+//// function test() { return Math.random() > 0.5; }
+//// test ? console.log('test') : undefined;
+////}
+////
+////function foo() {
+//// const x = {
+//// foo: {
+//// bar() { return true; }
+//// }
+//// }
+//// x.foo.bar ? console.log('test') : undefined;
+//// if (x.foo.bar) {}
+////}
+
+verify.codeFixAll({
+ fixAllDescription: ts.Diagnostics.Add_all_missing_calls.message,
+ fixId: "fixMissingCallInCondition",
+ newFileContent:
+`class Foo {
+ #test = () => true;
+ run() {
+ if (this.#test()) {
+ console.log('test')
+ }
+ }
+}
+
+function foo() {
+ function test() { return Math.random() > 0.5; }
+ test() ? console.log('test') : undefined;
+}
+
+function foo() {
+ const x = {
+ foo: {
+ bar() { return true; }
+ }
+ }
+ x.foo.bar() ? console.log('test') : undefined;
+ if (x.foo.bar()) {}
+}`,
+});

tests/cases/fourslash/codeFixMissingCallInCondition2.ts

@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////function foo() {
+//// function test() { return Math.random() > 0.5; }
+//// test/**/ ? console.log('test') : undefined;
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`function foo() {
+ function test() { return Math.random() > 0.5; }
+ test() ? console.log('test') : undefined;
+}`,
+});

tests/cases/fourslash/codeFixMissingCallInCondition3.ts

@@ -0,0 +1,29 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////function foo() {
+//// const x = {
+//// foo: {
+//// bar() { return true; }
+//// }
+//// }
+//// x.foo.bar/**/ ? console.log('test') : undefined;
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`function foo() {
+ const x = {
+ foo: {
+ bar() { return true; }
+ }
+ }
+ x.foo.bar() ? console.log('test') : undefined;
+}`,
+});

tests/cases/fourslash/codeFixMissingCallInCondition4.ts

@@ -0,0 +1,30 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////class Foo {
+//// test() {
+//// return true;
+//// }
+//// run() {
+//// this.test/**/ ? console.log('test') : undefined;
+//// }
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`class Foo {
+ test() {
+ return true;
+ }
+ run() {
+ this.test() ? console.log('test') : undefined;
+ }
+}`,
+});
+

tests/cases/fourslash/codeFixMissingCallInCondition5.ts

@@ -0,0 +1,25 @@
+/// <reference path='fourslash.ts'/>
+
+// @strictNullChecks: true
+////class Foo {
+//// #test = () => true;
+//// run() {
+//// this.#test/**/ ? console.log('test') : undefined;
+//// }
+////}
+
+verify.codeFixAvailable([
+ { description: ts.Diagnostics.Add_missing_call.message }
+]);
+
+verify.codeFix({
+ description: ts.Diagnostics.Add_missing_call.message,
+ index: 0,
+ newFileContent:
+`class Foo {
+ #test = () => true;
+ run() {
+ this.#test() ? console.log('test') : undefined;
+ }
+}`,
+});