From patchwork Sun Mar 22 12:02:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3239 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B695760414 for ; Sun, 22 Mar 2020 13:02:39 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C1D32308 for ; Sun, 22 Mar 2020 13:02:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1584878559; bh=vi75NsTb4Z+bptfBBY1OrQI+31P9vFgQAnLZXjSo98w=; h=From:To:Subject:Date:From; b=wN1nf0c7grLIBaw2JgdK99eAny+TY6ODIBbyOtO1VlViPwkNPq1+fJ0xyyO4AZp6s 3mvt6d9OtnRLdUtn6qbUSiPXaB1CruyRWmT9dsB4IqbFBq0xFhEwK/thnG7tfE6GAD zZ5M6udmMdFKsSE85mGe3zEZVS4ltJGrGMqbuKEE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 22 Mar 2020 14:02:24 +0200 Message-Id: <20200322120225.31356-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/2] utils: checkstyle: Add formatter to sort #include statements X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 12:02:39 -0000 Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- utils/checkstyle.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 0827a1e6ba0f..5fd63f047781 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -481,6 +481,39 @@ class DoxygenFormatter(Formatter): return '\n'.join(lines) +class IncludeOrderFormatter(Formatter): + patterns = ('*.cpp', '*.h') + + include_regex = re.compile('^#include ["<]([^">]*)[">]') + + @classmethod + def format(cls, filename, data): + lines = [] + includes = [] + + for line in data.split('\n'): + match = IncludeOrderFormatter.include_regex.match(line) + if match: + includes.append((line, match.group(1))) + continue + + if len(includes): + includes.sort(key=lambda i: i[1]) + for include in includes: + lines.append(include[0]) + includes = [] + + lines.append(line) + + if len(includes): + includes.sort(key=lambda i: i[1]) + for include in includes: + lines.append(include[0]) + includes = [] + + return '\n'.join(lines) + + class StripTrailingSpaceFormatter(Formatter): patterns = ('*.c', '*.cpp', '*.h', '*.py', 'meson.build')