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

[SourceKit] Migrate getNotableRegions to new NameMatcher in swift-syntax

Browse Source
This commit is contained in:
Alex Hoppen
2023-12-11 14:00:03 -08:00
parent a5530ce9b6
commit e26c76dbd4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Refactoring/ExtractFunction.cpp
View File

@@ -77,6 +77,7 @@ static SourceLoc getNewFuncInsertLoc(DeclContext *DC,
return SourceLoc();
}
#if SWIFT_BUILD_SWIFT_SYNTAX
static std::vector<NoteRegion>
getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name) {
auto InputBuffer =
@@ -99,8 +100,7 @@ getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name) {
SourceLoc NameLoc = SM.getLocForOffset(BufferId, NameOffset);
auto LineAndCol = SM.getLineAndColumnInBuffer(NameLoc);
NameMatcher Matcher(*Instance->getPrimarySourceFile());
auto Resolved = Matcher.resolve(llvm::makeArrayRef(NameLoc), llvm::None);
auto Resolved = runNameMatcher(*Instance->getPrimarySourceFile(), NameLoc);
assert(!Resolved.empty() && "Failed to resolve generated func name loc");
RenameLoc RenameConfig = {LineAndCol.first, LineAndCol.second,
@@ -122,6 +122,7 @@ getNotableRegions(StringRef SourceText, unsigned NameOffset, StringRef Name) {
return NoteRegions;
}
#endif // SWIFT_BUILD_SWIFT_SYNTAX
bool RefactoringActionExtractFunction::isApplicable(
const ResolvedRangeInfo &Info, DiagnosticEngine &Diag) {
@@ -142,6 +143,11 @@ bool RefactoringActionExtractFunction::isApplicable(
}
bool RefactoringActionExtractFunction::performChange() {
#if !SWIFT_BUILD_SWIFT_SYNTAX
DiagEngine.diagnose(SourceLoc(),
diag::extract_function_not_supported_swiftsyntax_missing);
return true;
#else
// Check if the new name is ok.
if (!Lexer::isIdentifier(PreferredName)) {
DiagEngine.diagnose(SourceLoc(), diag::invalid_name, PreferredName);
@@ -300,4 +306,5 @@ bool RefactoringActionExtractFunction::performChange() {
EditConsumer.accept(SM, RangeInfo.ContentRange, CallStr, NotableCallRegions);
return false;
#endif
}