aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/CIndex/CIndex.exports5
-rw-r--r--tools/CIndex/CIndexDiagnostic.cpp90
-rw-r--r--tools/c-index-test/c-index-test.c60
3 files changed, 49 insertions, 106 deletions
diff --git a/tools/CIndex/CIndex.exports b/tools/CIndex/CIndex.exports
index 449bb95a94..e32e9d598c 100644
--- a/tools/CIndex/CIndex.exports
+++ b/tools/CIndex/CIndex.exports
@@ -32,10 +32,7 @@ _clang_getCursorSpelling
_clang_getCursorUSR
_clang_getDefinitionSpellingAndExtent
_clang_getDiagnostic
-_clang_getDiagnosticFixItInsertion
-_clang_getDiagnosticFixItKind
-_clang_getDiagnosticFixItRemoval
-_clang_getDiagnosticFixItReplacement
+_clang_getDiagnosticFixIt
_clang_getDiagnosticLocation
_clang_getDiagnosticNumFixIts
_clang_getDiagnosticNumRanges
diff --git a/tools/CIndex/CIndexDiagnostic.cpp b/tools/CIndex/CIndexDiagnostic.cpp
index 07c1983672..97d5017077 100644
--- a/tools/CIndex/CIndexDiagnostic.cpp
+++ b/tools/CIndex/CIndexDiagnostic.cpp
@@ -184,74 +184,42 @@ unsigned clang_getDiagnosticNumFixIts(CXDiagnostic Diag) {
return StoredDiag->Diag.fixit_size();
}
-enum CXFixItKind clang_getDiagnosticFixItKind(CXDiagnostic Diag,
- unsigned FixIt) {
- CXStoredDiagnostic *StoredDiag = static_cast<CXStoredDiagnostic *>(Diag);
- if (!StoredDiag || FixIt >= StoredDiag->Diag.fixit_size())
- return CXFixIt_Insertion;
-
- const CodeModificationHint &Hint = StoredDiag->Diag.fixit_begin()[FixIt];
- if (Hint.RemoveRange.isInvalid())
- return CXFixIt_Insertion;
- if (Hint.InsertionLoc.isInvalid())
- return CXFixIt_Removal;
-
- return CXFixIt_Replacement;
-}
-
-CXString clang_getDiagnosticFixItInsertion(CXDiagnostic Diag,
- unsigned FixIt,
- CXSourceLocation *Location) {
- if (Location)
- *Location = clang_getNullLocation();
-
- CXStoredDiagnostic *StoredDiag = static_cast<CXStoredDiagnostic *>(Diag);
- if (!StoredDiag || FixIt >= StoredDiag->Diag.fixit_size())
- return createCXString("");
-
- const CodeModificationHint &Hint = StoredDiag->Diag.fixit_begin()[FixIt];
-
- if (Location && StoredDiag->Diag.getLocation().isValid())
- *Location = translateSourceLocation(
- StoredDiag->Diag.getLocation().getManager(),
- StoredDiag->LangOpts,
- Hint.InsertionLoc);
- return createCXString(Hint.CodeToInsert);
-}
-
-CXSourceRange clang_getDiagnosticFixItRemoval(CXDiagnostic Diag,
- unsigned FixIt) {
- CXStoredDiagnostic *StoredDiag = static_cast<CXStoredDiagnostic *>(Diag);
- if (!StoredDiag || FixIt >= StoredDiag->Diag.fixit_size() ||
- StoredDiag->Diag.getLocation().isInvalid())
- return clang_getNullRange();
-
- const CodeModificationHint &Hint = StoredDiag->Diag.fixit_begin()[FixIt];
- return translateSourceRange(StoredDiag->Diag.getLocation().getManager(),
- StoredDiag->LangOpts,
- Hint.RemoveRange);
-}
-
-CXString clang_getDiagnosticFixItReplacement(CXDiagnostic Diag,
- unsigned FixIt,
- CXSourceRange *Range) {
- if (Range)
- *Range = clang_getNullRange();
-
- CXStoredDiagnostic *StoredDiag = static_cast<CXStoredDiagnostic *>(Diag);
+CXString clang_getDiagnosticFixIt(CXDiagnostic Diagnostic, unsigned FixIt,
+ CXSourceRange *ReplacementRange) {
+ CXStoredDiagnostic *StoredDiag
+ = static_cast<CXStoredDiagnostic *>(Diagnostic);
if (!StoredDiag || FixIt >= StoredDiag->Diag.fixit_size() ||
StoredDiag->Diag.getLocation().isInvalid()) {
- if (Range)
- *Range = clang_getNullRange();
+ if (ReplacementRange)
+ *ReplacementRange = clang_getNullRange();
return createCXString("");
}
const CodeModificationHint &Hint = StoredDiag->Diag.fixit_begin()[FixIt];
- if (Range)
- *Range = translateSourceRange(StoredDiag->Diag.getLocation().getManager(),
- StoredDiag->LangOpts,
- Hint.RemoveRange);
+ if (ReplacementRange) {
+ if (Hint.RemoveRange.isInvalid()) {
+ // Create an empty range that refers to a single source
+ // location (which is the insertion point).
+ CXSourceRange Range = {
+ { (void *)&StoredDiag->Diag.getLocation().getManager(),
+ (void *)&StoredDiag->LangOpts },
+ Hint.InsertionLoc.getRawEncoding(),
+ Hint.InsertionLoc.getRawEncoding()
+ };
+
+ *ReplacementRange = Range;
+ } else {
+ // Create a range that covers the entire replacement (or
+ // removal) range, adjusting the end of the range to point to
+ // the end of the token.
+ *ReplacementRange
+ = translateSourceRange(StoredDiag->Diag.getLocation().getManager(),
+ StoredDiag->LangOpts,
+ Hint.RemoveRange);
+ }
+ }
+
return createCXString(Hint.CodeToInsert);
}
diff --git a/tools/c-index-test/c-index-test.c b/tools/c-index-test/c-index-test.c
index c5f8431c34..2207364266 100644
--- a/tools/c-index-test/c-index-test.c
+++ b/tools/c-index-test/c-index-test.c
@@ -198,7 +198,6 @@ typedef void (*PostVisitTU)(CXTranslationUnit);
void PrintDiagnostic(CXDiagnostic Diagnostic) {
FILE *out = stderr;
CXFile file;
- CXString text;
unsigned display_opts = CXDiagnostic_DisplaySourceLocation
| CXDiagnostic_DisplayColumn | CXDiagnostic_DisplaySourceRanges;
unsigned i, num_fixits;
@@ -214,58 +213,37 @@ void PrintDiagnostic(CXDiagnostic Diagnostic) {
num_fixits = clang_getDiagnosticNumFixIts(Diagnostic);
for (i = 0; i != num_fixits; ++i) {
- switch (clang_getDiagnosticFixItKind(Diagnostic, i)) {
- case CXFixIt_Insertion: {
- CXSourceLocation insertion_loc;
- CXFile insertion_file;
- unsigned insertion_line, insertion_column;
- text = clang_getDiagnosticFixItInsertion(Diagnostic, i, &insertion_loc);
- clang_getInstantiationLocation(insertion_loc, &insertion_file,
- &insertion_line, &insertion_column, 0);
- if (insertion_file == file)
+ CXSourceRange range;
+ CXString insertion_text = clang_getDiagnosticFixIt(Diagnostic, i, &range);
+ CXSourceLocation start = clang_getRangeStart(range);
+ CXSourceLocation end = clang_getRangeEnd(range);
+ unsigned start_line, start_column, end_line, end_column;
+ CXFile start_file, end_file;
+ clang_getInstantiationLocation(start, &start_file, &start_line,
+ &start_column, 0);
+ clang_getInstantiationLocation(end, &end_file, &end_line, &end_column, 0);
+ if (clang_equalLocations(start, end)) {
+ /* Insertion. */
+ if (start_file == file)
fprintf(out, "FIX-IT: Insert \"%s\" at %d:%d\n",
- clang_getCString(text), insertion_line, insertion_column);
- clang_disposeString(text);
- break;
- }
-
- case CXFixIt_Removal: {
- CXFile start_file, end_file;
- unsigned start_line, start_column, end_line, end_column;
- CXSourceRange remove_range
- = clang_getDiagnosticFixItRemoval(Diagnostic, i);
- clang_getInstantiationLocation(clang_getRangeStart(remove_range),
- &start_file, &start_line, &start_column,
- 0);
- clang_getInstantiationLocation(clang_getRangeEnd(remove_range),
- &end_file, &end_line, &end_column, 0);
+ clang_getCString(insertion_text), start_line, start_column);
+ } else if (strcmp(clang_getCString(insertion_text), "") == 0) {
+ /* Removal. */
if (start_file == file && end_file == file) {
fprintf(out, "FIX-IT: Remove ");
PrintExtent(out, start_line, start_column, end_line, end_column);
fprintf(out, "\n");
}
- break;
- }
-
- case CXFixIt_Replacement: {
- CXFile start_file, end_file;
- unsigned start_line, start_column, end_line, end_column;
- CXSourceRange remove_range;
- text = clang_getDiagnosticFixItReplacement(Diagnostic, i,&remove_range);
- clang_getInstantiationLocation(clang_getRangeStart(remove_range),
- &start_file, &start_line, &start_column,
- 0);
- clang_getInstantiationLocation(clang_getRangeEnd(remove_range),
- &end_file, &end_line, &end_column, 0);
+ } else {
+ /* Replacement. */
if (start_file == end_file) {
fprintf(out, "FIX-IT: Replace ");
PrintExtent(out, start_line, start_column, end_line, end_column);
- fprintf(out, " with \"%s\"\n", clang_getCString(text));
+ fprintf(out, " with \"%s\"\n", clang_getCString(insertion_text));
}
- clang_disposeString(text);
break;
}
- }
+ clang_disposeString(insertion_text);
}
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-06 04:13:58 +0000