apply includeDeclaration parameter from request

FacilityApi · Oct 12, 2023 · e723408 · e723408
1 parent 04fe2cc
commit e723408
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/src/Facility.LanguageServer/FsdDefinitionUtility.cs b/src/Facility.LanguageServer/FsdDefinitionUtility.cs
@@ -17,12 +17,12 @@ from field in service.GetDescendants().OfType<ServiceFieldInfo>()
 				select service.FindMember(name)).FirstOrDefault();
 		}
 
-		public static IEnumerable<ServicePart> GetReferencedServicePartsAtPosition(this ServiceInfo service, Position requestPosition)
+		public static IEnumerable<ServicePart> GetReferencedServicePartsAtPosition(this ServiceInfo service, Position requestPosition, bool includeDeclaration)
 		{
 			var members = service.GetDescendants().OfType<ServiceMemberInfo>().ToList().AsReadOnly();
 
-			// memberNameAtCursor will be null if the cursor is not on a member name.
-			var memberNameAtCursor = members
+			// memberAtCursor will be null if the cursor is not on a member name.
+			var memberAtCursor = members
 				.Select(member =>
 				{
 					var part = member.GetPart(ServicePartKind.Name);
@@ -31,7 +31,7 @@ public static IEnumerable<ServicePart> GetReferencedServicePartsAtPosition(this
 					return (part, name);
 				})
 				.Where(x => x.part != null && requestPosition >= x.part.Position && requestPosition < x.part.EndPosition)
-				.Select(x => x.name)
+				.Select(x => (x.name, x.part))
 				.FirstOrDefault();
 
 			var fields = service.GetDescendants().OfType<ServiceFieldInfo>().ToList().AsReadOnly();
@@ -49,7 +49,7 @@ public static IEnumerable<ServicePart> GetReferencedServicePartsAtPosition(this
 				.Select(x => x.typeName)
 				.FirstOrDefault();
 
-			return fields
+			var referencedFields = fields
 				.Select(field =>
 				{
 					var part = field.GetPart(ServicePartKind.TypeName);
@@ -60,8 +60,23 @@ public static IEnumerable<ServicePart> GetReferencedServicePartsAtPosition(this
 
 					return (part, memberTypeName, typeName);
 				})
-				.Where(x => x.part != null && ((memberNameAtCursor != null && x.memberTypeName == memberNameAtCursor) || x.typeName == fieldTypeNameAtCursor))
+				.Where(x => x.part != null && ((memberAtCursor.name != null && x.memberTypeName == memberAtCursor.name) || x.typeName == fieldTypeNameAtCursor))
 				.Select(x => x.part);
+
+			var referencedMembers = members
+				.Select(member =>
+				{
+					var part = member.GetPart(ServicePartKind.Name);
+					var name = member.Name;
+
+					return (part, name);
+				})
+				.Where(x => x.part != null && x.name == fieldTypeNameAtCursor)
+				.Select(x => x.part);
+
+			return includeDeclaration
+				? referencedFields.Concat(referencedMembers)
+				: referencedFields;
 		}
 
 		private static string GetMemberTypeName(this ServiceTypeInfo type)

diff --git a/src/Facility.LanguageServer/FsdReferenceHandler.cs b/src/Facility.LanguageServer/FsdReferenceHandler.cs
@@ -33,7 +33,7 @@ public async Task<LocationContainer> Handle(ReferenceParams request, Cancellatio
 
 			var position = new Position(request.Position);
 
-			var serviceParts = service.GetReferencedServicePartsAtPosition(position);
+			var serviceParts = service.GetReferencedServicePartsAtPosition(position, request.Context.IncludeDeclaration);
 
 			var locations = serviceParts.Select(part => new Location()
 			{