Preserve name in DeclRefExpr for correct highlighitng of `This`. (#4980)

* Preserve name in DeclRefExpr for correct highlighitng of `This`.

* Fix test.

6 files changed, 48 insertions, 37 deletions

diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
index 1dc81e861..ec59469d3 100644
--- a/source/slang/slang-check-decl.cpp
+++ b/source/slang/slang-check-decl.cpp
@@ -1991,7 +1991,7 @@ namespace Slang
         {
             auto* invoke = visitor->getASTBuilder()->create<InvokeExpr>();
             auto member = visitor->getASTBuilder()->getMemberDeclRef(declRefType->getDeclRef(), defaultCtor);
-            invoke->functionExpr = visitor->ConstructDeclRefExpr(member, nullptr, defaultCtor->loc, nullptr);
+            invoke->functionExpr = visitor->ConstructDeclRefExpr(member, nullptr, defaultCtor->getName(), defaultCtor->loc, nullptr);
             return invoke;
         }
         else
@@ -10103,7 +10103,7 @@ namespace Slang
         // aggregate type, we want to form a full declref with default arguments.
         declRef = createDefaultSubstitutionsIfNeeded(astBuilder, visitor, declRef);
 
-        auto declRefExpr = visitor->ConstructDeclRefExpr(declRef, nullptr, derivativeOfAttr->loc, nullptr);
+        auto declRefExpr = visitor->ConstructDeclRefExpr(declRef, nullptr, declRef.getName(), derivativeOfAttr->loc, nullptr);
         declRefExpr->type.type = nullptr;
         derivativeAttr->args.add(declRefExpr);
         derivativeAttr->funcExpr = declRefExpr;
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp
index ec064b5b3..3414c16b5 100644
--- a/source/slang/slang-check-expr.cpp
+++ b/source/slang/slang-check-expr.cpp
@@ -326,10 +326,11 @@ namespace Slang
     }
 
     DeclRefExpr* SemanticsVisitor::ConstructDeclRefExpr(
-        DeclRef<Decl>   declRef,
-        Expr*    baseExpr,
+        DeclRef<Decl> declRef,
+        Expr* baseExpr,
+        Name* name,
         SourceLoc loc,
-        Expr*    originalExpr)
+        Expr* originalExpr)
     {
         // Compute the type that this declaration reference will have in context.
         //
@@ -382,7 +383,7 @@ namespace Slang
                 expr->loc = loc;
                 expr->type = type;
                 expr->baseExpression = baseExpr;
-                expr->name = declRef.getName();
+                expr->name = name;
                 expr->declRef = declRef;
                 expr->memberOperatorLoc = _getMemberOpLoc(originalExpr);
                 return expr;
@@ -399,7 +400,7 @@ namespace Slang
                 expr->loc = loc;
                 expr->type = type;
                 expr->baseExpression = baseTypeExpr;
-                expr->name = declRef.getName();
+                expr->name = name;
                 expr->declRef = declRef;
                 expr->memberOperatorLoc = _getMemberOpLoc(originalExpr);
                 return expr;
@@ -413,7 +414,7 @@ namespace Slang
                 expr->loc = loc;
                 expr->type = type;
                 expr->baseExpression = baseExpr;
-                expr->name = declRef.getName();
+                expr->name = name;
                 expr->declRef = declRef;
                 expr->memberOperatorLoc = _getMemberOpLoc(originalExpr);
 
@@ -464,7 +465,7 @@ namespace Slang
             //
             auto expr = m_astBuilder->create<VarExpr>();
             expr->loc = loc;
-            expr->name = declRef.getName();
+            expr->name = name;
             expr->type = type;
             expr->declRef = declRef;
             // Keep a reference to the original expr if it was a genericApp/member.
@@ -666,13 +667,15 @@ namespace Slang
         return ConstructDeclRefExpr(
             synthDeclMemberRef,
             nullptr,
+            item.declRef.getName(),
             originalExpr ? originalExpr->loc : SourceLoc(),
             originalExpr);
     }
 
     Expr* SemanticsVisitor::ConstructLookupResultExpr(
         LookupResultItem const& item,
-        Expr*            baseExpr,
+        Expr* baseExpr,
+        Name* name,
         SourceLoc loc,
         Expr* originalExpr)
     {
@@ -696,7 +699,7 @@ namespace Slang
             switch (breadcrumb->kind)
             {
             case LookupResultItem::Breadcrumb::Kind::Member:
-                bb = ConstructDeclRefExpr(breadcrumb->declRef, bb, loc, originalExpr);
+                bb = ConstructDeclRefExpr(breadcrumb->declRef, bb, name, loc, originalExpr);
                 break;
 
             case LookupResultItem::Breadcrumb::Kind::Deref:
@@ -827,7 +830,7 @@ namespace Slang
             }
         }
 
