Skip to content

tsconfig.json exclude LS support #3546

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
merged 5 commits into from
Jul 16, 2015
Merged

tsconfig.json exclude LS support #3546

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afb15c
CoreServicesShimHost and CoreServicesShimHostAdapter changes to suppo…
jramsay Jun 18, 2015
22d3894
Merge pull request #3877 from Microsoft/port-3797-to-master
vladima Jul 15, 2015
52423f0
CoreServicesShimHost and CoreServicesShimHostAdapter changes to suppo…
jramsay Jun 18, 2015
785804e
Merge branch 'tsConfigExcludeLSSupport' of https://github.com/Microso…
jramsay Jul 15, 2015
dea66a6
Fix comment spacing for readDirectory in shims.ts
jramsay Jul 15, 2015
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
23 changes: 19 additions & 4 deletions src/services/shims.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,13 @@ namespace ts {

/** Public interface of the the of a config service shim instance.*/
export interface CoreServicesShimHost extends Logger {
/** Returns a JSON-encoded value of the type: string[] */
readDirectory(rootDir: string, extension: string): string;
/**
* Returns a JSON-encoded value of the type: string[]
*
* @param exclude A JSON encoded string[] containing the paths to exclude
* when enumerating the directory.
*/
readDirectory(rootDir: string, extension: string, exclude?: string): string;
}

///
Expand Down Expand Up @@ -386,8 +391,18 @@ namespace ts {
constructor(private shimHost: CoreServicesShimHost) {
}

public readDirectory(rootDir: string, extension: string): string[] {
var encoded = this.shimHost.readDirectory(rootDir, extension);
public readDirectory(rootDir: string, extension: string, exclude: string[]): string[] {
// Wrap the API changes for 1.5 release. This try/catch
// should be removed once TypeScript 1.5 has shipped.
// Also consider removing the optional designation for
// the exclude param at this time.
var encoded: string;
try {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you actually need the try/catch? If your implementation of readDirectory doesn't expect an argument, it should silently ignore it. (I might be misunderstanding the fix)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is calling into the managed side from the script side. It's not clear to me what will happen if we call managed from JS and pass too many arguments along.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we pass too many arguments, and there is a CoreServicesHost mismatch, it will throw. We then fallback to the old call without the JSON encoded exclude string array. (This is a similar to the fallback we already have in place for getDefaultLibFileName)

encoded = this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude));
}
catch (e) {
encoded = this.shimHost.readDirectory(rootDir, extension);
}
return JSON.parse(encoded);
}
}
Expand Down