microsoft
diff --git a/‎src/compiler/checker.ts
Copy file name to clipboard
+151-121Lines changed: 151 additions & 121 deletions b/‎src/compiler/checker.ts
Copy file name to clipboard
+151-121Lines changed: 151 additions & 121 deletions
diff --git a/‎src/compiler/core.ts
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions b/‎src/compiler/core.ts
Copy file name to clipboard
+4-2Lines changed: 4 additions & 2 deletions
diff --git a/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+8-4Lines changed: 8 additions & 4 deletions b/‎src/compiler/diagnosticMessages.json
Copy file name to clipboard
+8-4Lines changed: 8 additions & 4 deletions
diff --git a/‎src/compiler/types.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎src/compiler/types.ts
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/harness/fourslash.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/harness/fourslash.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/harness/unittests/matchFiles.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion b/‎src/harness/unittests/matchFiles.ts
Copy file name to clipboard
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/harness/unittests/tsserverProjectSystem.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎src/harness/unittests/tsserverProjectSystem.ts
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/server/client.ts
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎src/server/client.ts
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎src/server/protocol.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎src/server/protocol.ts
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/services/shims.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/services/shims.ts
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
@@ -1606,6 +1606,7 @@ namespace ts {
             messageText: text,
             category: message.category,
             code: message.code,
+            reportsUnnecessary: message.unused,
         };
     }
 
@@ -1635,7 +1636,8 @@ namespace ts {
 
             messageText: text,
             category: message.category,
-            code: message.code
+            code: message.code,
+            reportsUnnecessary: message.unused,
         };
     }
 
@@ -1647,7 +1649,7 @@ namespace ts {
 
             code: chain.code,
             category: chain.category,
-            messageText: chain.next ? chain : chain.messageText
+            messageText: chain.next ? chain : chain.messageText,
         };
     }
 
 
