From 26759777a990927ff84ae66bbdaf4ed845007cd6 Mon Sep 17 00:00:00 2001
From: dragonmacher <48328597+dragonmacher@users.noreply.github.com>
Date: Mon, 16 Sep 2024 11:52:41 -0400
Subject: [PATCH] GP-4922 - Fixed exception in creating highlights

---
 .../locationreferences/DataTypeLocationDescriptor.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/DataTypeLocationDescriptor.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/DataTypeLocationDescriptor.java
index b8431d205c..7d0fbf396f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/DataTypeLocationDescriptor.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/navigation/locationreferences/DataTypeLocationDescriptor.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -288,7 +288,7 @@ abstract class DataTypeLocationDescriptor extends LocationDescriptor {
 			}
 
 			String variableName = paramParts[paramParts.length - 1];
-			int variableNameOffset = parameterDeclaration.indexOf(variableName);
+			int variableNameOffset = parameterDeclaration.lastIndexOf(variableName);
 			if (label.length() > variableNameOffset) {
 				return label.substring(0, variableNameOffset - 1); // -1 for the space before the name
 			}