-        return ConstructDeclRefExpr(item.declRef, bb, loc, originalExpr);
+        return ConstructDeclRefExpr(item.declRef, bb, name, loc, originalExpr);
     }
 
     void SemanticsVisitor::suggestCompletionItems(
@@ -844,9 +847,9 @@ namespace Slang
 
 
     Expr* SemanticsVisitor::createLookupResultExpr(
-        Name*                   name,
-        LookupResult const&     lookupResult,
-        Expr*            baseExpr,
+        Name* name,
+        LookupResult const& lookupResult,
+        Expr* baseExpr,
         SourceLoc loc,
         Expr* originalExpr)
     {
@@ -864,7 +867,7 @@ namespace Slang
         }
         else
         {
-            return ConstructLookupResultExpr(lookupResult.item, baseExpr, loc, originalExpr);
+            return ConstructLookupResultExpr(lookupResult.item, baseExpr, name, loc, originalExpr);
         }
     }
 
@@ -1058,7 +1061,7 @@ namespace Slang
             // expression.
             //
             return ConstructLookupResultExpr(
-                lookupResult.item, overloadedExpr->base, overloadedExpr->loc, overloadedExpr);
+                lookupResult.item, overloadedExpr->base, overloadedExpr->name, overloadedExpr->loc, overloadedExpr);
         }
 
         // Otherwise, we weren't able to resolve the overloading given
@@ -1166,6 +1169,7 @@ namespace Slang
                     auto diffTypeExpr = ConstructLookupResultExpr(
                         diffTypeLookupResult.item,
                         baseTypeExpr,
+                        declRefType->getDeclRef().getName(),
                         declRefType->getDeclRef().getLoc(),
                         baseTypeExpr);
 
@@ -3145,6 +3149,7 @@ namespace Slang
             {
                 auto lookupResultExpr = semantics->ConstructLookupResultExpr(item,
                     nullptr,
+                    overloadedExpr->name,
                     overloadedExpr->loc,
                     nullptr);
                 auto candidateExpr = actions->createHigherOrderInvokeExpr(semantics);
diff --git a/source/slang/slang-check-impl.h b/source/slang/slang-check-impl.h
index 44f7e0029..f39d5be1d 100644
--- a/source/slang/slang-check-impl.h
+++ b/source/slang/slang-check-impl.h
@@ -1219,10 +1219,11 @@ namespace Slang
         }
 
         DeclRefExpr* ConstructDeclRefExpr(
-            DeclRef<Decl>   declRef,
-            Expr*    baseExpr,
+            DeclRef<Decl> declRef,
+            Expr* baseExpr,
+            Name* name,
             SourceLoc loc,
-            Expr*    originalExpr);
+            Expr* originalExpr);
 
         Expr* ConstructDerefExpr(
             Expr*    base,
@@ -1236,16 +1237,17 @@ namespace Slang
 
         Expr* ConstructLookupResultExpr(
             LookupResultItem const& item,
-            Expr*            baseExpr,
+            Expr* baseExpr,
+            Name* name,
             SourceLoc loc,
             Expr* originalExpr);
 
         Expr* createLookupResultExpr(
-            Name*                   name,
-            LookupResult const&     lookupResult,
-            Expr*            baseExpr,
+            Name* name,
+            LookupResult const& lookupResult,
+            Expr* baseExpr,
             SourceLoc loc,
-            Expr*    originalExpr);
+            Expr* originalExpr);
 
         DeclVisibility getTypeVisibility(Type* type);
         bool isDeclVisibleFromScope(DeclRef<Decl> declRef, Scope* scope);
diff --git a/source/slang/slang-check-overload.cpp b/source/slang/slang-check-overload.cpp
index 7318fa390..9b3d6baff 100644
--- a/source/slang/slang-check-overload.cpp
+++ b/source/slang/slang-check-overload.cpp
@@ -983,6 +983,7 @@ namespace Slang
         return ConstructDeclRefExpr(
             innerDeclRef,
             base,
+            innerDeclRef.getName(),
             originalExpr->loc,
             originalExpr);
     }
@@ -1037,6 +1038,7 @@ namespace Slang
                 baseExpr = ConstructLookupResultExpr(
                     candidate.item,
                     context.baseExpr,
+                    candidate.item.declRef.getName(),
                     context.funcLoc,
                     context.originalExpr);
                 break;
@@ -2201,7 +2203,7 @@ namespace Slang
                 if (lastInner)
                 {
                     auto baseExpr = GetBaseExpr(funcDeclRefExpr);
-                    lastInner->baseFunction = ConstructLookupResultExpr(candidate.item, baseExpr, funcDeclRefExpr->loc, funcDeclRefExpr);
+                    lastInner->baseFunction = ConstructLookupResultExpr(candidate.item, baseExpr, funcDeclRefExpr->name, funcDeclRefExpr->loc, funcDeclRefExpr);
                 }
                 candidate.exprVal = expr;
                 expr->type.type = diffFuncType;
