Skip to content

Fixes #151203 #172936

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
hediet merged 2 commits into from
Feb 1, 2023
Merged

Fixes #151203 #172936

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
024de16
Fixes #151203
hediet Jan 31, 2023
132fb03
Merge branch 'main' into hediet/eventual-shrimp
hediet Feb 1, 2023
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
9 changes: 4 additions & 5 deletions src/vs/platform/instantiation/common/instantiation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ export const IInstantiationService = createDecorator<IInstantiationService>('ins
* Given a list of arguments as a tuple, attempt to extract the leading, non-service arguments
* to their own tuple.
*/
export type GetLeadingNonServiceArgs<Args> =
Args extends [...BrandedService[]] ? []
: Args extends [infer A, ...BrandedService[]] ? [A]
: Args extends [infer A, ...infer R] ? [A, ...GetLeadingNonServiceArgs<R>]
: never;
export type GetLeadingNonServiceArgs<TArgs extends any[]> =
TArgs extends [] ? []
: TArgs extends [...infer TFirst, BrandedService] ? GetLeadingNonServiceArgs<TFirst>
: TArgs;

export interface IInstantiationService {

Expand Down