nridge updated this revision to Diff 495015. nridge added a comment. address review comment
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D142871/new/ https://reviews.llvm.org/D142871 Files: clang-tools-extra/clangd/FindTarget.cpp clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -1022,7 +1022,7 @@ class $Class_def[[Z]] {}; template $Bracket[[<]]typename, typename$Bracket[[>]] concept $Concept_decl[[C2]] = true; - template $Bracket[[<]]C2$Bracket[[<]]int$Bracket[[>]] $TemplateParameter_def[[A]]$Bracket[[>]] + template $Bracket[[<]]$Concept[[C2]]$Bracket[[<]]int$Bracket[[>]] $TemplateParameter_def[[A]]$Bracket[[>]] class $Class_def[[B]] {}; )cpp", // no crash Index: clang-tools-extra/clangd/FindTarget.cpp =================================================================== --- clang-tools-extra/clangd/FindTarget.cpp +++ clang-tools-extra/clangd/FindTarget.cpp @@ -1044,6 +1044,17 @@ return RecursiveASTVisitor::TraverseConstructorInitializer(Init); } + bool TraverseTypeConstraint(const TypeConstraint *TC) { + // We want to handle all ConceptReferences but RAV is missing a + // polymorphic Visit or Traverse method for it, so we handle + // TypeConstraints specially here. + Out(ReferenceLoc{TC->getNestedNameSpecifierLoc(), + TC->getConceptNameLoc(), + /*IsDecl=*/false, + {TC->getNamedConcept()}}); + return RecursiveASTVisitor::TraverseTypeConstraint(TC); + } + private: /// Obtain information about a reference directly defined in \p N. Does not /// recurse into child nodes, e.g. do not expect references for constructor
Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -1022,7 +1022,7 @@ class $Class_def[[Z]] {}; template $Bracket[[<]]typename, typename$Bracket[[>]] concept $Concept_decl[[C2]] = true; - template $Bracket[[<]]C2$Bracket[[<]]int$Bracket[[>]] $TemplateParameter_def[[A]]$Bracket[[>]] + template $Bracket[[<]]$Concept[[C2]]$Bracket[[<]]int$Bracket[[>]] $TemplateParameter_def[[A]]$Bracket[[>]] class $Class_def[[B]] {}; )cpp", // no crash Index: clang-tools-extra/clangd/FindTarget.cpp =================================================================== --- clang-tools-extra/clangd/FindTarget.cpp +++ clang-tools-extra/clangd/FindTarget.cpp @@ -1044,6 +1044,17 @@ return RecursiveASTVisitor::TraverseConstructorInitializer(Init); } + bool TraverseTypeConstraint(const TypeConstraint *TC) { + // We want to handle all ConceptReferences but RAV is missing a + // polymorphic Visit or Traverse method for it, so we handle + // TypeConstraints specially here. + Out(ReferenceLoc{TC->getNestedNameSpecifierLoc(), + TC->getConceptNameLoc(), + /*IsDecl=*/false, + {TC->getNamedConcept()}}); + return RecursiveASTVisitor::TraverseTypeConstraint(TC); + } + private: /// Obtain information about a reference directly defined in \p N. Does not /// recurse into child nodes, e.g. do not expect references for constructor
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits