Skip to content

Preserve whitespace before : in except handlers without as #1473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Thanatos9404 wants to merge 1 commit into
base: main
Choose a base branch
from
+126 −13
Open

Preserve whitespace before : in except handlers without as #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions libcst/_nodes/tests/test_try.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,60 @@ class TryTest(CSTNodeTest):
),
"code": "try: pass\nexcept ValueError, RuntimeError: pass\n",
},
# Whitespace before the colon without an as name
{
"node": cst.Try(
cst.SimpleStatementSuite((cst.Pass(),)),
handlers=(
cst.ExceptHandler(
cst.SimpleStatementSuite((cst.Pass(),)),
type=cst.Name("Exception"),
whitespace_before_colon=cst.SimpleWhitespace(" "),
),
),
),
"code": "try: pass\nexcept Exception : pass\n",
"parser": parse_statement,
},
# Whitespace before the colon after a parenthesized tuple
{
"node": cst.Try(
cst.SimpleStatementSuite((cst.Pass(),)),
handlers=(
cst.ExceptHandler(
cst.SimpleStatementSuite((cst.Pass(),)),
type=cst.Tuple(
[
cst.Element(
cst.Name("IOError"),
comma=cst.Comma(
whitespace_after=cst.SimpleWhitespace(" ")
),
),
cst.Element(cst.Name("ImportError")),
]
),
whitespace_before_colon=cst.SimpleWhitespace(" "),
),
),
),
"code": "try: pass\nexcept (IOError, ImportError) : pass\n",
"parser": parse_statement,
},
# A bare except keeps its space in whitespace_after_except
{
"node": cst.Try(
cst.SimpleStatementSuite((cst.Pass(),)),
handlers=(
cst.ExceptHandler(
cst.SimpleStatementSuite((cst.Pass(),)),
whitespace_after_except=cst.SimpleWhitespace(" "),
),
),
),
"code": "try: pass\nexcept : pass\n",
"parser": parse_statement,
},
)
)
def test_valid(self, **kwargs: Any) -> None:
Expand Down Expand Up @@ -636,6 +690,46 @@ class TryStarTest(CSTNodeTest):
"code": "try: pass\nexcept* ValueError, RuntimeError: pass\n",
"parser": native_parse_statement,
},
# Whitespace before the colon without an as name
{
"node": cst.TryStar(
cst.SimpleStatementSuite((cst.Pass(),)),
handlers=(
cst.ExceptStarHandler(
cst.SimpleStatementSuite((cst.Pass(),)),
type=cst.Name("Exception"),
whitespace_before_colon=cst.SimpleWhitespace(" "),
),
),
),
"code": "try: pass\nexcept* Exception : pass\n",
"parser": native_parse_statement,
},
# Whitespace before the colon after a parenthesized tuple
{
"node": cst.TryStar(
cst.SimpleStatementSuite((cst.Pass(),)),
handlers=(
cst.ExceptStarHandler(
cst.SimpleStatementSuite((cst.Pass(),)),
type=cst.Tuple(
[
cst.Element(
cst.Name("IOError"),
comma=cst.Comma(
whitespace_after=cst.SimpleWhitespace(" ")
),
),
cst.Element(cst.Name("ImportError")),
]
),
whitespace_before_colon=cst.SimpleWhitespace(" "),
),
),
),
"code": "try: pass\nexcept* (IOError, ImportError) : pass\n",
"parser": native_parse_statement,
},
)
)
def test_valid(self, **kwargs: Any) -> None:
Expand Down
21 changes: 8 additions & 13 deletions native/libcst/src/nodes/statement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2100,14 +2100,12 @@ impl<'r, 'a> Inflate<'a> for DeflatedExceptHandler<'r, 'a> {

let r#type = self.r#type.inflate(config)?;
let name = self.name.inflate(config)?;
let whitespace_before_colon = if name.is_some() {
parse_simple_whitespace(
config,
&mut (*self.colon_tok).whitespace_before.borrow_mut(),
)?
} else {
Default::default()
};
// In a bare `except :`, whitespace_after_except has already consumed this
// whitespace, so it parses as empty here.
let whitespace_before_colon = parse_simple_whitespace(
config,
&mut (*self.colon_tok).whitespace_before.borrow_mut(),
)?;

let body = self.body.inflate(config)?;
Ok(Self::Inflated {
Expand Down Expand Up @@ -2172,11 +2170,8 @@ impl<'r, 'a> Inflate<'a> for DeflatedExceptStarHandler<'r, 'a> {

let r#type = self.r#type.inflate(config)?;
let name = self.name.inflate(config)?;
let whitespace_before_colon = if name.is_some() {
parse_simple_whitespace(config, &mut self.colon_tok.whitespace_before.borrow_mut())?
} else {
Default::default()
};
let whitespace_before_colon =
parse_simple_whitespace(config, &mut self.colon_tok.whitespace_before.borrow_mut())?;

let body = self.body.inflate(config)?;
Ok(Self::Inflated {
Expand Down
11 changes: 11 additions & 0 deletions native/libcst/tests/fixtures/starry_tries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,17 @@
finally:
pass

try:
pass
except* foo :
pass
except* (foo, bar) :
pass
except* foo, bar :
pass
except* foo as bar :
pass


try:

Expand Down
13 changes: 13 additions & 0 deletions native/libcst/tests/fixtures/terrible_tries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,19 @@
except (foo, bar):
pass

try:
pass
except foo :
pass
except (foo, bar) :
pass
except foo, bar :
pass
except foo as bar :
pass
except :
pass

try:
pass
except foo, bar:
Expand Down