Skip to content

Commit 76f8b2c

Browse files
author
Kartik Raj
committed
Try to fix compile errors
1 parent 16a8093 commit 76f8b2c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/vs/workbench/api/common/extHostTerminalService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export interface IExtHostTerminalService extends ExtHostTerminalServiceShape, ID
5050
registerLinkProvider(provider: vscode.TerminalLinkProvider): vscode.Disposable;
5151
registerProfileProvider(extension: IExtensionDescription, id: string, provider: vscode.TerminalProfileProvider): vscode.Disposable;
5252
registerTerminalQuickFixProvider(id: string, extensionId: string, provider: vscode.TerminalQuickFixProvider): vscode.Disposable;
53-
getEnvironmentVariableCollection(extension: IExtensionDescription): vscode.EnvironmentVariableCollection & { getScopedEnvironmentVariableCollection(scope: vscode.EnvironmentVariableScope | undefined): vscode.EnvironmentVariableCollection };
53+
getEnvironmentVariableCollection(extension: IExtensionDescription): vscode.EnvironmentVariableCollection | { getScopedEnvironmentVariableCollection(scope: vscode.EnvironmentVariableScope | undefined): vscode.EnvironmentVariableCollection };
5454
}
5555

5656
export interface ITerminalInternalOptions {
@@ -823,7 +823,7 @@ export abstract class BaseExtHostTerminalService extends Disposable implements I
823823
return index;
824824
}
825825

826-
public getEnvironmentVariableCollection(extension: IExtensionDescription): vscode.EnvironmentVariableCollection & { getScopedEnvironmentVariableCollection(scope: vscode.EnvironmentVariableScope | undefined): vscode.EnvironmentVariableCollection } {
826+
public getEnvironmentVariableCollection(extension: IExtensionDescription): vscode.EnvironmentVariableCollection | { getScopedEnvironmentVariableCollection(scope: vscode.EnvironmentVariableScope | undefined): vscode.EnvironmentVariableCollection } {
827827
let collection = this._environmentVariableCollections.get(extension.identifier.value);
828828
if (!collection) {
829829
collection = new EnvironmentVariableCollection();

src/vscode-dts/vscode.proposed.envCollectionWorkspace.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ declare module 'vscode' {
1414
*
1515
* @param scope The scope to which the environment variable collection applies to.
1616
*/
17-
readonly environmentVariableCollection: EnvironmentVariableCollection & { getScopedEnvironmentVariableCollection(scope: EnvironmentVariableScope): EnvironmentVariableCollection };
17+
readonly environmentVariableCollection: EnvironmentVariableCollection | { getScopedEnvironmentVariableCollection(scope: EnvironmentVariableScope): EnvironmentVariableCollection };
1818
}
1919

2020
export type EnvironmentVariableScope = {

0 commit comments

Comments
 (0)