Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to handle file names in module resolution watching and createGetCanonicalFileName (#36106)

Browse Source 
* Add test case to verify directory casing preservation when watching

* Fix unicode file name handling when watching failed lookup locations

* Add special file name lower conversion routine and use that instead of toLowerCase
Fixes #31819 and #35559

* Remove unicode from code

* Replace toLocaleLowerCase on filenames with ts.toFileNameLowerCase

* Make the intent of using toFileNameLowerCase more clear and why we make the restriction on turkish I with dot on top of it

* Update baselines for newly added tests in master
This commit is contained in:
Sheetal Nandi
2020-01-31 10:40:57 -08:00
committed by GitHub
parent ad8feb5f90
commit 80ad0de87e
185 changed files with 2867 additions and 2696 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/testRunner/unittests/paths.ts
+18
View File
@@ -289,4 +289,22 @@ describe("unittests:: core paths", () => {
assert.strictEqual(ts.getRelativePathFromDirectory("file:///a/b/c", "file:///a/b", /*ignoreCase*/ false), "..");
assert.strictEqual(ts.getRelativePathFromDirectory("file:///c:", "file:///d:", /*ignoreCase*/ false), "file:///d:/");
});
it("toFileNameLowerCase", () => {
assert.strictEqual(
ts.toFileNameLowerCase("/user/UserName/projects/Project/file.ts"),
"/user/username/projects/project/file.ts"
);
assert.strictEqual(
ts.toFileNameLowerCase("/user/UserName/projects/projectß/file.ts"),
"/user/username/projects/projectß/file.ts"
);
assert.strictEqual(
ts.toFileNameLowerCase("/user/UserName/projects/İproject/file.ts"),
"/user/username/projects/İproject/file.ts"
);
assert.strictEqual(
ts.toFileNameLowerCase("/user/UserName/projects/ı/file.ts"),
"/user/username/projects/ı/file.ts"
);
});
});
src/testRunner/unittests/tsserver/watchEnvironment.ts
+99 -20
View File
@@ -286,6 +286,7 @@ namespace ts.projectSystem {
files,
f => f.path.toLowerCase(),
f => [{
directoryName: f.path,
fallbackPollingInterval: f === configFile ? PollingInterval.High : PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -299,7 +300,8 @@ namespace ts.projectSystem {
arrayToMap(
["/a/b", "/a/b/node_modules/@types"],
identity,
() => [{
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -337,7 +339,10 @@ namespace ts.projectSystem {
arrayToMap(
files,
f => f.path.toLowerCase(),
() => [PollingInterval.Low]
f => [{
fileName: f.path,
pollingInterval: PollingInterval.Low
}]
)
);
checkWatchedDirectoriesDetailed(
@@ -348,7 +353,8 @@ namespace ts.projectSystem {
arrayToMap(
["/a/b", "/a/b/node_modules/@types"],
identity,
() => [{
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -380,15 +386,19 @@ namespace ts.projectSystem {
files.map(f => f.path).concat(commonFile1.path)
);
const filePaths = files.map(f => f.path.toLowerCase());
const filePaths = files.map(f => f.path);
const allFilePaths = filePaths.concat(["/a/b", "/a/b/node_modules/@types"]);
checkWatchedFilesDetailed(
host,
filePaths.concat(["/a/b", "/a/b/node_modules/@types"]),
allFilePaths.map(toLowerCase),
1,
arrayToMap(
filePaths.concat(["/a/b", "/a/b/node_modules/@types"]),
identity,
f => [contains(filePaths, f) ? PollingInterval.Low : PollingInterval.Medium]
allFilePaths,
toLowerCase,
fileName => [{
fileName,
pollingInterval: contains(filePaths, fileName) ? PollingInterval.Low : PollingInterval.Medium
}]
)
);
checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
@@ -422,7 +432,10 @@ namespace ts.projectSystem {
arrayToMap(
[libFile, commonFile2],
f => f.path.toLowerCase(),
() => [PollingInterval.Low]
f => [{
fileName: f.path,
pollingInterval: PollingInterval.Low
}]
)
);
// Config file with the setting with fsWatch
@@ -432,9 +445,10 @@ namespace ts.projectSystem {
1,
/*recursive*/ false,
arrayToMap(
[configFile.path.toLowerCase()],
identity,
() => [{
[configFile.path],
toLowerCase,
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.High,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -448,7 +462,8 @@ namespace ts.projectSystem {
arrayToMap(
["/a/b", "/a/b/node_modules/@types"],
identity,
() => [{
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -482,7 +497,10 @@ namespace ts.projectSystem {
arrayToMap(
files,
f => f.path.toLowerCase(),
() => [PollingInterval.Low]
f => [{
fileName: f.path,
pollingInterval: PollingInterval.Low
}]
)
);
checkWatchedDirectoriesDetailed(
@@ -493,7 +511,8 @@ namespace ts.projectSystem {
arrayToMap(
["/a/b", "/a/b/node_modules/@types"],
identity,
() => [{
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
@@ -529,19 +548,79 @@ namespace ts.projectSystem {
files.map(f => f.path).concat(commonFile1.path)
);
const filePaths = files.map(f => f.path.toLowerCase());
const filePaths = files.map(f => f.path);
const allFilePaths = filePaths.concat(["/a/b", "/a/b/node_modules/@types"]);
checkWatchedFilesDetailed(
host,
filePaths.concat(["/a/b", "/a/b/node_modules/@types"]),
allFilePaths.map(toLowerCase),
1,
arrayToMap(
filePaths.concat(["/a/b", "/a/b/node_modules/@types"]),
identity,
f => [contains(filePaths, f) ? PollingInterval.Low : PollingInterval.Medium]
allFilePaths,
toLowerCase,
fileName => [{
fileName,
pollingInterval: contains(filePaths, fileName) ? PollingInterval.Low : PollingInterval.Medium
}]
)
);
checkWatchedDirectories(host, emptyArray, /*recursive*/ false);
checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
});
});
describe("unittests:: tsserver:: watchEnvironment:: file names on case insensitive file system", () => {
function verifyFileNames(projectRoot: string, projectRootPath: string) {
const keyMapper = (str: string) => str.replace(projectRoot, projectRootPath);
const file: File = {
path: `${projectRoot}/foo.ts`,
content: `import { foo } from "bar"`
};
const host = createServerHost([file, libFile]);
const service = createProjectService(host);
service.openClientFile(file.path, /*fileContent*/ undefined, /*scriptKind*/ undefined, projectRoot);
const expectedWatchFiles = [libFile.path, `${projectRoot}/tsconfig.json`, `${projectRoot}/jsconfig.json`];
checkWatchedFilesDetailed(
host,
expectedWatchFiles.map(keyMapper),
1,
arrayToMap(
expectedWatchFiles,
keyMapper,
fileName => [{
fileName,
pollingInterval: PollingInterval.Low
}]
)
);
checkWatchedDirectories(host, [], /*recursive*/ false);
const expectedWatchedDirectories = [`${projectRoot}/node_modules`, `${projectRoot}/node_modules/@types`];
checkWatchedDirectoriesDetailed(
host,
expectedWatchedDirectories.map(keyMapper),
1,
/*recursive*/ true,
arrayToMap(
expectedWatchedDirectories,
keyMapper,
directoryName => [{
directoryName,
fallbackPollingInterval: PollingInterval.Medium,
fallbackOptions: { watchFile: WatchFileKind.PriorityPollingInterval }
}]
)
);
}
it("project with ascii file names", () => {
verifyFileNames("/User/userName/Projects/I", "/user/username/projects/i");
});
it("project with ascii file names with i", () => {
verifyFileNames("/User/userName/Projects/i", "/user/username/projects/i");
});
it("project with unicode file names", () => {
verifyFileNames("/User/userName/Projects/İ", "/user/username/projects/İ");
});
});
}