Add --fix-typedefs to Dart formatter. #743
Conversation
lib/src/source_visitor.dart
Outdated
| // Old style function parameters or single-identifier-meaning-name | ||
| // cannot occur inside the `Function` type expression. | ||
| // If they do anyway, retain them as an error. | ||
| bool wasInsideNewTypedefFix = _insideNewTypedefFix; |
There was a problem hiding this comment.
bool -> var
Is there a reason you don't just go ahead and fix them?
lib/src/source_visitor.dart
Outdated
| @@ -1836,11 +1911,16 @@ class SourceVisitor extends ThrowingAstVisitor { | |||
| modifier(node.keyword); | |||
|
|
|||
| visit(node.type); | |||
| bool hasType = node.type != null; | |||
| if (_insideNewTypedefFix && !hasType) { | |||
| _writeText("dynamic", node.identifier.offset); | |||
There was a problem hiding this comment.
This needs a test for what happens to a comment before the identifier.
There was a problem hiding this comment.
Ick, good point.
I assume comments are attached to the following token, and that we want comments before the lone identifier to go before the inserted dynamic.
I'll make that so.
|
Didn't address all comments yet, but refactored to avoid code duplication. |
| // without a name. Add "dynamic" in that case. | ||
|
|
||
| // Ensure comments on the identifier comes before the inserted type. | ||
| token(node.identifier.token, before: () { |
There was a problem hiding this comment.
Here I am kind-of inlining visitSimpleIdentifier, which just calls token(node.token).
Should I instead add an {void before()} or {void beforeToken} parameter to visitSimpleIdentifier and call that directly?
I do want to insert the dynamic between the comment and the token itself, which token(..., before: ...) does for me, but I can't put that extra aargument through the visit/accept procedure, and I don't want to store it in some object-global state.
|
All comments addressed. PTAL |
WDYT?
Would it be better to build a new node for the converted syntax and then visit that node, instead of physically building the output? It would ensure consistent formatting.