microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-07 12:25:09 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'release-2.0.5' into FixNPMLocation

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-09-22 14:39:12 -07:00
parent 92ae0f1bbc 1fd0a8ca7d
commit 311e2851b9
4 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jakefile.js
View File

@@ -937,7 +937,7 @@ desc("Runs the tests using the built run.js file like 'jake runtests'. Syntax is
task("runtests-browser", ["tests", "browserify", builtLocalDirectory, servicesFileInBrowserTest], function () {
cleanTestDirs();
host = "node";
browser = process.env.browser || process.env.b || "IE";
browser = process.env.browser || process.env.b || (os.platform() === "linux" ? "chrome" : "IE");
tests = process.env.test || process.env.tests || process.env.t;
var light = process.env.light || false;
var testConfigFile = 'test.config';

50
src/harness/unittests/tsserverProjectSystem.ts
View File

@@ -1939,7 +1939,7 @@ namespace ts.projectSystem {
content: JSON.stringify({ compilerOptions: { allowJs: true }, exclude: ["node_modules"] })
};
const host = createServerHost([f1, barjs, barTypings, config]);
const projectService = createProjectService(host, { typingsInstaller: new TestTypingsInstaller(typingsCacheLocation, 5, host) });
const projectService = createProjectService(host, { typingsInstaller: new TestTypingsInstaller(typingsCacheLocation, /*throttleLimit*/ 5, host) });
projectService.openClientFile(f1.path);
projectService.checkNumberOfProjects({ configuredProjects: 1 });
@@ -1987,4 +1987,52 @@ namespace ts.projectSystem {
assert.deepEqual(s3, newPerFileSettings, "file settings should still be the same with per-file settings");
});
});
describe("watching @types", () => {
it("works correctly when typings are added or removed", () => {
const f1 = {
path: "/a/b/app.ts",
content: "let x = 1;"
};
const t1 = {
path: "/a/b/node_modules/@types/lib1/index.d.ts",
content: "export let a: number"
};
const t2 = {
path: "/a/b/node_modules/@types/lib2/index.d.ts",
content: "export let b: number"
};
const tsconfig = {
path: "/a/b/tsconfig.json",
content: JSON.stringify({
compilerOptions: {},
exclude: ["node_modules"]
})
};
const host = createServerHost([f1, t1, tsconfig]);
const projectService = createProjectService(host);
projectService.openClientFile(f1.path);
projectService.checkNumberOfProjects({ configuredProjects: 1 });
checkProjectActualFiles(projectService.configuredProjects[0], [f1.path, t1.path]);
// delete t1
host.reloadFS([f1, tsconfig]);
host.triggerDirectoryWatcherCallback("/a/b/node_modules/@types", "lib1");
// run throttled operation
host.runQueuedTimeoutCallbacks();
projectService.checkNumberOfProjects({ configuredProjects: 1 });
checkProjectActualFiles(projectService.configuredProjects[0], [f1.path]);
// create t2
host.reloadFS([f1, tsconfig, t2]);
host.triggerDirectoryWatcherCallback("/a/b/node_modules/@types", "lib2");
// run throttled operation
host.runQueuedTimeoutCallbacks();
projectService.checkNumberOfProjects({ configuredProjects: 1 });
checkProjectActualFiles(projectService.configuredProjects[0], [f1.path, t2.path]);
});
});
}

2
src/server/scriptVersionCache.ts
View File

@@ -526,7 +526,7 @@ namespace ts.server {
}
if (this.root.charCount() === 0) {
// TODO: assert deleteLength === 0
if (newText) {
if (newText !== undefined) {
this.load(LineIndex.linesFromText(newText).lines);
return this;
}

14
src/services/services.ts
View File

@@ -3154,6 +3154,13 @@ namespace ts {
}
}
const typeRootsVersion = host.getTypeRootsVersion ? host.getTypeRootsVersion() : 0;
if (lastTypesRootVersion !== typeRootsVersion) {
log("TypeRoots version has changed; provide new program");
program = undefined;
lastTypesRootVersion = typeRootsVersion;
}
// Get a fresh cache of the host information
let hostCache = new HostCache(host, getCanonicalFileName);
@@ -3221,13 +3228,6 @@ namespace ts {
};
}
const typeRootsVersion = host.getTypeRootsVersion ? host.getTypeRootsVersion() : 0;
if (lastTypesRootVersion !== typeRootsVersion) {
log("TypeRoots version has changed; provide new program");
program = undefined;
lastTypesRootVersion = typeRootsVersion;
}
const documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
const newProgram = createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);