Merge branch 'master' into parse-jsdoc-with-ts-type-parser

This commit is contained in:
Nathan Shively-Sanders
2017-07-14 15:04:06 -07:00
15 changed files with 95 additions and 87 deletions

View File

@@ -565,7 +565,7 @@ namespace ts.codefix {
function getRelativePath(path: string, directoryPath: string) {
const relativePath = getRelativePathToDirectoryOrUrl(directoryPath, path, directoryPath, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
return moduleHasNonRelativeName(relativePath) ? "./" + relativePath : relativePath;
return !pathIsRelative(relativePath) ? "./" + relativePath : relativePath;
}
}