fix(ui): fix some remaining suggestion bugs

packages/ui/src/components/terminal/terminal-text-field/suggestion.ts

@@ -1,5 +1,6 @@
 import { BaseRegistry } from "@rbxts/centurion";
 import {
+	atNextPart,
 	commandArgIndex,
 	currentCommandPath,
 	currentTextPart,
@@ -65,7 +66,7 @@ export function getSuggestedText(
 	text: string,
 	suggestion?: Suggestion,
 ) {
-	if (suggestion === undefined) return text;
+	if (suggestion === undefined) return "";
 
 	let suggestionText: string;
 
@@ -75,11 +76,10 @@ export function getSuggestedText(
 	} else {
 		const command = currentCommandPath();
 		const argIndex = terminalArgIndex();
-		if (command === undefined || argIndex === undefined) return text;
 
-		const atNextPart = text.sub(-1) === " ";
+		if (command === undefined || argIndex === undefined) return "";
 
-		if (atNextPart && argIndex === commandArgIndex()) {
+		if (atNextPart() && argIndex === commandArgIndex()) {
 			suggestionText = suggestion.title;
 		} else if (!suggestion.others.isEmpty()) {
 			suggestionText = suggestion.others[0];

packages/ui/src/components/terminal/terminal-text-field/terminal-text-field.tsx

@@ -66,7 +66,6 @@ export function TerminalTextField({
 		if (textBox === undefined) return;
 		textBox.Text = text;
 		textBox.CursorPosition = text.size() + 1;
-		suggestionText(text);
 	};
 
 	const traverseHistory = (up: boolean) => {

packages/ui/src/components/terminal/terminal.tsx

@@ -8,6 +8,7 @@ import { useClient } from "../../hooks/use-client";
 import { useHistory } from "../../hooks/use-history";
 import { px } from "../../hooks/use-px";
 import {
+	atNextPart,
 	commandArgIndex,
 	currentCommandPath,
 	currentSuggestion,
@@ -87,7 +88,7 @@ export function Terminal() {
 
 					// If the text ends in a space, we want to count that as having traversed
 					// to the next "part" of the text.
-					const atNextPart = text.sub(-1) === " ";
+					const endsInSpace = text.sub(-1) === " ";
 					const path = getValidPath(client.registry, parts);
 					const command =
 						path !== undefined ? client.registry.getCommand(path) : undefined;
@@ -102,16 +103,16 @@ export function Terminal() {
 						terminalTextValid(
 							noArgs ||
 								missing.isEmpty() ||
-								(atNextPart && missing.size() === 1),
+								(endsInSpace && missing.size() === 1),
 						);
 					} else {
 						currentCommandPath(undefined);
 						terminalTextValid(false);
 					}
 
 					let textPart = parts[parts.size() - 1] as string | undefined;
-					const quoted = textPart?.match(START_QUOTE_PATTERN) !== undefined;
-					if (atNextPart && !quoted) {
+					const atNext = atNextPart();
+					if (atNext) {
 						textPart = undefined;
 					} else if (textPart !== undefined) {
 						const spaces = text.match(TRAILING_SPACE_PATTERN)[0] ?? "";
@@ -120,19 +121,15 @@ export function Terminal() {
 
 					const argIndex =
 						path !== undefined
-							? parts.size() - path.size() - (atNextPart ? 0 : 1)
+							? parts.size() - path.size() - (atNext ? 0 : 1)
 							: -1;
 					terminalArgIndex(argIndex);
 
 					if (command === undefined || argIndex === -1) {
 						// Get command suggestions
 						const parentPath = !parts.isEmpty()
 							? new RegistryPath(
-									ArrayUtil.slice(
-										parts,
-										0,
-										parts.size() - (atNextPart ? 0 : 1),
-									),
+									ArrayUtil.slice(parts, 0, parts.size() - (atNext ? 0 : 1)),
 								)
 							: undefined;
 
@@ -244,7 +241,10 @@ export function Terminal() {
 						return;
 					}
 
-					const args = ArrayUtil.slice(terminalTextParts(), commandPath.size());
+					const args = ArrayUtil.slice(
+						splitString(terminalText(), " "),
+						commandPath.size(),
+					);
 					client.dispatcher.run(commandPath, args);
 				}}
 			/>

packages/ui/src/store.ts

@@ -19,5 +19,11 @@ export const terminalText = atom("");
 export const terminalTextParts = computed(() => {
 	return splitString(terminalText(), " ", true);
 });
+export const atNextPart = computed(() => {
+	const parts = terminalTextParts();
+	const textPart = parts[parts.size() - 1] as string | undefined;
+	const quoted = textPart?.match(`^(['"])`) !== undefined;
+	return terminalText().sub(-1) === " " && !quoted;
+});
 export const terminalTextValid = atom(false);
 export const currentTextPart = atom<string | undefined>(undefined);

test/src/server/commands/echo.ts

@@ -15,13 +15,12 @@ export class EchoCommand {
 				name: "text",
 				description: "The text to print",
 				type: CenturionType.String,
-				numArgs: "rest",
 				suggestions: ["Hello, World!", "Some other spaced text", "Test"],
 			},
 		],
 		aliases: ["print"],
 	})
-	run(_: CommandContext, text: string[]) {
-		print(text.join(" "));
+	run(_: CommandContext, text: string) {
+		print(text);
 	}
 }