From af4ea94efc1999f3b19fd8d643d0331f0b77e265 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 06:59:10 +0300 Subject: #824 Add a script to convert tabs to spaces in the code files --- scripts/code_tools/fix_whitespace.py | 83 ++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 scripts/code_tools/fix_whitespace.py (limited to 'scripts') diff --git a/scripts/code_tools/fix_whitespace.py b/scripts/code_tools/fix_whitespace.py new file mode 100644 index 0000000000..1c2ba00bb3 --- /dev/null +++ b/scripts/code_tools/fix_whitespace.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python +"""\ + +This script replaces tab characters with spaces in source code files. + +$LicenseInfo:firstyear=2024&license=viewerlgpl$ +Second Life Viewer Source Code +Copyright (C) 2024, Linden Research, Inc. + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; +version 2.1 of the License only. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA +$/LicenseInfo$ +""" + +import argparse +import os + +def convert_tabs_to_spaces(file_path, tab_stop): + """Convert tabs in a file to spaces, considering tab stops.""" + with open(file_path, 'r') as file: + lines = file.readlines() + + new_lines = [] + for line in lines: + # Remove trailing spaces + line = line.rstrip() + new_line = '' + column = 0 # Track the column index for calculating tab stops + for char in line: + if char == '\t': + # Calculate spaces needed to reach the next tab stop + spaces_needed = tab_stop - (column % tab_stop) + new_line += ' ' * spaces_needed + column += spaces_needed + else: + new_line += char + column += 1 + + new_lines.append(new_line + '\n') + + with open(file_path, 'w') as file: + file.writelines(new_lines) + +def process_directory(directory, extensions, tab_stop): + """Recursively process files in directory, considering tab stops.""" + extensions = tuple(extensions) + for root, dirs, files in os.walk(directory): + for file in files: + if file.endswith(extensions): + file_path = os.path.join(root, file) + print(f"Processing {file_path}") + convert_tabs_to_spaces(file_path, tab_stop) + +def main(): + parser = argparse.ArgumentParser(description='Convert tabs to spaces in files, considering tab stops.') + parser.add_argument('-e', '--extensions', type=str, default='cpp,h,hpp,inl,cmake', help='Comma-separated list of file extensions to process (default: "cpp,h,hpp,inl,cmake")') + parser.add_argument('-t', '--tabstop', type=int, default=4, help='Tab stop size (default: 4)') + parser.add_argument('-d', '--directory', type=str, required=True, help='Directory to process') + + args = parser.parse_args() + + extensions = args.extensions.split(',') + # Add a dot prefix to each extension if not present + extensions = [ext if ext.startswith('.') else f".{ext}" for ext in extensions] + + process_directory(args.directory, extensions, args.tabstop) + print("Processing completed.") + +if __name__ == "__main__": + main() -- cgit v1.2.3 From d48497268eef5738e2af8549d8962b281c6b4c71 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 1 May 2024 07:37:52 +0300 Subject: #824 Add c,py,glsl to the script's default file types --- scripts/code_tools/fix_whitespace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/code_tools/fix_whitespace.py b/scripts/code_tools/fix_whitespace.py index 1c2ba00bb3..37e15c6d10 100644 --- a/scripts/code_tools/fix_whitespace.py +++ b/scripts/code_tools/fix_whitespace.py @@ -66,7 +66,7 @@ def process_directory(directory, extensions, tab_stop): def main(): parser = argparse.ArgumentParser(description='Convert tabs to spaces in files, considering tab stops.') - parser.add_argument('-e', '--extensions', type=str, default='cpp,h,hpp,inl,cmake', help='Comma-separated list of file extensions to process (default: "cpp,h,hpp,inl,cmake")') + parser.add_argument('-e', '--extensions', type=str, default='c,cpp,h,hpp,inl,py,glsl,cmake', help='Comma-separated list of file extensions to process (default: "c,cpp,h,hpp,inl,py,glsl,cmake")') parser.add_argument('-t', '--tabstop', type=int, default=4, help='Tab stop size (default: 4)') parser.add_argument('-d', '--directory', type=str, required=True, help='Directory to process') -- cgit v1.2.3 From e7eced3c87310b15ac20cc3cd470d67686104a14 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Wed, 1 May 2024 07:58:22 +0300 Subject: #824 Don't fix tabs in files with no tabs --- scripts/code_tools/fix_whitespace.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'scripts') diff --git a/scripts/code_tools/fix_whitespace.py b/scripts/code_tools/fix_whitespace.py index 37e15c6d10..91e82f26f4 100644 --- a/scripts/code_tools/fix_whitespace.py +++ b/scripts/code_tools/fix_whitespace.py @@ -33,6 +33,10 @@ def convert_tabs_to_spaces(file_path, tab_stop): with open(file_path, 'r') as file: lines = file.readlines() + # Skip files with no tabs + if not any('\t' in line for line in lines): + return + new_lines = [] for line in lines: # Remove trailing spaces -- cgit v1.2.3