Skip to content

Check getCurrentDirectory availability in getEffectiveTypeRoots #9396

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
zhengbli merged 2 commits into from
Jun 28, 2016
Merged

Check getCurrentDirectory availability in getEffectiveTypeRoots #9396

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ff91b8
Add getCurrentDirectory to ServerHost
zhengbli Jun 28, 2016
d5cad23
Add nullchecks for typeRoots, remove getCurrentDirectory from ServerH…
zhengbli Jun 28, 2016
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
Prev Previous commit
Add nullchecks for typeRoots, remove getCurrentDirectory from ServerH… 
…ost as it is always the installation location
  • Loading branch information
@zhengbli
zhengbli committed Jun 28, 2016
commit d5cad239e858ca71e89aa8963a7d875928652a65
10 changes: 6 additions & 4 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ namespace ts {
const failedLookupLocations: string[] = [];

// Check primary library paths
if (typeRoots.length) {
if (typeRoots && typeRoots.length) {
if (traceEnabled) {
trace(host, Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
}
Expand Down Expand Up @@ -1060,9 +1060,11 @@ namespace ts {
let result: string[] = [];
if (host.directoryExists && host.getDirectories) {
const typeRoots = getEffectiveTypeRoots(options, host);
for (const root of typeRoots) {
if (host.directoryExists(root)) {
result = result.concat(host.getDirectories(root));
if (typeRoots) {
for (const root of typeRoots) {
if (host.directoryExists(root)) {
result = result.concat(host.getDirectories(root));
}
}
}
}
Expand Down
1 change: 0 additions & 1 deletion src/server/editorServices.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ namespace ts.server {
this.moduleResolutionHost = {
fileExists: fileName => this.fileExists(fileName),
readFile: fileName => this.host.readFile(fileName),
getCurrentDirectory: () => this.host.getCurrentDirectory(),
directoryExists: directoryName => this.host.directoryExists(directoryName)
};
}
Expand Down