adjust Indentation Of Freestanding Macro

[vinu-vanjari]

Resolves #2473

---

Summary:

• added private function adjustIndentationOfFreestandingMacro which extracts the same indentation logic as before, plus removes first line indentation if macro is in middle of any line. This is required as line indentation does not make sense if macro is not present at the beginning of the line.

  • eg. print(#function) used to produce print( "f(a:_:c:)") with extra indentation after (. Now it should produce print("f(a:_:c:)")

• corrected existing unit tests + added similar tests for multi line macro expansion so that we make sure indentation is correct on large macros as well even if they are used in middle of the line

---

Update:

• adjustIndentationOfFreestandingMacro adds appropriate indentation to expanded code. Then removes indentation of first line of expanded code (if any). Then adds exact same trivia as # macro, including it's original indentation.
• Hence removing extra indentation from the expanded code itself and not from leading trivia of # macro node
• Added more test cases with comments with the # macro which were failing earlier

[ahoppen]

Thanks for fixing this @vinu-vanjari!

[ahoppen]

Nice. Thanks for adding the comment.

[ahoppen]

@swift-ci Please test

[ahoppen]

@swift-ci Please test

[vinu-vanjari]

@ahoppen, sorry I missed formatting in my latest commit. Just fixed it now. 🙏🏼

[ahoppen]

No worries, let’s try again.

@swift-ci Please test

[vinu-vanjari]

Kindly help, I am not able to understand root cause of the CI failure.

As per console logs,

/Users/ec2-user/jenkins/workspace/swift-syntax-PR-macOS/branch-main/swift-syntax/Examples/Tests/MacroExamples/Implementation/ComplexMacros/DictionaryIndirectionMacroTests.swift:13:8: error: no such module 'MacroExamplesImplementation'
import MacroExamplesImplementation
       ^
note: module 'MacroExamplesImplementation' is a macro, and cannot be imported by tests and other targets
error: fatalError
Error: Command failed with non-zero exit code 1:

but i am not sure if my changes affected MacroExamplesImplementation

[Matejkob]

Kindly help, I am not able to understand root cause of the CI failure.

As per console logs,

/Users/ec2-user/jenkins/workspace/swift-syntax-PR-macOS/branch-main/swift-syntax/Examples/Tests/MacroExamples/Implementation/ComplexMacros/DictionaryIndirectionMacroTests.swift:13:8: error: no such module 'MacroExamplesImplementation'
import MacroExamplesImplementation
       ^
note: module 'MacroExamplesImplementation' is a macro, and cannot be imported by tests and other targets
error: fatalError
Error: Command failed with non-zero exit code 1:

but i am not sure if my changes affected MacroExamplesImplementation

The CI error is not related to your changes. It should be fix after merging this PR: swiftlang/swift-package-manager#7349

[MaxDesiatov]

swiftlang/swift-package-manager#7350 instead of swiftlang/swift-package-manager#7349 should've fixed CI issues, as it clearly fixes the test build error for me locally. I'm currently investigating why the error persists on CI, as I hope we can avoid merging the revert and get this fixed properly.

[Matejkob]

apple/swift-package-manager#7350 instead of apple/swift-package-manager#7349 should've fixed CI issues, as it clearly fixes the test build error for me locally. I'm currently investigating why the error persists on CI, as I hope we can avoid merging the revert and get this fixed properly.

Oh, sorry for the misleading info, didn't go throw the new conversation in the PR since yesterday

[MaxDesiatov]

@swift-ci clean test

[MaxDesiatov]

swiftlang/swift-package-manager#7352
@swift-ci test