Skip to content

Commit d703e09

Browse files
committed
Merge pull request #5262 from zhengbli/Fix5127CR
Address code review from 5127
2 parents 8864b06 + b7c93c0 commit d703e09

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

src/compiler/core.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -739,13 +739,12 @@ namespace ts {
739739
export function isSupportedSourceFileName(fileName: string) {
740740
if (!fileName) { return false; }
741741

742-
let dotIndex = fileName.lastIndexOf(".");
743-
if (dotIndex < 0) {
744-
return false;
742+
for (let extension of supportedExtensions) {
743+
if (fileExtensionIs(fileName, extension)) {
744+
return true;
745+
}
745746
}
746-
747-
let extension = fileName.slice(dotIndex, fileName.length);
748-
return supportedExtensions.indexOf(extension) >= 0;
747+
return false;
749748
}
750749

751750
const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
@@ -846,7 +845,7 @@ namespace ts {
846845
export function copyListRemovingItem<T>(item: T, list: T[]) {
847846
let copiedList: T[] = [];
848847
for (var i = 0, len = list.length; i < len; i++) {
849-
if (list[i] != item) {
848+
if (list[i] !== item) {
850849
copiedList.push(list[i]);
851850
}
852851
}

src/server/editorServices.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ namespace ts.server {
735735
if (!(--project.projectService.directoryWatchersRefCount[directory])) {
736736
this.log("Close directory watcher for: " + directory);
737737
project.projectService.directoryWatchersForTsconfig[directory].close();
738-
project.projectService.directoryWatchersForTsconfig[directory] = undefined;
738+
delete project.projectService.directoryWatchersForTsconfig[directory];
739739
}
740740
}
741741
this.inferredProjects = copyListRemovingItem(project, this.inferredProjects);

0 commit comments

Comments
 (0)