Address PR comments

Author: sandersn

src/compiler/diagnosticMessages.json

@@ -1738,7 +1738,7 @@
         "category": "Error",
         "code": 2374
     },
-    "Type '{0}' is not assignable to type '{1}' with exactOptionalPropertyTypes: true. Consider adding 'undefined' to the types of the target's properties.": {
+    "Type '{0}' is not assignable to type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties.": {
         "category": "Error",
         "code": 2375
     },
@@ -1754,7 +1754,7 @@
         "category": "Error",
         "code": 2378
     },
-    "Argument of type '{0}' is not assignable to parameter of type '{1}' with exactOptionalPropertyTypes: true. Consider adding 'undefined' to the types of the target's properties.": {
+    "Argument of type '{0}' is not assignable to parameter of type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the types of the target's properties.": {
         "category": "Error",
         "code": 2379
     },
@@ -1882,7 +1882,7 @@
         "category": "Error",
         "code": 2410
     },
-    "Type '{0}' is not assignable to type '{1}' with exactOptionalPropertyTypes: true. Consider adding 'undefined' to the type of the target.": {
+    "Type '{0}' is not assignable to type '{1}' with 'exactOptionalPropertyTypes: true'. Consider adding 'undefined' to the type of the target.": {
         "category": "Error",
         "code": 2412
     },

src/services/codefixes/addOptionalPropertyUndefined.ts

@@ -36,7 +36,9 @@ namespace ts.codefix {
                             untouched = false;
                         }
                     }
-                    if (untouched) {addUndefinedToOptionalProperty(changes, toAdd);}
+                    if (untouched) {
+                        addUndefinedToOptionalProperty(changes, toAdd);
+                    }
                 });
             }));
         },
@@ -45,18 +47,18 @@ namespace ts.codefix {
     function getPropertiesToAdd(file: SourceFile, pos: number, checker: TypeChecker): Symbol[] {
         const sourceTarget = getSourceTarget(getErrorNode(file, pos), checker);
         if (!sourceTarget) {
-            return [];
+            return emptyArray;
         }
         const { source: sourceNode, target: targetNode } = sourceTarget;
         const target = checker.getTypeAtLocation(targetNode);
         const source = checker.getTypeAtLocation(sourceNode);
         if (target.symbol?.declarations?.some(d => getSourceFileOfNode(d).fileName.match(/\.d\.ts$/))) {
-            return [];
+            return emptyArray;
         }
         const targetPropertyType = getTargetPropertyType(checker, targetNode);
         if (targetPropertyType && checker.isExactOptionalPropertyMismatch(source, targetPropertyType)) {
             const s = checker.getSymbolAtLocation((targetNode as PropertyAccessExpression).name);
-            return s ? [s] : [];
+            return s ? [s] : emptyArray;
         }
         return checker.getExactOptionalUnassignableProperties(source, target);
     }

tests/baselines/reference/strictOptionalProperties1.errors.txt

@@ -190,9 +190,13 @@ interface U2 {
 }
 declare const e: string | boolean | undefined
 declare const u1: U1
-declare const u2: U2
+declare let u2: U2
 u1.email = e // error, but only because boolean isn't in email's type
 u2.email = e // error, and suggest adding undefined
+u2 = {
+    name: 'hi',
+    email: undefined
+}
 
 
 
@@ -326,6 +330,10 @@ function aa(input) {
 }
 u1.email = e; // error, but only because boolean isn't in email's type
 u2.email = e; // error, and suggest adding undefined
+u2 = {
+    name: 'hi',
+    email: undefined
+};
 
 
 //// [strictOptionalProperties1.d.ts]
@@ -409,4 +417,4 @@ interface U2 {
 }
 declare const e: string | boolean | undefined;
 declare const u1: U1;
-declare const u2: U2;
+declare let u2: U2;

tests/baselines/reference/strictOptionalProperties1.js

@@ -596,8 +596,8 @@ declare const u1: U1
 >u1 : Symbol(u1, Decl(strictOptionalProperties1.ts, 190, 13))
 >U1 : Symbol(U1, Decl(strictOptionalProperties1.ts, 179, 41))
 
-declare const u2: U2
->u2 : Symbol(u2, Decl(strictOptionalProperties1.ts, 191, 13))
+declare let u2: U2
+>u2 : Symbol(u2, Decl(strictOptionalProperties1.ts, 191, 11))
 >U2 : Symbol(U2, Decl(strictOptionalProperties1.ts, 184, 1))
 
 u1.email = e // error, but only because boolean isn't in email's type
@@ -608,8 +608,19 @@ u1.email = e // error, but only because boolean isn't in email's type
 
 u2.email = e // error, and suggest adding undefined
 >u2.email : Symbol(U2.email, Decl(strictOptionalProperties1.ts, 186, 16))
->u2 : Symbol(u2, Decl(strictOptionalProperties1.ts, 191, 13))
+>u2 : Symbol(u2, Decl(strictOptionalProperties1.ts, 191, 11))
 >email : Symbol(U2.email, Decl(strictOptionalProperties1.ts, 186, 16))
 >e : Symbol(e, Decl(strictOptionalProperties1.ts, 189, 13))
 
+u2 = {
+>u2 : Symbol(u2, Decl(strictOptionalProperties1.ts, 191, 11))
+
+    name: 'hi',
+>name : Symbol(name, Decl(strictOptionalProperties1.ts, 194, 6))
+
+    email: undefined
+>email : Symbol(email, Decl(strictOptionalProperties1.ts, 195, 15))
+>undefined : Symbol(undefined)
+}
+
 

tests/baselines/reference/strictOptionalProperties1.symbols

@@ -703,7 +703,7 @@ declare const e: string | boolean | undefined
 declare const u1: U1
 >u1 : U1
 
-declare const u2: U2
+declare let u2: U2
 >u2 : U2
 
 u1.email = e // error, but only because boolean isn't in email's type
@@ -720,4 +720,18 @@ u2.email = e // error, and suggest adding undefined
 >email : string | number
 >e : string | boolean | undefined
 
+u2 = {
+>u2 = {    name: 'hi',    email: undefined} : { name: string; email: undefined; }
+>u2 : U2
+>{    name: 'hi',    email: undefined} : { name: string; email: undefined; }
+
+    name: 'hi',
+>name : string
+>'hi' : "hi"
+
+    email: undefined
+>email : undefined
+>undefined : undefined
+}
+
 

tests/baselines/reference/strictOptionalProperties1.types

@@ -193,7 +193,11 @@ interface U2 {
 }
 declare const e: string | boolean | undefined
 declare const u1: U1
-declare const u2: U2
+declare let u2: U2
 u1.email = e // error, but only because boolean isn't in email's type
 u2.email = e // error, and suggest adding undefined
+u2 = {
+    name: 'hi',
+    email: undefined
+}