From 5ea0664c9235082c2538aedc24894cdd3e644cb8 Mon Sep 17 00:00:00 2001 From: HiroshiYa <44447201+hiroshi-ya@users.noreply.github.com> Date: Fri, 23 Feb 2024 01:54:15 +0900 Subject: [PATCH 1/2] Update keys.py curly bracket check For property DOWN and UP, do not add curly brackets if self is already braced by curly brackets --- ahk/keys.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ahk/keys.py b/ahk/keys.py index 6eb0c85..4686cfa 100644 --- a/ahk/keys.py +++ b/ahk/keys.py @@ -23,11 +23,19 @@ def name(self) -> str: @property def DOWN(self) -> str: - return '{' + f'{self.name} down' + '}' + nameLen = len(self.name) + if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced + return f'{self.name[0:nameLen-1]} down' + '}' + else: + return '{' + f'{self.name} down' + '}' @property def UP(self) -> str: - return '{' + f'{self.name} up' + '}' + nameLen = len(self.name) + if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced + return f'{self.name[0:nameLen-1]} up' + '}' + else: + return '{' + f'{self.name} up' + '}' def __str__(self) -> str: return '{' + self.name + '}' From ac9a2ad51a2b5ab617bc712001a7f61d5cec906f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 17:10:01 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ahk/keys.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ahk/keys.py b/ahk/keys.py index 4686cfa..7434947 100644 --- a/ahk/keys.py +++ b/ahk/keys.py @@ -24,7 +24,7 @@ def name(self) -> str: @property def DOWN(self) -> str: nameLen = len(self.name) - if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced + if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced return f'{self.name[0:nameLen-1]} down' + '}' else: return '{' + f'{self.name} down' + '}' @@ -32,7 +32,7 @@ def DOWN(self) -> str: @property def UP(self) -> str: nameLen = len(self.name) - if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced + if '{' == self.name[0] and nameLen > 1: # don't add extra curly brackets if already braced return f'{self.name[0:nameLen-1]} up' + '}' else: return '{' + f'{self.name} up' + '}'