Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyriar committed Aug 6, 2024
1 parent a9c14dd commit 1456e64
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
nonce: this.shellIntegrationNonce
},
windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
windowsUseConptyDll: this._terminalConfigurationService.config.experimental.windowsUseConptyDll,
windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
environmentVariableCollections: this._extEnvironmentVariableCollection?.collections ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
workspaceFolder: this._cwdWorkspaceFolder,
};
Expand Down Expand Up @@ -494,7 +494,7 @@ export class TerminalProcessManager extends Disposable implements ITerminalProce
nonce: this.shellIntegrationNonce
},
windowsEnableConpty: this._terminalConfigurationService.config.windowsEnableConpty,
windowsUseConptyDll: this._terminalConfigurationService.config.experimental.windowsUseConptyDll,
windowsUseConptyDll: this._terminalConfigurationService.config.experimental?.windowsUseConptyDll ?? false,
environmentVariableCollections: this._extEnvironmentVariableCollection ? serializeEnvironmentVariableCollections(this._extEnvironmentVariableCollection.collections) : undefined,
workspaceFolder: this._cwdWorkspaceFolder,
};
Expand Down
4 changes: 2 additions & 2 deletions src/vs/workbench/contrib/terminal/common/terminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ export interface ITerminalConfiguration {
smoothScrolling: boolean;
ignoreBracketedPasteMode: boolean;
rescaleOverlappingGlyphs: boolean;
experimental: {
windowsUseConptyDll: boolean;
experimental?: {
windowsUseConptyDll?: boolean;
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ suite('Workbench - TerminalInstance', () => {
unicodeVersion: '6',
shellIntegration: {
enabled: true
},
experimental: {
windowsUseConptyDll: false
}
}
},
Expand Down

0 comments on commit 1456e64

Please sign in to comment.