development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-18 01:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace configuredProfilesOnly with includeDetectedProfiles

Browse source 
Little nicer as default is false now
This commit is contained in:
Daniel Imms 2021-05-13 05:40:57 -07:00
parent fb991820c9
commit 2373db009e
4 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/platform/terminal/node/ptyHostService.ts
View file

@ -220,8 +220,7 @@ export class PtyHostService extends Disposable implements IPtyService {
return this._proxy.getDefaultSystemShell(osOverride);
}
async getProfiles(includeDetectedProfiles: boolean = false): Promise<ITerminalProfile[]> {
// TODO: invert config only arg
return detectAvailableProfiles(!includeDetectedProfiles, this._buildSafeConfigProvider(), undefined, this._logService, this._resolveVariables.bind(this));
return detectAvailableProfiles(includeDetectedProfiles, this._buildSafeConfigProvider(), undefined, this._logService, this._resolveVariables.bind(this));
}
getEnvironment(): Promise<IProcessEnvironment> {
return this._proxy.getEnvironment();

6
src/vs/platform/terminal/node/ptyService.ts
View file

@ -177,12 +177,6 @@ export class PtyService extends Disposable implements IPtyService {
return getSystemShell(osOverride, process.env);
}
// async getProfiles(includeDetectedProfiles: boolean = false): Promise<ITerminalProfile[]> {
// const safeConfigProvider = this._buildSafeConfigProvider(await this._extHostConfiguration.getConfigProvider());
// return detectAvailableProfiles(configuredProfilesOnly, safeConfigProvider, undefined, this._logService, await this._variableResolverPromise, this._lastActiveWorkspace);
// }
async getEnvironment(): Promise<IProcessEnvironment> {
return { ...process.env };
}

16
src/vs/platform/terminal/node/terminalProfiles.ts
View file

@ -18,7 +18,7 @@ import { isMacintosh, isWindows } from 'vs/base/common/platform';
let profileSources: Map<string, IPotentialTerminalProfile> | undefined;
export function detectAvailableProfiles(
configuredProfilesOnly: boolean,
includeDetectedProfiles: boolean,
safeConfigProvider: SafeConfigProvider,
fsProvider?: IFsProvider,
logService?: ILogService,
@ -32,7 +32,7 @@ export function detectAvailableProfiles(
};
if (isWindows) {
return detectAvailableWindowsProfiles(
configuredProfilesOnly,
includeDetectedProfiles,
fsProvider,
logService,
safeConfigProvider('terminal.integrated.useWslProfiles') || true,
@ -45,7 +45,7 @@ export function detectAvailableProfiles(
return detectAvailableUnixProfiles(
fsProvider,
logService,
configuredProfilesOnly,
includeDetectedProfiles,
safeConfigProvider(`terminal.integrated.profiles.${isMacintosh ? 'osx' : 'linux'}`),
safeConfigProvider(`terminal.integrated.defaultProfile.${isMacintosh ? 'osx' : 'linux'}`),
testPaths,
@ -55,7 +55,7 @@ export function detectAvailableProfiles(
}
async function detectAvailableWindowsProfiles(
configuredProfilesOnly: boolean,
includeDetectedProfiles: boolean,
fsProvider: IFsProvider,
logService?: ILogService,
useWslProfiles?: boolean,
@ -82,7 +82,7 @@ async function detectAvailableWindowsProfiles(
const detectedProfiles: Map<string, ITerminalProfileObject> = new Map();
// Add auto detected profiles
if (!configuredProfilesOnly) {
if (includeDetectedProfiles) {
detectedProfiles.set('PowerShell', {
source: ProfileSource.Pwsh,
icon: Codicon.terminalPowershell.id,
@ -116,7 +116,7 @@ async function detectAvailableWindowsProfiles(
const resultProfiles: ITerminalProfile[] = await transformToTerminalProfiles(detectedProfiles.entries(), defaultProfileName, fsProvider, logService, variableResolver, workspaceFolder);
if (!configuredProfilesOnly || (configuredProfilesOnly && useWslProfiles)) {
if (includeDetectedProfiles || (!includeDetectedProfiles && useWslProfiles)) {
try {
const result = await getWslProfiles(`${system32Path}\\${useWSLexe ? 'wsl' : 'bash'}.exe`, defaultProfileName);
if (result) {
@ -256,7 +256,7 @@ async function getWslProfiles(wslPath: string, defaultProfileName: string | unde
async function detectAvailableUnixProfiles(
fsProvider: IFsProvider,
logService?: ILogService,
configuredProfilesOnly?: boolean,
includeDetectedProfiles?: boolean,
configProfiles?: { [key: string]: ITerminalProfileObject },
defaultProfileName?: string,
testPaths?: string[],
@ -266,7 +266,7 @@ async function detectAvailableUnixProfiles(
const detectedProfiles: Map<string, ITerminalProfileObject> = new Map();
// Add non-quick launch profiles
if (!configuredProfilesOnly) {
if (includeDetectedProfiles) {
const contents = await fsProvider.readFile('/etc/shells', 'utf8');
const profiles = testPaths || contents.split('\n').filter(e => e.trim().indexOf('#') !== 0 && e.trim().length > 0);
const counts: Map<string, number> = new Map();

9
src/vs/workbench/contrib/terminal/browser/terminalService.ts
View file

@ -325,7 +325,7 @@ export class TerminalService implements ITerminalService {
@throttle(10000)
private async _refreshAvailableProfiles(): Promise<void> {
const result = await this._detectProfiles(true);
const result = await this._detectProfiles();
if (!equals(result, this._availableProfiles)) {
this._availableProfiles = result;
this._onDidChangeAvailableProfiles.fire(this._availableProfiles);
@ -333,13 +333,12 @@ export class TerminalService implements ITerminalService {
}
}
// TODO: Invert arg
private async _detectProfiles(configuredProfilesOnly: boolean): Promise<ITerminalProfile[]> {
private async _detectProfiles(includeDetectedProfiles?: boolean): Promise<ITerminalProfile[]> {
const offProcService = this._offProcessTerminalService;
if (!offProcService) {
return this._availableProfiles || [];
}
return offProcService?.getProfiles(!configuredProfilesOnly);
return offProcService?.getProfiles(includeDetectedProfiles);
}
private _onBeforeShutdown(reason: ShutdownReason): boolean | Promise<boolean> {
@ -748,7 +747,7 @@ export class TerminalService implements ITerminalService {
async showProfileQuickPick(type: 'setDefault' | 'createInstance', cwd?: string | URI): Promise<ITerminalInstance | undefined> {
let keyMods: IKeyMods | undefined;
const profiles = await this._detectProfiles(false);
const profiles = await this._detectProfiles(true);
const platformKey = await this._getPlatformKey();
const options: IPickOptions<IProfileQuickPickItem> = {