diff --git a/source/slang/slang-language-server-semantic-tokens.cpp b/source/slang/slang-language-server-semantic-tokens.cpp
index 3a40c8e92..dd3b0e766 100644
--- a/source/slang/slang-language-server-semantic-tokens.cpp
+++ b/source/slang/slang-language-server-semantic-tokens.cpp
@@ -50,7 +50,7 @@ List<SemanticToken> getSemanticTokens(Linkage* linkage, Module* module, UnownedS
             token.type != SemanticTokenType::NormalText)
             result.add(token);
     };
-    auto handleDeclRef = [&](DeclRef<Decl> declRef, Expr* originalExpr, SourceLoc loc)
+    auto handleDeclRef = [&](DeclRef<Decl> declRef, Expr* originalExpr, Name* name, SourceLoc loc)
     {
         if (!declRef)
             return;
@@ -59,7 +59,8 @@ List<SemanticToken> getSemanticTokens(Linkage* linkage, Module* module, UnownedS
             decl = genDecl->inner;
         if (!decl)
             return;
-        auto name = declRef.getDecl()->getName();
+        if (!name)
+            name = declRef.getDecl()->getName();
         if (!name)
             return;
         // Don't look at the expr if it is defined in a different file.
@@ -134,13 +135,13 @@ List<SemanticToken> getSemanticTokens(Linkage* linkage, Module* module, UnownedS
         {
             if (auto declRefExpr = as<DeclRefExpr>(node))
             {
-                handleDeclRef(declRefExpr->declRef, declRefExpr->originalExpr, declRefExpr->loc);
+                handleDeclRef(declRefExpr->declRef, declRefExpr->originalExpr, declRefExpr->name, declRefExpr->loc);
             }
             else if (auto overloadedExpr = as<OverloadedExpr>(node))
             {
                 if (overloadedExpr->lookupResult2.items.getCount())
                 {
-                    handleDeclRef(overloadedExpr->lookupResult2.items[0].declRef, overloadedExpr->originalExpr, overloadedExpr->loc);
+                    handleDeclRef(overloadedExpr->lookupResult2.items[0].declRef, overloadedExpr->originalExpr, overloadedExpr->name, overloadedExpr->loc);
                 }
             }
             else if (auto accessorDecl = as<AccessorDecl>(node))
diff --git a/source/slang/slang-language-server.cpp b/source/slang/slang-language-server.cpp
index 9588e7284..94debde40 100644
--- a/source/slang/slang-language-server.cpp
+++ b/source/slang/slang-language-server.cpp
@@ -576,7 +576,7 @@ SlangResult LanguageServer::hover(
         }
     };
 
-    auto fillDeclRefHoverInfo = [&](DeclRef<Decl> declRef)
+    auto fillDeclRefHoverInfo = [&](DeclRef<Decl> declRef, Name* name)
     {
         if (declRef.getDecl())
         {
@@ -664,7 +664,8 @@ SlangResult LanguageServer::hover(
                 hover.range.start.line,
                 hover.range.start.character);
             hover.range.end = hover.range.start;
-            auto name = declRef.getName();
+            if (!name)
+                name = declRef.getName();
             if (auto ctorDecl = declRef.as<ConstructorDecl>())
             {
                 auto parent = ctorDecl.getDecl()->parentDecl;
@@ -692,7 +693,7 @@ SlangResult LanguageServer::hover(
     auto fillExprHoverInfo = [&](Expr* expr)
     {
         if (auto declRefExpr = as<DeclRefExpr>(expr))
-            return fillDeclRefHoverInfo(declRefExpr->declRef);
+            return fillDeclRefHoverInfo(declRefExpr->declRef, declRefExpr->name);
         else if (as<ThisExpr>(expr))
         {
             if (expr->type)
@@ -751,12 +752,12 @@ SlangResult LanguageServer::hover(
     };
     if (auto declRefExpr = as<DeclRefExpr>(leafNode))
     {
-        fillDeclRefHoverInfo(declRefExpr->declRef);
+        fillDeclRefHoverInfo(declRefExpr->declRef, declRefExpr->name);
     }
     else if (auto overloadedExpr = as<OverloadedExpr>(leafNode))
     {
         LookupResultItem& item = overloadedExpr->lookupResult2.item;
-        fillDeclRefHoverInfo(item.declRef);
+        fillDeclRefHoverInfo(item.declRef, overloadedExpr->name);
     }
     else if (auto overloadedExpr2 = as<OverloadedExpr2>(leafNode))
     {
@@ -826,11 +827,11 @@ SlangResult LanguageServer::hover(
     }
     else if (auto decl = as<Decl>(leafNode))
     {
-        fillDeclRefHoverInfo(makeDeclRef(decl));
+        fillDeclRefHoverInfo(makeDeclRef(decl), nullptr);
     }
     else if (auto attr = as<Attribute>(leafNode))
     {
-        fillDeclRefHoverInfo(makeDeclRef(attr->attributeDecl));
+        fillDeclRefHoverInfo(makeDeclRef(attr->attributeDecl), nullptr);
         hover.range.end.character = hover.range.start.character + (int)attr->originalIdentifierToken.getContentLength();
     }
     if (sb.getLength() == 0)