averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Refactor] Allow expanding nested macros

Browse Source 
This adds a new `primary_file` key, which defaults to `sourcefile`. For
nested expansions, `primary_file` should be set to the containing file
and `sourcefile` to the name of the macro expansion buffer.
This commit is contained in:
Ben Barham
2023-02-23 11:59:21 -08:00
parent f1ff6958a3
commit bb7760b9e0
19 changed files with 242 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
View File

@@ -1522,7 +1522,7 @@ static void resolveCursor(
if (Actionables && Length) {
SmallVector<RefactoringKind, 8> Kinds;
RangeConfig Range;
Range.BufferId = BufferID;
Range.BufferID = BufferID;
auto Pair = SM.getLineAndColumnInBuffer(Loc);
Range.Line = Pair.first;
Range.Column = Pair.second;
@@ -2675,12 +2675,12 @@ static RefactoringKind getIDERefactoringKind(SemanticRefactoringInfo Info) {
}
void SwiftLangSupport::semanticRefactoring(
StringRef Filename, SemanticRefactoringInfo Info,
StringRef PrimaryFile, SemanticRefactoringInfo Info,
ArrayRef<const char *> Args, SourceKitCancellationToken CancellationToken,
CategorizedEditsReceiver Receiver) {
std::string Error;
SwiftInvocationRef Invok =
ASTMgr->getTypecheckInvocation(Args, Filename, Error);
ASTMgr->getTypecheckInvocation(Args, PrimaryFile, Error);
if (!Invok) {
LOG_WARN_FUNC("failed to create an ASTInvocation: " << Error);
Receiver(RequestResult<ArrayRef<CategorizedEdits>>::fromError(Error));
@@ -2698,18 +2698,30 @@ void SwiftLangSupport::semanticRefactoring(
Receiver(std::move(Receiver)) {}
void handlePrimaryAST(ASTUnitRef AstUnit) override {
RequestRefactoringEditConsumer EditConsumer(Receiver);
auto &CompIns = AstUnit->getCompilerInstance();
ModuleDecl *MainModule = CompIns.getMainModule();
auto &SM = CompIns.getSourceMgr();
RefactoringOptions Opts(getIDERefactoringKind(Info));
Opts.Range.BufferId = AstUnit->getPrimarySourceFile().getBufferID().
value();
Optional<unsigned> BufferID;
if (Info.SourceFile.empty()) {
BufferID = AstUnit->getPrimarySourceFile().getBufferID();
} else {
BufferID = SM.getIDForBufferIdentifier(Info.SourceFile);
}
if (!BufferID)
return;
Opts.Range.BufferID = *BufferID;
Opts.Range.Line = Info.Line;
Opts.Range.Column = Info.Column;
Opts.Range.Length = Info.Length;
Opts.PreferredName = Info.PreferredName.str();
RequestRefactoringEditConsumer EditConsumer(Receiver);
refactorSwiftModule(MainModule, Opts, EditConsumer, EditConsumer);
refactorSwiftModule(CompIns.getMainModule(), Opts, EditConsumer,
EditConsumer);
}
void cancelled() override {