Merge pull request microsoft#159617 from microsoft/tyriar/lgtm

Action lgtm.io alerts in terminal

Author: Tyriar

src/vs/platform/terminal/common/terminalProfiles.ts

@@ -93,8 +93,8 @@ export function terminalIconsEqual(iconOne?: TerminalIcon, iconTwo?: TerminalIco
 	if (ThemeIcon.isThemeIcon(iconOne) && ThemeIcon.isThemeIcon(iconTwo)) {
 		return iconOne.id === iconTwo.id && iconOne.color === iconTwo.color;
 	}
-	if (typeof iconOne === 'object' && iconOne && 'light' in iconOne && 'dark' in iconOne
-		&& typeof iconTwo === 'object' && iconTwo && 'light' in iconTwo && 'dark' in iconTwo) {
+	if (typeof iconOne === 'object' && 'light' in iconOne && 'dark' in iconOne
+		&& typeof iconTwo === 'object' && 'light' in iconTwo && 'dark' in iconTwo) {
 		const castedIcon = (iconOne as { light: unknown; dark: unknown });
 		const castedIconTwo = (iconTwo as { light: unknown; dark: unknown });
 		if ((URI.isUri(castedIcon.light) || isUriComponents(castedIcon.light)) && (URI.isUri(castedIcon.dark) || isUriComponents(castedIcon.dark))

src/vs/platform/terminal/node/ptyService.ts

@@ -381,7 +381,7 @@ export class PtyService extends Disposable implements IPtyService {
 			const persistentProcess = this._throwIfNoPty(persistentProcessId);
 			const processDetails = persistentProcess && await this._buildProcessDetails(t.terminal, persistentProcess, revivedPtyId !== undefined);
 			return {
-				terminal: { ...processDetails, id: persistentProcessId } ?? null,
+				terminal: { ...processDetails, id: persistentProcessId },
 				relativeSize: t.relativeSize
 			};
 		} catch (e) {

src/vs/platform/terminal/node/terminalEnvironment.ts

@@ -133,10 +133,8 @@ export function getShellIntegrationInjection(
 			if (!newArgs) {
 				return undefined;
 			}
-			if (newArgs) {
-				newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
-				newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
-			}
+			newArgs = [...newArgs]; // Shallow clone the array to avoid setting the default array
+			newArgs[newArgs.length - 1] = format(newArgs[newArgs.length - 1], appRoot, '');
 			return { newArgs, envMixin };
 		}
 		logService.warn(`Shell integration cannot be enabled for executable "${shellLaunchConfig.executable}" and args`, shellLaunchConfig.args);

src/vs/platform/terminal/node/terminalProfiles.ts

@@ -122,7 +122,7 @@ async function detectAvailableWindowsProfiles(
 
 	const resultProfiles: ITerminalProfile[] = await transformToTerminalProfiles(detectedProfiles.entries(), defaultProfileName, fsProvider, shellEnv, logService, variableResolver);
 
-	if (includeDetectedProfiles || (!includeDetectedProfiles && useWslProfiles)) {
+	if (includeDetectedProfiles || useWslProfiles) {
 		try {
 			const result = await getWslProfiles(`${system32Path}\\${useWSLexe ? 'wsl' : 'bash'}.exe`, defaultProfileName);
 			for (const wslProfile of result) {

src/vs/workbench/contrib/terminal/browser/terminalProfileQuickpick.ts

@@ -124,7 +124,7 @@ export class TerminalProfileQuickpick {
 				if (!name) {
 					return;
 				}
-				const newConfigValue: { [key: string]: ITerminalProfileObject } = { ...configProfiles } ?? {};
+				const newConfigValue: { [key: string]: ITerminalProfileObject } = { ...configProfiles };
 				newConfigValue[name] = {
 					path: context.item.profile.path,
 					args: context.item.profile.args
@@ -223,7 +223,7 @@ export class TerminalProfileQuickpick {
 			}
 			const argsString = profile.args.map(e => {
 				if (e.includes(' ')) {
-					return `"${e.replace('/"/g', '\\"')}"`;
+					return `"${e.replace(/"/g, '\\"')}"`;
 				}
 				return e;
 			}).join(' ');

src/vs/workbench/contrib/terminal/browser/terminalProfileResolverService.ts

@@ -195,7 +195,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 		if (URI.isUri(icon) || isUriComponents(icon)) {
 			return URI.revive(icon);
 		}
-		if (typeof icon === 'object' && icon && 'light' in icon && 'dark' in icon) {
+		if (typeof icon === 'object' && 'light' in icon && 'dark' in icon) {
 			const castedIcon = (icon as { light: unknown; dark: unknown });
 			if ((URI.isUri(castedIcon.light) || isUriComponents(castedIcon.light)) && (URI.isUri(castedIcon.dark) || isUriComponents(castedIcon.dark))) {
 				return { light: URI.revive(castedIcon.light), dark: URI.revive(castedIcon.dark) };
@@ -469,7 +469,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 	}
 
 	private _isValidAutomationProfile(profile: unknown, os: OperatingSystem): profile is ITerminalProfile {
-		if (!profile === undefined || typeof profile !== 'object' || profile === null) {
+		if (profile === null || profile === undefined || typeof profile !== 'object') {
 			return false;
 		}
 		if ('path' in profile && typeof (profile as { path: unknown }).path === 'string') {
@@ -497,7 +497,7 @@ export abstract class BaseTerminalProfileResolverService implements ITerminalPro
 								await this._configurationService.updateValue(TerminalSettingPrefix.DefaultProfile + this._primaryBackendOs, profile);
 								this._logService.trace(`migrated from shell/shellArgs, using existing profile ${profile}`);
 							} else {
-								const profiles = { ...this._configurationService.inspect<Readonly<{ [key: string]: ITerminalProfileObject }>>(TerminalSettingPrefix.Profiles + this._primaryBackendOs).userValue } || {};
+								const profiles = { ...this._configurationService.inspect<Readonly<{ [key: string]: ITerminalProfileObject }>>(TerminalSettingPrefix.Profiles + this._primaryBackendOs).userValue };
 								const profileConfig: ITerminalProfileObject = { path: profile.path };
 								if (profile.args) {
 									profileConfig.args = profile.args;

src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.ts

@@ -394,7 +394,7 @@ export class XtermTerminal extends DisposableStore implements IXtermTerminal, II
 		let endSpaces = 0;
 		// line.length may exceed cols as it doesn't necessarily trim the backing array on resize
 		for (let i = Math.min(line.length, this.raw.cols) - 1; i >= 0; i--) {
-			if (line && !line?.getCell(i)?.getChars()) {
+			if (!line?.getCell(i)?.getChars()) {
 				endSpaces++;
 			} else {
 				break;