fixes

Author: torshepherd

clang-tools-extra/clangd/InlayHints.cpp

@@ -785,19 +785,24 @@ class InlayHintVisitor : public RecursiveASTVisitor<InlayHintVisitor> {
       }
 
       StringRef Name = ParameterNames[I];
-      bool NameHint = shouldHintName(Args[I], Name);
-      bool ReferenceHint = shouldHintReference(Params[I], ForwardedParams[I]);
+      const bool NameHint = shouldHintName(Args[I], Name);
+      const bool ReferenceHint =
+          shouldHintReference(Params[I], ForwardedParams[I]);
 
-      bool IsDefault = isa<CXXDefaultArgExpr>(Args[I]);
+      const bool IsDefault = isa<CXXDefaultArgExpr>(Args[I]);
       HasNonDefaultArgs |= !IsDefault;
       if (Cfg.InlayHints.DefaultArguments && IsDefault) {
-        auto SourceText = Lexer::getSourceText(
+        const auto SourceText = Lexer::getSourceText(
             CharSourceRange::getTokenRange(Params[I]->getDefaultArgRange()),
             AST.getSourceManager(), AST.getLangOpts());
-        FormattedDefaultArgs.emplace_back(llvm::formatv(
-            "{0}: {1}", Name.empty() ? "/*unused*/" : Name,
-            SourceText.size() > Cfg.InlayHints.TypeNameLimit ? "..."
-                                                             : SourceText));
+        const auto Abbrev = SourceText.size() > Cfg.InlayHints.TypeNameLimit
+                                ? "..."
+                                : SourceText;
+        if (NameHint)
+          FormattedDefaultArgs.emplace_back(
+              llvm::formatv("{0}: {1}", Name, Abbrev));
+        else
+          FormattedDefaultArgs.emplace_back(llvm::formatv("{0}", Abbrev));
       }
 
       if (NameHint || ReferenceHint) {

clang-tools-extra/clangd/unittests/InlayHintTests.cpp

@@ -1484,11 +1484,14 @@ TEST(DefaultArguments, Smoke) {
     int foo(int A = 4) { return A; }
     int bar(int A, int B = 1, bool C = foo($default1[[)]]) { return A; }
     int A = bar($explicit[[2]]$default2[[)]];
+
+    void baz(int = 5) { if (false) baz($unnamed[[)]]; };
   )cpp";
 
   assertHints(InlayHintKind::DefaultArgument, Code,
               ExpectedHint{"A: 4", "default1", Left},
-              ExpectedHint{", B: 1, C: foo()", "default2", Left});
+              ExpectedHint{", B: 1, C: foo()", "default2", Left},
+              ExpectedHint{"5", "unnamed", Left});
 
   assertHints(InlayHintKind::Parameter, Code,
               ExpectedHint{"A: ", "explicit", Left});