Skip to content

Normalize ProjectService.currentDirectory #24139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minestarks merged 2 commits into from
May 22, 2018
Merged

Normalize ProjectService.currentDirectory #24139

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ab3c1f
Normalize this.currentDirectory
minestarks May 15, 2018
dff5809
Accept new baseline
minestarks May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/server/editorServices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ namespace ts.server {
/* @internal */
pendingEnsureProjectForOpenFiles: boolean;

readonly currentDirectory: string;
readonly currentDirectory: NormalizedPath;
readonly toCanonicalFileName: (f: string) => string;

public readonly host: ServerHost;
Expand Down Expand Up @@ -450,7 +450,7 @@ namespace ts.server {
if (this.host.realpath) {
this.realpathToScriptInfos = createMultiMap();
}
this.currentDirectory = this.host.getCurrentDirectory();
this.currentDirectory = toNormalizedPath(this.host.getCurrentDirectory());
this.toCanonicalFileName = createGetCanonicalFileName(this.host.useCaseSensitiveFileNames);
this.globalCacheLocationDirectoryPath = this.typingsInstaller.globalTypingsCacheLocation &&
ensureTrailingDirectorySeparator(this.toPath(this.typingsInstaller.globalTypingsCacheLocation));
Expand Down