microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 20:25:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Refactor to avoid errors

Browse Source
This commit is contained in:
uniqueiniquity 2017-12-29 14:21:55 -08:00
parent ee5e8e3eee
commit b0321dc177
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/typingsInstaller/typingsInstaller.ts
View File

@ -55,7 +55,7 @@ namespace ts.server.typingsInstaller {
try {
if (fileExists) {
const content = <TypeDeclarationTimestampFile>JSON.parse(host.readFile(typeDeclarationTimestampFilePath));
return content.entries;
return content.entries || {};
}
else {
host.writeFile(typeDeclarationTimestampFilePath, "{}");
@ -247,10 +247,11 @@ namespace ts.server.typingsInstaller {
continue;
}
const existingTypingFile = this.packageNameToTypingLocation.get(packageName);
if (existingTypingFile.typingLocation === typingFile) {
continue;
}
if (existingTypingFile) {
if (existingTypingFile.typingLocation === typingFile) {
continue;
}
if (this.log.isEnabled()) {
this.log.writeLine(`New typing for package ${packageName} from '${typingFile}' conflicts with existing typing file '${existingTypingFile}'`);
}