JavaScriptBench
diff --git a/Collapse file
‎src/compiler/checker.ts‎
Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+6Lines changed: 6 additions & 0 deletions b/Collapse file
‎src/compiler/checker.ts‎
Copy file name to clipboardExpand all lines: src/compiler/checker.ts
+6Lines changed: 6 additions & 0 deletions
diff --git a/Collapse file
‎src/compiler/core.ts‎
Copy file name to clipboardExpand all lines: src/compiler/core.ts
+5Lines changed: 5 additions & 0 deletions b/Collapse file
‎src/compiler/core.ts‎
Copy file name to clipboardExpand all lines: src/compiler/core.ts
+5Lines changed: 5 additions & 0 deletions
diff --git a/Collapse file
‎src/compiler/diagnosticMessages.json‎
Copy file name to clipboardExpand all lines: src/compiler/diagnosticMessages.json
+4Lines changed: 4 additions & 0 deletions b/Collapse file
‎src/compiler/diagnosticMessages.json‎
Copy file name to clipboardExpand all lines: src/compiler/diagnosticMessages.json
+4Lines changed: 4 additions & 0 deletions
diff --git a/Collapse file
‎tests/baselines/reference/importDeclTypes.errors.txt‎
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions b/Collapse file
‎tests/baselines/reference/importDeclTypes.errors.txt‎
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
diff --git a/Collapse file
‎tests/baselines/reference/importDeclTypes.js‎
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/Collapse file
‎tests/baselines/reference/importDeclTypes.js‎
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
diff --git a/Collapse file
‎tests/cases/compiler/importDeclTypes.ts‎
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions b/Collapse file
‎tests/cases/compiler/importDeclTypes.ts‎
Copy file name to clipboard
+9Lines changed: 9 additions & 0 deletions
@@ -1642,6 +1642,12 @@ namespace ts {
                 return;
             }
 
+            if (startsWith(moduleReference, "@types/")) {
+                const diag = Diagnostics.Cannot_import_type_declaration_files_Consider_importing_0_instead_of_1;
+                const withoutAtTypePrefix = removePrefix(moduleReference, "@types/");
+                error(errorNode, diag, withoutAtTypePrefix, moduleReference);
+            }
+
             const ambientModule = tryFindAmbientModule(moduleName, /*withAugmentations*/ true);
             if (ambientModule) {
                 return ambientModule;
 
@@ -1764,6 +1764,11 @@ namespace ts {
         return str.lastIndexOf(prefix, 0) === 0;
     }
 
+    /* @internal */
+    export function removePrefix(str: string, prefix: string): string {
+        return startsWith(str, prefix) ? str.substr(prefix.length) : str;
+    }
+
     /* @internal */
     export function endsWith(str: string, suffix: string): boolean {
         const expectedPos = str.length - suffix.length;
 
@@ -3061,6 +3061,10 @@
         "category": "Message",
         "code": 6136
     },
+    "Cannot import type declaration files. Consider importing '{0}' instead of '{1}'.": {
+        "category": "Error",
+        "code": 6137
+    },
     "Property '{0}' is declared but never used.": {
         "category": "Error",
         "code": 6138
 
@@ -0,0 +1,14 @@
+tests/cases/compiler/a.ts(1,21): error TS6137: Cannot import type declaration files. Consider importing 'foo-bar' instead of '@types/foo-bar'.
+
+
+==== /node_modules/@types/foo-bar/index.d.ts (0 errors) ====
+    export interface Foo {
+        bar: string;
+    }
+    
+    // This should error
+==== tests/cases/compiler/a.ts (1 errors) ====
+    import { Foo } from "@types/foo-bar";
+                        ~~~~~~~~~~~~~~~~
+!!! error TS6137: Cannot import type declaration files. Consider importing 'foo-bar' instead of '@types/foo-bar'.
+    
@@ -0,0 +1,15 @@
+//// [tests/cases/compiler/importDeclTypes.ts] ////
+
+//// [index.d.ts]
+export interface Foo {
+    bar: string;
+}
+
+// This should error
+//// [a.ts]
+import { Foo } from "@types/foo-bar";
+
+
+//// [a.js]
+"use strict";
+exports.__esModule = true;
@@ -0,0 +1,9 @@
+
+// @filename: /node_modules/@types/foo-bar/index.d.ts
+export interface Foo {
+    bar: string;
+}
+
+// This should error
+// @filename: a.ts
+import { Foo } from "@types/foo-bar";