Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JavaScript LS scaffolding + JS module inference #5266

Merged
merged 14 commits into from
Nov 10, 2015
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove obsolute AMD logic from reference preprocessing in services
RyanCavanaugh committed Oct 17, 2015
commit 61b71008d71be7c65c3c75657c85875b810b1482
16 changes: 1 addition & 15 deletions src/services/services.ts
Original file line number Diff line number Diff line change
@@ -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++;
}

48 changes: 0 additions & 48 deletions tests/cases/unittests/services/preProcessFile.ts
Original file line number Diff line number Diff line change
@@ -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
});
});
});
});