From 8f8c5de5136251246a48b3e7ac0d2f09f194619b Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Tue, 1 Nov 2022 15:44:48 +0100 Subject: [PATCH 1/2] Remove a few `export`s --- src/vs/platform/debug/common/extensionHostDebug.ts | 7 ------- src/vs/workbench/contrib/debug/common/debug.ts | 12 ++++-------- .../common/configurationResolver.ts | 6 +++--- .../configurationResolver/common/variableResolver.ts | 2 +- 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/vs/platform/debug/common/extensionHostDebug.ts b/src/vs/platform/debug/common/extensionHostDebug.ts index 3176cf851edf5..a519f90d28272 100644 --- a/src/vs/platform/debug/common/extensionHostDebug.ts +++ b/src/vs/platform/debug/common/extensionHostDebug.ts @@ -32,13 +32,6 @@ export interface IOpenExtensionWindowResult { success: boolean; } -/** - * Like a IProcessEnvironment, but the value "null" deletes an environment variable - */ -export interface INullableProcessEnvironment { - [key: string]: string | null; -} - export interface IExtensionHostDebugService { readonly _serviceBrand: undefined; diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts index 8698a9c0f2886..2dce710e824dc 100644 --- a/src/vs/workbench/contrib/debug/common/debug.ts +++ b/src/vs/workbench/contrib/debug/common/debug.ts @@ -725,7 +725,7 @@ export interface IDebugAdapterFactory extends ITerminalLauncher { substituteVariables(folder: IWorkspaceFolder | undefined, config: IConfig): Promise; } -export interface IDebugAdapterExecutableOptions { +interface IDebugAdapterExecutableOptions { cwd?: string; env?: { [key: string]: string }; } @@ -748,12 +748,12 @@ export interface IDebugAdapterNamedPipeServer { readonly path: string; } -export interface IDebugAdapterInlineImpl extends IDisposable { +interface IDebugAdapterInlineImpl extends IDisposable { readonly onDidSendMessage: Event; handleMessage(message: DebugProtocol.Message): void; } -export interface IDebugAdapterImpl { +interface IDebugAdapterImpl { readonly type: 'implementation'; readonly implementation: IDebugAdapterInlineImpl; } @@ -821,11 +821,7 @@ export interface IDebugAdapterDescriptorFactory { createDebugAdapterDescriptor(session: IDebugSession): Promise; } -export interface IDebugAdapterTrackerFactory { - readonly type: string; -} - -export interface ITerminalLauncher { +interface ITerminalLauncher { runInTerminal(args: DebugProtocol.RunInTerminalRequestArguments, sessionId: string): Promise; } diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts index f8bf1cb3ecade..135ff269e947e 100644 --- a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts @@ -55,7 +55,7 @@ export interface IConfigurationResolverService { contributeVariable(variable: string, resolution: () => Promise): void; } -export interface PromptStringInputInfo { +interface PromptStringInputInfo { id: string; type: 'promptString'; description: string; @@ -63,7 +63,7 @@ export interface PromptStringInputInfo { password?: boolean; } -export interface PickStringInputInfo { +interface PickStringInputInfo { id: string; type: 'pickString'; description: string; @@ -71,7 +71,7 @@ export interface PickStringInputInfo { default?: string; } -export interface CommandInputInfo { +interface CommandInputInfo { id: string; type: 'command'; command: string; diff --git a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts index 5b512c36a6a12..1da1b0334df4c 100644 --- a/src/vs/workbench/services/configurationResolver/common/variableResolver.ts +++ b/src/vs/workbench/services/configurationResolver/common/variableResolver.ts @@ -17,7 +17,7 @@ import { IWorkspaceFolder } from 'vs/platform/workspace/common/workspace'; import { ILabelService } from 'vs/platform/label/common/label'; import { replaceAsync } from 'vs/base/common/strings'; -export interface IVariableResolveContext { +interface IVariableResolveContext { getFolderUri(folderName: string): uri | undefined; getWorkspaceFolderCount(): number; getConfigurationValue(folderUri: uri | undefined, section: string): string | undefined; From 137e79cf6af214780c75bcb5a28db418210b82e6 Mon Sep 17 00:00:00 2001 From: Andre Weinand Date: Tue, 1 Nov 2022 17:48:42 +0100 Subject: [PATCH 2/2] don't omit indirect exports --- src/vs/workbench/contrib/debug/common/debug.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/debug/common/debug.ts b/src/vs/workbench/contrib/debug/common/debug.ts index 2dce710e824dc..c7c954b65c10d 100644 --- a/src/vs/workbench/contrib/debug/common/debug.ts +++ b/src/vs/workbench/contrib/debug/common/debug.ts @@ -725,7 +725,7 @@ export interface IDebugAdapterFactory extends ITerminalLauncher { substituteVariables(folder: IWorkspaceFolder | undefined, config: IConfig): Promise; } -interface IDebugAdapterExecutableOptions { +export interface IDebugAdapterExecutableOptions { cwd?: string; env?: { [key: string]: string }; } @@ -748,12 +748,12 @@ export interface IDebugAdapterNamedPipeServer { readonly path: string; } -interface IDebugAdapterInlineImpl extends IDisposable { +export interface IDebugAdapterInlineImpl extends IDisposable { readonly onDidSendMessage: Event; handleMessage(message: DebugProtocol.Message): void; } -interface IDebugAdapterImpl { +export interface IDebugAdapterImpl { readonly type: 'implementation'; readonly implementation: IDebugAdapterInlineImpl; }