@@ -3282,7 +3282,8 @@
     },
     "'{0}' is declared but its value is never read.": {
         "category": "Error",
-        "code": 6133
+        "code": 6133,
+        "unused": true
     },
     "Report errors on unused locals.": {
         "category": "Message",
@@ -3302,7 +3303,8 @@
     },
     "Property '{0}' is declared but its value is never read.": {
         "category": "Error",
-        "code": 6138
+        "code": 6138,
+        "unused": true
     },
     "Import emit helpers from 'tslib'.": {
         "category": "Message",
@@ -3514,7 +3516,8 @@
     },
     "All imports in import declaration are unused.": {
         "category": "Error",
-        "code": 6192
+        "code": 6192,
+        "unused": true
     },
     "Found 1 error.": {
         "category": "Message",
@@ -3602,7 +3605,8 @@
     },
     "Unused label.": {
         "category": "Error",
-        "code": 7028
+        "code": 7028,
+        "unused": true
     },
     "Fallthrough case in switch.": {
         "category": "Error",
 
@@ -4069,6 +4069,7 @@ namespace ts {
         category: DiagnosticCategory;
         code: number;
         message: string;
+        unused?: {};
     }
 
     /**
@@ -4090,6 +4091,8 @@ namespace ts {
         length: number | undefined;
         messageText: string | DiagnosticMessageChain;
         category: DiagnosticCategory;
+        /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
+        reportsUnnecessary?: {};
         code: number;
         source?: string;
     }
 
@@ -2577,7 +2577,7 @@ Actual: ${stringify(fullActual)}`);
             }
             const range = ts.first(ranges);
 
-            const codeFixes = this.getCodeFixes(fileName, errorCode, preferences);
+            const codeFixes = this.getCodeFixes(fileName, errorCode, preferences).filter(f => f.fixId === undefined); // TODO: GH#20315 filter out those that use the import fix ID;
 
             if (codeFixes.length === 0) {
                 if (expectedTextArray.length !== 0) {
 
@@ -123,13 +123,14 @@ namespace ts {
         }
         {
             const actual = parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack);
-            expected.errors = expected.errors.map<Diagnostic>(error => ({
+            expected.errors = expected.errors.map((error): Diagnostic => ({
                 category: error.category,
                 code: error.code,
                 file: undefined,
                 length: undefined,
                 messageText: error.messageText,
                 start: undefined,
+                reportsUnnecessary: undefined,
             }));
             assertParsed(actual, expected);
         }
 
@@ -4068,7 +4068,7 @@ namespace ts.projectSystem {
             const folderPath = "/a/b/projects/temp";
             const file1: FileOrFolder = {
                 path: `${folderPath}/a.ts`,
-                content: 'import f = require("pad")'
+                content: 'import f = require("pad"); f;'
             };
             const files = [file1, libFile];
             const host = createServerHost(files);
 
@@ -353,11 +353,11 @@ namespace ts.server {
             return this.getDiagnostics(file, CommandNames.SuggestionDiagnosticsSync);
         }
 
-        private getDiagnostics(file: string, command: CommandNames) {
+        private getDiagnostics(file: string, command: CommandNames): Diagnostic[] {
             const request = this.processRequest<protocol.SyntacticDiagnosticsSyncRequest | protocol.SemanticDiagnosticsSyncRequest | protocol.SuggestionDiagnosticsSyncRequest>(command, { file, includeLinePosition: true });
             const response = this.processResponse<protocol.SyntacticDiagnosticsSyncResponse | protocol.SemanticDiagnosticsSyncResponse | protocol.SuggestionDiagnosticsSyncResponse>(request);
 
-            return (<protocol.DiagnosticWithLinePosition[]>response.body).map(entry => {
+            return (<protocol.DiagnosticWithLinePosition[]>response.body).map((entry): Diagnostic => {
                 const category = firstDefined(Object.keys(DiagnosticCategory), id =>
                     isString(id) && entry.category === id.toLowerCase() ? (<any>DiagnosticCategory)[id] : undefined);
                 return {
@@ -366,7 +366,8 @@ namespace ts.server {
                     length: entry.length,
                     messageText: entry.message,
                     category: Debug.assertDefined(category, "convertDiagnostic: category should not be undefined"),
-                    code: entry.code
+                    code: entry.code,
+                    reportsUnnecessary: entry.reportsUnnecessary,
                 };
             });
         }
 
@@ -455,6 +455,8 @@ namespace ts.server.protocol {
         endLocation: Location;
         category: string;
         code: number;
+        /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
+        reportsUnnecessary?: {};
     }
 
     /**
 
@@ -588,6 +588,7 @@ namespace ts {
         length: number;
         category: string;
         code: number;
+        unused?: {};
     }
     export function realizeDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, newLine: string): RealizedDiagnostic[] {
         return diagnostics.map(d => realizeDiagnostic(d, newLine));
Original file line number	Diff line number	Diff line change
@@ -2577,7 +2577,7 @@ Actual: ${stringify(fullActual)}`);
`2577`	`2577`	`}`
`2578`	`2578`	`const range = ts.first(ranges);`
`2579`	`2579`
`2580`		`- const codeFixes = this.getCodeFixes(fileName, errorCode, preferences);`
	`2580`	`+ const codeFixes = this.getCodeFixes(fileName, errorCode, preferences).filter(f => f.fixId === undefined); // TODO: GH#20315 filter out those that use the import fix ID;`
`2581`	`2581`
`2582`	`2582`	`if (codeFixes.length === 0) {`
`2583`	`2583`	`if (expectedTextArray.length !== 0) {`
Original file line number	Diff line number	Diff line change
`@@ -123,13 +123,14 @@ namespace ts {`
`123`	`123`	`}`
`124`	`124`	`{`
`125`	`125`	`const actual = parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName, resolutionStack);`
`126`		`- expected.errors = expected.errors.map<Diagnostic>(error => ({`
	`126`	`+ expected.errors = expected.errors.map((error): Diagnostic => ({`
`127`	`127`	`category: error.category,`
`128`	`128`	`code: error.code,`
`129`	`129`	`file: undefined,`
`130`	`130`	`length: undefined,`
`131`	`131`	`messageText: error.messageText,`
`132`	`132`	`start: undefined,`
	`133`	`+ reportsUnnecessary: undefined,`
`133`	`134`	`}));`
`134`	`135`	`assertParsed(actual, expected);`
`135`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -455,6 +455,8 @@ namespace ts.server.protocol {`
`455`	`455`	`endLocation: Location;`
`456`	`456`	`category: string;`
`457`	`457`	`code: number;`
	`458`	+ /** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
	`459`	`+ reportsUnnecessary?: {};`
`458`	`460`	`}`
`459`	`461`
`460`	`462`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -588,6 +588,7 @@ namespace ts {`
`588`	`588`	`length: number;`
`589`	`589`	`category: string;`
`590`	`590`	`code: number;`
	`591`	`+ unused?: {};`
`591`	`592`	`}`
`592`	`593`	`export function realizeDiagnostics(diagnostics: ReadonlyArray<Diagnostic>, newLine: string): RealizedDiagnostic[] {`
`593`	`594`	`return diagnostics.map(d => realizeDiagnostic(d, newLine));`