style: Convert leading spaces to tabs in Generals by bobtista · Pull Request #2562 · TheSuperHackers/GeneralsGameCode

bobtista · 2026-04-09T19:08:32Z

Summary

Convert leading spaces/mixed whitespace to tabs, including access specifier indentation
All changes are whitespace-only (git diff -w is empty)
Uses tree-sitter-cpp for accurate C++ parsing with macro preprocessing

Access specifiers (public:/private:/protected:) are placed at the class
brace level, matching the existing codebase convention.

Script

The formatting script is included in the PR for reference but is not intended
to be merged — it shows how the changes were generated.

See scripts/cpp/convert_leading_spaces_to_tabs.py for details.

Part 2 of 4 — Generals/ (425 files).
See also: #2561, #2563, #2564.

…tabs

greptile-apps · 2026-04-09T19:12:53Z

Greptile Summary

This PR converts leading spaces (and mixed whitespace) to tabs across 470 files in Generals/ using a tree-sitter–based Python script. The core claim — that git diff -w is empty — has been verified: git diff -w across all changed C++ files produces exactly 0 bytes, confirming all changes are purely whitespace with no effect on code logic.

Confidence Score: 5/5

Safe to merge — all 470 C++ file changes are verified whitespace-only by git diff -w, with zero non-whitespace modifications.

git diff -w across all Generals/ files produces 0 bytes, conclusively confirming no logic changes. The sole new artifact is the reference Python script, which has only a minor edge-case P2 issue that does not affect the already-applied conversion.

scripts/cpp/convert_leading_spaces_to_tabs.py has a minor block-comment detection edge case, but this does not affect the correctness of any C++ file in this PR.

Important Files Changed

Filename	Overview
scripts/cpp/convert_leading_spaces_to_tabs.py	New reference script using tree-sitter for accurate C++ indentation analysis; contains a minor edge-case bug where a `//` comment containing `/` without a closing `/` can incorrectly set `in_block_comment = True` for subsequent lines
Generals/Code/GameEngine/Include/Common/BitFlags.h	Whitespace-only conversion: leading spaces replaced with tabs; verified no non-whitespace changes by git diff -w
Generals/Code/GameEngine/Source/GameLogic/Object/Object.cpp	Whitespace-only conversion: stray leading spaces and mixed space/tab indentation normalized to tabs; no logic changes
Generals/Code/GameEngine/Source/GameLogic/AI/AI.cpp	Whitespace-only conversion; passes git diff -w check
Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h	Whitespace-only conversion; access specifiers placed at class-brace level per codebase convention

Prompt To Fix All With AI

This is a comment left during a code review.
Path: scripts/cpp/convert_leading_spaces_to_tabs.py
Line: 409-414

Comment:
**`//` comment containing `/*` can incorrectly open block-comment state**

If a processed line contains `/*` inside a `//` comment with no matching `*/` on the same line (e.g. `foo(); // uses /* notation`), `in_block_comment` is set to `True`. The next line(s) will be treated as inside a block comment and skipped, until a `*/` is seen. This causes those lines to be silently left unconverted on future runs of the script.

Adding a guard for `//` comments before checking for `/*` would fix this:

```python
        # Track mid-line block comment opens (e.g. /**< trailing doc comments)
        line_comment_pos = stripped.find('//')
        last_open = stripped.rfind('/*')
        if last_open >= 0 and (line_comment_pos < 0 or last_open < line_comment_pos):
            after_open = stripped[last_open + 2:]
            if '*/' not in after_open:
                in_block_comment = True
```

How can I resolve this? If you propose a fix, please make it concise.

_{Reviews (4): Last reviewed commit: "style: Preserve indentation inside prepr..." | Re-trigger Greptile}

…ipt and re-run

Skyaero42

Ive only reviewed the first 100 files or so.

Skyaero42 · 2026-04-12T12:36:38Z

Generals/Code/GameEngine/Include/Common/GameEngine.h


 	virtual void execute();											/**< The "main loop" of the game engine.
-																								 It will not return until the game exits. */
+	It will not return until the game exits. */


The indentation here is an issue imho and should be resolved before this PR (or optionally in this PR) rather then after.

I think a multi-line comment needs to be above the parameter/function, i.e.

/** The "main loop" of the game engine. It will not return until the game exits. */ virtual void execute();

Or as java would do:

/** * The "main loop" of the game engine. * It will not return until the game exits. */ virtual void execute();

This is a much nicer way to do it and more in the style of a proper documentation comment.

Skyaero42 · 2026-04-12T12:37:24Z

