Remove obsolute AMD logic from reference preprocessing in services

RyanCavanaugh · RyanCavanaugh · commit 61b71008d71b · 2015-10-16T17:35:43.000-07:00
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -2351,21 +2351,7 @@ namespace ts {
                 while (token !== SyntaxKind.CloseBracketToken && token !== SyntaxKind.EndOfFileToken) {
                     // record string literals as module names
                     if (token === SyntaxKind.StringLiteral) {
-                        const moduleName = scanner.getTokenValue();
-                        // record first item in the list only if its name is not "require"
-                        // record second item in the list only if its name is not "exports"
-                        // record third item in the list only if its name is not "module"
-                        // record all other items in the list unconditionally
-                        const shouldRecordName =
-                            i === 0
-                                ? moduleName !== "require"
-                                : i === 1
-                                    ? moduleName !== "exports"
-                                    : i !== 2 || moduleName !== "module";
-                              
-                        if (shouldRecordName) {
-                            recordModuleName();
-                        }
+                        recordModuleName();
                         i++;
                     }
 
diff --git a/tests/cases/unittests/services/preProcessFile.ts b/tests/cases/unittests/services/preProcessFile.ts
@@ -262,54 +262,6 @@ describe('PreProcessFile:', function () {
                     isLibFile: false
                 })
         });
-        it("Excludes require/exports/module names from dependency lists in define(modName, [deplist]) calls in JavaScript files", function () {
-            test(`
-            define(["require", "exports", "module", "mod1", "mod2"], (m1, m2) => {
-            });
-            `,
-                /* readImports */true,
-                /* detectJavaScriptImports */ true,
-                {
-                    referencedFiles: [],
-                    importedFiles: [
-                        { fileName: "mod1", pos: 53, end: 57 },
-                        { fileName: "mod2", pos: 61, end: 65 },
-                    ],
-                    ambientExternalModules: undefined,
-                    isLibFile: false
-                });
-
-            test(`
-            define(["require", "exports", "mod1", "module"], (m1, m2) => {
-            });
-            `,
-                /* readImports */true,
-                /* detectJavaScriptImports */ true,
-                {
-                    referencedFiles: [],
-                    importedFiles: [
-                        { fileName: "mod1", pos: 43, end: 47 },
-                        { fileName: "module", pos: 51, end: 57 },
-                    ],
-                    ambientExternalModules: undefined,
-                    isLibFile: false
-                });
-            test(`
-            define(["require", "require", "exports"], (m1, m2) => {
-            });
-            `,
-                /* readImports */true,
-                /* detectJavaScriptImports */ true,
-                {
-                    referencedFiles: [],
-                    importedFiles: [
-                        { fileName: "require", pos: 32, end: 39 },
-                        { fileName: "exports", pos: 43, end: 50 },
-                    ],
-                    ambientExternalModules: undefined,
-                    isLibFile: false
-                });
-        });
     });
 });
 
