diff options
Diffstat (limited to 'src/vs/workbench/services/environment/electron-sandbox/environmentService.ts')
| -rw-r--r-- | src/vs/workbench/services/environment/electron-sandbox/environmentService.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts index f675b6800ed..a18fa598d41 100644 --- a/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts +++ b/src/vs/workbench/services/environment/electron-sandbox/environmentService.ts @@ -128,6 +128,9 @@ export class NativeWorkbenchEnvironmentService extends AbstractNativeEnvironment get filesToDiff(): IPath[] | undefined { return this.configuration.filesToDiff; } @memoize + get filesToMerge(): IPath[] | undefined { return this.configuration.filesToMerge; } + + @memoize get filesToWait(): IPathsToWaitFor | undefined { return this.configuration.filesToWait; } constructor( |