Generals/Code/GameEngine/Include/Common/GlobalData.h

 	Bool m_selectionFlashHouseColor ;  /// skip the house color and just use white.

 	Real m_cameraAudibleRadius;				///< If the camera is being used as the position of audio, then how far can we hear?
 	Real m_groupMoveClickToGatherFactor; /** if you take all the selected units and calculate the smallest possible rectangle


Place documentation comment before field parameter

Skyaero42 · 2026-04-12T12:37:55Z

Generals/Code/GameEngine/Include/Common/ThingTemplate.h

 	Bool					m_isPrerequisite;							///< Is this thing considered in a prerequisite for any other thing?
 	Bool					m_isBridge;										///< True if this model is a bridge.
- 	Bool					m_isBuildFacility;						///< is this the build facility for something? (calculated based on other template's prereqs)
+		Bool					m_isBuildFacility;						///< is this the build facility for something? (calculated based on other template's prereqs)


incorrect indentation

Skyaero42 · 2026-04-12T12:38:48Z

Generals/Code/GameEngine/Include/GameLogic/AI.h

-  Object*									m_obj;
-  Object*									m_otherObj;
-  const Team*							m_team;
+		CommandSourceType				m_cmdSource;


Incorrect indentation

Skyaero42 · 2026-04-12T12:39:04Z

Generals/Code/GameEngine/Include/GameLogic/AI.h

-  const PolygonTrigger*   m_polygon;
-  Int											m_intValue;       /// misc usage
-  DamageInfo							m_damage;
+		const Waypoint*         m_waypoint;


Incorrect indentation

Skyaero42 · 2026-04-12T12:45:58Z

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

 {
 	for( PlayerTeamList::const_iterator it = m_playerTeamPrototypes.begin();
-			 it != m_playerTeamPrototypes.end(); ++it )
+	it != m_playerTeamPrototypes.end(); ++it )


INcorrect indentation, a few more times in this file

Skyaero42 · 2026-04-12T12:46:46Z

Generals/Code/GameEngine/Source/Common/RTS/Team.cpp

 	for( DLINK_ITERATOR< Object > objIt = iterate_TeamMemberList();
-			 objIt.done() == FALSE;
-			 objIt.advance() )
+	objIt.done() == FALSE;


Incorrect indentation

Skyaero42 · 2026-04-12T12:47:25Z

Generals/Code/GameEngine/Source/Common/System/BuildAssistant.cpp

-			 y < halfFootprintHeight + sampleResolution;
-			 y += sampleResolution )
+	y < halfFootprintHeight + sampleResolution;
+	y += sampleResolution )


Incorrect indentation x2

Skyaero42 · 2026-04-12T12:47:46Z

Generals/Code/GameEngine/Source/Common/System/StackDump.cpp

 {
 MYEIP1:
- mov eax, MYEIP1
+		mov eax, MYEIP1


Incorrect indentation

Skyaero42 · 2026-04-12T12:48:03Z

Generals/Code/GameEngine/Source/Common/System/StackDump.cpp

 {
 MYEIP2:
- mov eax, MYEIP2
+		mov eax, MYEIP2


Incorrect indentation

bobtista added 5 commits April 9, 2026 15:08

style: Add tree-sitter based script to convert leading spaces to tabs

d5b0b33

style: Remove mixed-whitespace skip to convert all leading spaces to …

5a76b38

…tabs

style: Add macro preprocessing to fix tree-sitter parse errors

0f0037d

style: Handle access specifier indentation in formatting script

8b97daf

style: Convert leading spaces to tabs in Generals

5ab8410

This was referenced Apr 9, 2026

style: Convert leading spaces to tabs in Core and Dependencies #2561

Open

style: Convert leading spaces to tabs in GeneralsMD GameEngine #2563

Open

style: Convert leading spaces to tabs in GeneralsMD Libraries and Tools #2564

Open

fix: Handle braceless control-flow body indentation in conversion scr…

91e7384

…ipt and re-run

Skyaero42 reviewed Apr 12, 2026

View reviewed changes

bobtista added 2 commits April 12, 2026 12:07

style: Fix script edge cases and re-run on Generals

a660616

style: Preserve indentation inside preprocessor blocks and re-run

d1c5c5b

Conversation

bobtista commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Script

Uh oh!

greptile-apps bot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Greptile Summary

Confidence Score: 5/5

Important Files Changed

Uh oh!

Skyaero42 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bobtista commented Apr 9, 2026 •

edited

Loading

greptile-apps bot commented Apr 9, 2026 •

edited

Loading