Re-adds single line statement (if) rules

Author: eamodio

eslint.config.mjs

@@ -23,6 +23,7 @@ export default ts.config(
 		},
 		rules: {
 			'anti-trojan-source/no-bidi': 'error',
+			curly: ['error', 'multi-line', 'consistent'],
 			'no-constant-condition': ['warn', { checkLoops: false }],
 			'no-constant-binary-expression': 'error',
 			'no-caller': 'error',
@@ -44,6 +45,31 @@ export default ts.config(
 			'no-mixed-spaces-and-tabs': 'off',
 			'no-restricted-globals': ['error', 'process'],
 			'no-restricted-imports': 'off',
+			'no-restricted-syntax': [
+				'error',
+				{
+					selector:
+						'IfStatement:not(:has(BlockStatement)):not(:has(ReturnStatement)):not(:has(BreakStatement)):not(:has(ContinueStatement)):not(:has(YieldExpression)):not(:has(ThrowStatement))',
+					message:
+						'Single-line if statements are only allowed for control flow (return, break, continue, throw, yield).',
+				},
+				{
+					selector: 'WhileStatement:not(:has(BlockStatement))',
+					message: 'Single-line while statements are not allowed.',
+				},
+				{
+					selector: 'ForStatement:not(:has(BlockStatement))',
+					message: 'Single-line for statements are not allowed.',
+				},
+				{
+					selector: 'ForInStatement:not(:has(BlockStatement))',
+					message: 'Single-line for-in statements are not allowed.',
+				},
+				{
+					selector: 'ForOfStatement:not(:has(BlockStatement))',
+					message: 'Single-line for-of statements are not allowed.',
+				},
+			],
 			'no-return-assign': 'error',
 			'no-return-await': 'warn',
 			'no-self-compare': 'error',

src/commands/quickCommand.steps.ts

@@ -1267,8 +1267,9 @@ export function* pickCommitsStep<
 	},
 ): StepResultGenerator<GitRevisionReference[]> {
 	async function getItems(log: GitLog | undefined) {
-		if (log == null)
+		if (log == null) {
 			return [createDirectiveQuickPickItem(Directive.Back, true), createDirectiveQuickPickItem(Directive.Cancel)];
+		}
 
 		const items = [];
 

src/plus/gk/account/subscriptionService.ts

@@ -814,7 +814,9 @@ export class SubscriptionService implements Disposable {
 						window.onDidChangeWindowState,
 						2,
 					)(e => {
-						if (e.focused) resolve(true);
+						if (e.focused) {
+							resolve(true);
+						}
 					}),
 				),
 				new Promise<boolean>(resolve =>

src/plus/integrations/providers/github/githubGitProvider.ts

@@ -3713,7 +3713,9 @@ export class GitHubGitProvider implements GitProvider, Disposable {
 		]);
 
 		ref = getSettledValue(branchResults)?.values[0]?.sha ?? getSettledValue(tagResults)?.values[0]?.sha;
-		if (ref == null) debugger;
+		if (ref == null) {
+			debugger;
+		}
 
 		return ref;
 	}

src/plus/launchpad/launchpadIndicator.ts

@@ -104,9 +104,9 @@ export class LaunchpadIndicator implements Disposable {
 	private async maybeLoadData(forceIfConnected: boolean = false) {
 		if (this.pollingEnabled) {
 			if (await this.provider.hasConnectedIntegration()) {
-				if (this._state === 'load' && this._categorizedItems != null && !forceIfConnected)
+				if (this._state === 'load' && this._categorizedItems != null && !forceIfConnected) {
 					this.updateStatusBarState('load', this._categorizedItems);
-				else {
+				} else {
 					this.updateStatusBarState('loading');
 				}
 			} else {

src/plus/webviews/graph/graphWebview.ts

@@ -3695,8 +3695,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 
 		switch (refType) {
 			case 'branch':
-				if (!isGraphItemRefContext(item, 'branch') && !isGraphItemTypedContext(item, 'upstreamStatus'))
+				if (!isGraphItemRefContext(item, 'branch') && !isGraphItemTypedContext(item, 'upstreamStatus')) {
 					return { active: undefined, selection: [] };
+				}
 				break;
 			case 'revision':
 				if (!isGraphItemRefContext(item, 'revision')) return { active: undefined, selection: [] };

src/system/logger.scope.ts

@@ -33,12 +33,13 @@ export function getLogScope(): LogScope | undefined {
 }
 
 export function getNewLogScope(prefix: string, scope: LogScope | boolean | undefined): LogScope {
-	if (scope != null && typeof scope !== 'boolean')
+	if (scope != null && typeof scope !== 'boolean') {
 		return {
 			scopeId: scope.scopeId,
 			prevScopeId: scope.prevScopeId,
 			prefix: `${scope.prefix}${prefix}`,
 		};
+	}
 
 	const prevScopeId = scope ? logScopeIdGenerator.current : undefined;
 	const scopeId = logScopeIdGenerator.next();

tests/e2e/specs/baseTest.ts

@@ -75,6 +75,8 @@ export const test = base.extend<TestFixtures>({
 			tempDirs.push(tempDir);
 			return tempDir;
 		});
-		for (const tempDir of tempDirs) await fs.promises.rm(tempDir, { recursive: true });
+		for (const tempDir of tempDirs) {
+			await fs.promises.rm(tempDir, { recursive: true });
+		}
 	},
 });