Merge pull request #2130 from thatgato/username-autocomplete-fix

Fix username autocompletion in custom themes #2067

Author: thatgato

MainModule/Client/UI/Aero/Console.rbxmx

@@ -856,7 +856,15 @@ return function(data, env)
 		if c == 'Text' and text.Text ~= '' and open then
 			if string.sub(text.Text, string.len(text.Text)) == "	" then
 				if players:FindFirstChild("Entry 0") then
-					text.Text = `{string.sub(text.Text, 1, (string.len(text.Text) - 1))}{players["Entry 0"].Text} `
+					local args = string.split(text.Text, splitKey)
+					args[#args] = nil
+					local textWithoutLastArg = table.concat(args, splitKey)
+
+					if textWithoutLastArg ~= "" then
+						textWithoutLastArg ..= splitKey
+					end
+
+					text.Text = textWithoutLastArg .. players["Entry 0"].Text .. " "
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
 				else

MainModule/Client/UI/Rounded/Console.rbxmx

@@ -658,7 +658,15 @@ return function(data, env)
 		if c == 'Text' and text.Text ~= '' and open then
 			if string.sub(text.Text, string.len(text.Text)) == "	" then
 				if players:FindFirstChild("Entry 0") then
-					text.Text = `{string.sub(text.Text, 1, (string.len(text.Text) - 1))}{players["Entry 0"].Text} `
+					local args = string.split(text.Text, splitKey)
+					args[#args] = nil
+					local textWithoutLastArg = table.concat(args, splitKey)
+
+					if textWithoutLastArg ~= "" then
+						textWithoutLastArg ..= splitKey
+					end
+
+					text.Text = textWithoutLastArg .. players["Entry 0"].Text .. " "
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
 				else

MainModule/Client/UI/Steampunk/Console.rbxmx

@@ -251,7 +251,15 @@ return function(data, env)
 		if text.Text ~= "" and openConsole then
 			if string.sub(text.Text, string.len(text.Text)) == "	" then
 				if players:FindFirstChild("Entry 0") then
-					text.Text = `{string.sub(text.Text, 1, (string.len(text.Text) - 1))}{players["Entry 0"].Text} `
+					local args = string.split(text.Text, splitKey)
+					args[#args] = nil
+					local textWithoutLastArg = table.concat(args, splitKey)
+
+					if textWithoutLastArg ~= "" then
+						textWithoutLastArg ..= splitKey
+					end
+
+					text.Text = textWithoutLastArg .. players["Entry 0"].Text .. " "
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
 				else

MainModule/Client/UI/Unity/Console.rbxmx

@@ -712,7 +712,15 @@ return function(data, env)
 		if c == 'Text' and text.Text ~= '' and open then
 			if string.sub(text.Text, string.len(text.Text)) == "	" then
 				if players:FindFirstChild("Entry 0") then
-					text.Text = `{string.sub(text.Text, 1, (string.len(text.Text) - 1))}{players["Entry 0"].Text} `
+					local args = string.split(text.Text, splitKey)
+					args[#args] = nil
+					local textWithoutLastArg = table.concat(args, splitKey)
+
+					if textWithoutLastArg ~= "" then
+						textWithoutLastArg ..= splitKey
+					end
+
+					text.Text = textWithoutLastArg .. players["Entry 0"].Text .. " "
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
 				else

MainModule/Client/UI/Windows XP/Console.rbxmx

@@ -630,7 +630,15 @@ return function(data, env)
 		if c == 'Text' and text.Text ~= '' and open then
 			if string.sub(text.Text, string.len(text.Text)) == "	" then
 				if players:FindFirstChild("Entry 0") then
-					text.Text = `{string.sub(text.Text, 1, (string.len(text.Text) - 1))}{players["Entry 0"].Text} `
+					local args = string.split(text.Text, splitKey)
+					args[#args] = nil
+					local textWithoutLastArg = table.concat(args, splitKey)
+
+					if textWithoutLastArg ~= "" then
+						textWithoutLastArg ..= splitKey
+					end
+
+					text.Text = textWithoutLastArg .. players["Entry 0"].Text .. " "
 				elseif scroll:FindFirstChild("Entry 0") then
 					text.Text = string.split(scroll["Entry 0"].Text, "<")[1]
 				else