When every import is unused, error on the entire import declaration

src/compiler/checker.ts

@@ -21682,18 +21682,45 @@ namespace ts {
 
         function checkUnusedModuleMembers(node: ModuleDeclaration | SourceFile): void {
             if (compilerOptions.noUnusedLocals && !(node.flags & NodeFlags.Ambient)) {
+                const unusedImports: ImportedDeclaration[] = [];
                 node.locals.forEach(local => {
-                    if (!local.isReferenced && !local.exportSymbol) {
-                        for (const declaration of local.declarations) {
-                            if (!isAmbientModule(declaration)) {
-                                errorUnusedLocal(declaration, symbolName(local));
-                            }
+                    if (local.isReferenced || local.exportSymbol) return;
+                    for (const declaration of local.declarations) {
+                        if (isAmbientModule(declaration)) continue;
+                        if (isImportedDeclaration(declaration)) {
+                            unusedImports.push(declaration);
+                        }
+                        else {
+                            errorUnusedLocal(declaration, symbolName(local));
                         }
                     }
                 });
+
+                while (unusedImports.length) {
+                    const decl = unusedImports.pop()!;
+                    const importClause = decl.kind === SyntaxKind.ImportClause ? decl : decl.kind === SyntaxKind.NamespaceImport ? decl.parent : decl.parent.parent;
+                    if (!forEachImportedDeclaration(importClause, d => d !== decl && !contains(unusedImports, d))) {
+                        forEachImportedDeclaration(importClause, d => unorderedRemoveItem(unusedImports, d));
+                        error(importClause.parent, Diagnostics.No_import_of_0_is_used, showModuleSpecifier(importClause.parent));
+                    }
+                    else {
+                        errorUnusedLocal(decl, idText(decl.name));
+                    }
+                }
             }
         }
 
+        type ImportedDeclaration = ImportClause | ImportSpecifier | NamespaceImport;
+        function isImportedDeclaration(node: Node): node is ImportedDeclaration {
+            return node.kind === SyntaxKind.ImportClause || node.kind === SyntaxKind.ImportSpecifier || node.kind === SyntaxKind.NamespaceImport;
+        }
+
+        function forEachImportedDeclaration<T>(importClause: ImportClause, cb: (im: ImportedDeclaration) => T | undefined): T | undefined {
+            const { name: defaultName, namedBindings } = importClause;
+            return (defaultName && cb(importClause)) ||
+                namedBindings && (namedBindings.kind === SyntaxKind.NamespaceImport ? cb(namedBindings) : forEach(namedBindings.elements, cb));
+        }
+
         function checkBlock(node: Block) {
             // Grammar checking for SyntaxKind.Block
             if (node.kind === SyntaxKind.Block) {

src/compiler/diagnosticMessages.json

@@ -3480,6 +3480,10 @@
         "category": "Message",
         "code": 6191
     },
+    "No import of '{0}' is used.": {
+        "category": "Error",
+        "code": 6192
+    },
     "Variable '{0}' implicitly has an '{1}' type.": {
         "category": "Error",
         "code": 7005

src/compiler/utilities.ts

@@ -1199,7 +1199,7 @@ namespace ts {
             && (<PropertyAccessExpression | ElementAccessExpression>node).expression.kind === SyntaxKind.ThisKeyword;
     }
 
-   export function getEntityNameFromTypeNode(node: TypeNode): EntityNameOrEntityNameExpression {
+    export function getEntityNameFromTypeNode(node: TypeNode): EntityNameOrEntityNameExpression {
         switch (node.kind) {
             case SyntaxKind.TypeReference:
                 return (<TypeReferenceNode>node).typeName;
@@ -3723,6 +3723,10 @@ namespace ts {
     export function isUMDExportSymbol(symbol: Symbol) {
         return symbol && symbol.declarations && symbol.declarations[0] && isNamespaceExportDeclaration(symbol.declarations[0]);
     }
+
+    export function showModuleSpecifier({ moduleSpecifier }: ImportDeclaration): string {
+        return isStringLiteral(moduleSpecifier) ? moduleSpecifier.text : getTextOfNode(moduleSpecifier);
+    }
 }
 
 namespace ts {

src/services/codefixes/fixUnusedIdentifier.ts

@@ -5,12 +5,21 @@ namespace ts.codefix {
     const errorCodes = [
         Diagnostics._0_is_declared_but_its_value_is_never_read.code,
         Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code,
+        Diagnostics.No_import_of_0_is_used.code,
     ];
     registerCodeFix({
         errorCodes,
         getCodeActions(context) {
-            const { sourceFile } = context;
+            const { errorCode, sourceFile } = context;
             const token = getToken(sourceFile, context.span.start);
+
+            if (errorCode === Diagnostics.No_import_of_0_is_used.code) {
+                const decl = getImportDeclarationAtErrorLocation(token);
+                const description = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Remove_declaration_for_Colon_0), [showModuleSpecifier(decl)]);
+                const changes = textChanges.ChangeTracker.with(context, t => t.deleteNode(sourceFile, decl));
+                return [{ description, changes, fixId: fixIdDelete }];
+            }
+
             const result: CodeFixAction[] = [];
 
             const deletion = textChanges.ChangeTracker.with(context, t => tryDeleteDeclaration(t, sourceFile, token));
@@ -19,7 +28,7 @@ namespace ts.codefix {
                 result.push({ description, changes: deletion, fixId: fixIdDelete });
             }
 
-            const prefix = textChanges.ChangeTracker.with(context, t => tryPrefixDeclaration(t, context.errorCode, sourceFile, token));
+            const prefix = textChanges.ChangeTracker.with(context, t => tryPrefixDeclaration(t, errorCode, sourceFile, token));
             if (prefix.length) {
                 const description = formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Prefix_0_with_an_underscore), [token.getText()]);
                 result.push({ description, changes: prefix, fixId: fixIdPrefix });
@@ -38,14 +47,24 @@ namespace ts.codefix {
                     }
                     break;
                 case fixIdDelete:
-                    tryDeleteDeclaration(changes, sourceFile, token);
+                    if (diag.code === Diagnostics.No_import_of_0_is_used.code) {
+                        changes.deleteNode(sourceFile, getImportDeclarationAtErrorLocation(token));
+                    }
+                    else {
+                        tryDeleteDeclaration(changes, sourceFile, token);
+                    }
                     break;
                 default:
                     Debug.fail(JSON.stringify(context.fixId));
             }
         }),
     });
 
+    function getImportDeclarationAtErrorLocation(token: Node): ImportDeclaration {
+        Debug.assert(token.kind === SyntaxKind.ImportKeyword);
+        return cast(token.parent, isImportDeclaration);
+    }
+
     function getToken(sourceFile: SourceFile, pos: number): Node {
         const token = getTokenAtPosition(sourceFile, pos, /*includeJsDocComment*/ false);
         // this handles var ["computed"] = 12;

tests/baselines/reference/extendsUntypedModule.errors.txt

@@ -1,11 +1,11 @@
-/a.ts(2,8): error TS6133: 'Bar' is declared but its value is never read.
+/a.ts(2,1): error TS6192: No import of 'bar' is used.
 
 
 ==== /a.ts (1 errors) ====
     import Foo from "foo";
     import Bar from "bar"; // error: unused
-           ~~~
-!!! error TS6133: 'Bar' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of 'bar' is used.
     export class A extends Foo { }
 
 ==== /node_modules/foo/index.js (0 errors) ====

tests/baselines/reference/unusedImports1.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/file2.ts(1,9): error TS6133: 'Calculator' is declared but its value is never read.
+tests/cases/compiler/file2.ts(1,1): error TS6192: No import of './file1' is used.
 
 
 ==== tests/cases/compiler/file1.ts (0 errors) ====
@@ -8,5 +8,5 @@ tests/cases/compiler/file2.ts(1,9): error TS6133: 'Calculator' is declared but i
 
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     import {Calculator} from "./file1"
-            ~~~~~~~~~~
-!!! error TS6133: 'Calculator' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './file1' is used.

tests/baselines/reference/unusedImports12.errors.txt

@@ -1,22 +1,19 @@
-tests/cases/compiler/a.ts(1,10): error TS6133: 'Member' is declared but its value is never read.
-tests/cases/compiler/a.ts(2,8): error TS6133: 'd' is declared but its value is never read.
-tests/cases/compiler/a.ts(2,23): error TS6133: 'M' is declared but its value is never read.
-tests/cases/compiler/a.ts(3,13): error TS6133: 'ns' is declared but its value is never read.
+tests/cases/compiler/a.ts(1,1): error TS6192: No import of './b' is used.
+tests/cases/compiler/a.ts(2,1): error TS6192: No import of './b' is used.
+tests/cases/compiler/a.ts(3,1): error TS6192: No import of './b' is used.
 tests/cases/compiler/a.ts(4,8): error TS6133: 'r' is declared but its value is never read.
 
 
-==== tests/cases/compiler/a.ts (5 errors) ====
+==== tests/cases/compiler/a.ts (4 errors) ====
     import { Member } from './b';
-             ~~~~~~
-!!! error TS6133: 'Member' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './b' is used.
     import d, { Member as M } from './b';
-           ~
-!!! error TS6133: 'd' is declared but its value is never read.
-                          ~
-!!! error TS6133: 'M' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './b' is used.
     import * as ns from './b';
-                ~~
-!!! error TS6133: 'ns' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './b' is used.
     import r = require("./b");
            ~
 !!! error TS6133: 'r' is declared but its value is never read.

tests/baselines/reference/unusedImports2.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/file2.ts(2,9): error TS6133: 'test' is declared but its value is never read.
+tests/cases/compiler/file2.ts(2,1): error TS6192: No import of './file1' is used.
 
 
 ==== tests/cases/compiler/file1.ts (0 errors) ====
@@ -13,8 +13,8 @@ tests/cases/compiler/file2.ts(2,9): error TS6133: 'test' is declared but its val
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     import {Calculator} from "./file1"
     import {test} from "./file1"
-            ~~~~
-!!! error TS6133: 'test' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './file1' is used.
 
     var x = new Calculator();
     x.handleChar();

tests/baselines/reference/unusedImports6.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/file2.ts(1,8): error TS6133: 'd' is declared but its value is never read.
+tests/cases/compiler/file2.ts(1,1): error TS6192: No import of './file1' is used.
 
 
 ==== tests/cases/compiler/file1.ts (0 errors) ====
@@ -16,8 +16,8 @@ tests/cases/compiler/file2.ts(1,8): error TS6133: 'd' is declared but its value
 
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     import d from "./file1"
-           ~
-!!! error TS6133: 'd' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './file1' is used.
 
 
 

tests/baselines/reference/unusedImports7.errors.txt

@@ -1,4 +1,4 @@
-tests/cases/compiler/file2.ts(1,13): error TS6133: 'n' is declared but its value is never read.
+tests/cases/compiler/file2.ts(1,1): error TS6192: No import of './file1' is used.
 
 
 ==== tests/cases/compiler/file1.ts (0 errors) ====
@@ -16,7 +16,7 @@ tests/cases/compiler/file2.ts(1,13): error TS6133: 'n' is declared but its value
 
 ==== tests/cases/compiler/file2.ts (1 errors) ====
     import * as n from "./file1"
-                ~
-!!! error TS6133: 'n' is declared but its value is never read.
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './file1' is used.
 
 

tests/baselines/reference/unusedImports_entireImportDeclaration.errors.txt

@@ -0,0 +1,36 @@
+/b.ts(1,1): error TS6192: No import of './a' is used.
+/b.ts(2,1): error TS6192: No import of './a' is used.
+/b.ts(4,19): error TS6133: 'a2' is declared but its value is never read.
+/b.ts(4,28): error TS6133: 'b2' is declared but its value is never read.
+/b.ts(6,17): error TS6133: 'ns2' is declared but its value is never read.
+/b.ts(8,8): error TS6133: 'd5' is declared but its value is never read.
+
+
+==== /a.ts (0 errors) ====
+    export const a = 0;
+    export const b = 0;
+    export default 0;
+
+==== /b.ts (6 errors) ====
+    import d1, { a as a1, b as b1 } from "./a";
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './a' is used.
+    import d2, * as ns from "./a";
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS6192: No import of './a' is used.
+
+    import d3, { a as a2, b as b2 } from "./a";
+                      ~~
+!!! error TS6133: 'a2' is declared but its value is never read.
+                               ~~
+!!! error TS6133: 'b2' is declared but its value is never read.
+    d3;
+    import d4, * as ns2 from "./a";
+                    ~~~
+!!! error TS6133: 'ns2' is declared but its value is never read.
+    d4;
+    import d5, * as ns3 from "./a";
+           ~~
+!!! error TS6133: 'd5' is declared but its value is never read.
+    ns3;
+

tests/baselines/reference/unusedImports_entireImportDeclaration.js

@@ -0,0 +1,34 @@
+//// [tests/cases/compiler/unusedImports_entireImportDeclaration.ts] ////
+
+//// [a.ts]
+export const a = 0;
+export const b = 0;
+export default 0;
+
+//// [b.ts]
+import d1, { a as a1, b as b1 } from "./a";
+import d2, * as ns from "./a";
+
+import d3, { a as a2, b as b2 } from "./a";
+d3;
+import d4, * as ns2 from "./a";
+d4;
+import d5, * as ns3 from "./a";
+ns3;
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
+exports.a = 0;
+exports.b = 0;
+exports["default"] = 0;
+//// [b.js]
+"use strict";
+exports.__esModule = true;
+var a_1 = require("./a");
+a_1["default"];
+var a_2 = require("./a");
+a_2["default"];
+var ns3 = require("./a");
+ns3;

tests/baselines/reference/unusedImports_entireImportDeclaration.symbols

@@ -0,0 +1,45 @@
+=== /a.ts ===
+export const a = 0;
+>a : Symbol(a, Decl(a.ts, 0, 12))
+
+export const b = 0;
+>b : Symbol(b, Decl(a.ts, 1, 12))
+
+export default 0;
+
+=== /b.ts ===
+import d1, { a as a1, b as b1 } from "./a";
+>d1 : Symbol(d1, Decl(b.ts, 0, 6))
+>a : Symbol(a1, Decl(b.ts, 0, 12))
+>a1 : Symbol(a1, Decl(b.ts, 0, 12))
+>b : Symbol(b1, Decl(b.ts, 0, 21))
+>b1 : Symbol(b1, Decl(b.ts, 0, 21))
+
+import d2, * as ns from "./a";
+>d2 : Symbol(d2, Decl(b.ts, 1, 6))
+>ns : Symbol(ns, Decl(b.ts, 1, 10))
+
+import d3, { a as a2, b as b2 } from "./a";
+>d3 : Symbol(d3, Decl(b.ts, 3, 6))
+>a : Symbol(a2, Decl(b.ts, 3, 12))
+>a2 : Symbol(a2, Decl(b.ts, 3, 12))
+>b : Symbol(b2, Decl(b.ts, 3, 21))
+>b2 : Symbol(b2, Decl(b.ts, 3, 21))
+
+d3;
+>d3 : Symbol(d3, Decl(b.ts, 3, 6))
+
+import d4, * as ns2 from "./a";
+>d4 : Symbol(d4, Decl(b.ts, 5, 6))
+>ns2 : Symbol(ns2, Decl(b.ts, 5, 10))
+
+d4;
+>d4 : Symbol(d4, Decl(b.ts, 5, 6))
+
+import d5, * as ns3 from "./a";
+>d5 : Symbol(d5, Decl(b.ts, 7, 6))
+>ns3 : Symbol(ns3, Decl(b.ts, 7, 10))
+
+ns3;
+>ns3 : Symbol(ns3, Decl(b.ts, 7, 10))
+