Merge pull request #7 from chadgauth:fix/test-fails

fix the test

Author: chadgauth

webview-ui/src/components/chat/ChatTextArea/ChatTextAreaInput.tsx

@@ -432,6 +432,7 @@ const ChatTextAreaInput = React.forwardRef<HTMLTextAreaElement, ChatTextAreaInpu
 
 		return (
 			<div
+				className="chat-text-area"
 				style={{
 					position: "relative",
 					display: "flex",
@@ -461,22 +462,17 @@ const ChatTextAreaInput = React.forwardRef<HTMLTextAreaElement, ChatTextAreaInpu
 							let newValue = inputValue.slice(0, cursorPosition)
 							let totalLength = 0
 
-							lines.forEach((line, index) => {
+							for (const line of lines) {
 								// Convert each path to a mention-friendly format
-								const mentionText = convertToMentionPath(line, cwd)
-								newValue += mentionText
-								totalLength += mentionText.length
-
-								// Add space after each mention except the last one
-								if (index < lines.length - 1) {
-									newValue += " "
-									totalLength += 1
-								}
-							})
+								const mentionPath = convertToMentionPath(line, cwd)
+								// If the path is unchanged (outside cwd), use it as is
+								const formattedPath = mentionPath === line ? line : mentionPath
+								newValue += formattedPath + " "
+								totalLength += formattedPath.length + 1
+							}
 
-							// Add space after the last mention and append the rest of the input
-							newValue += " " + inputValue.slice(cursorPosition)
-							totalLength += 1
+							// Append the rest of the input without extra space
+							newValue = newValue.trimEnd() + " " + inputValue.slice(cursorPosition).trimStart()
 
 							setInputValue(newValue)
 							const newCursorPosition = cursorPosition + totalLength

webview-ui/src/components/chat/ChatTextArea/ChatTextAreaLayout.tsx

@@ -12,7 +12,6 @@ interface ChatTextAreaLayoutProps {
 const ChatTextAreaLayout: React.FC<ChatTextAreaLayoutProps> = ({ children: { input, selections, actions } }) => {
 	return (
 		<div
-			className="chat-text-area"
 			style={{
 				position: "relative",
 				display: "flex",

webview-ui/src/components/chat/__tests__/ChatTextArea.test.tsx

@@ -13,20 +13,11 @@ jest.mock("../../../utils/vscode", () => ({
 }))
 jest.mock("../../../components/common/CodeBlock")
 jest.mock("../../../components/common/MarkdownBlock")
-jest.mock("../../../utils/path-mentions", () => ({
-	convertToMentionPath: jest.fn((path, cwd) => {
-		// Simple mock implementation that mimics the real function's behavior
-		if (cwd && path.toLowerCase().startsWith(cwd.toLowerCase())) {
-			const relativePath = path.substring(cwd.length)
-			return "@" + (relativePath.startsWith("/") ? relativePath : "/" + relativePath)
-		}
-		return path
-	}),
-}))
-
 // Get the mocked postMessage function
 const mockPostMessage = vscode.postMessage as jest.Mock
-const mockConvertToMentionPath = pathMentions.convertToMentionPath as jest.Mock
+
+// Spy on convertToMentionPath instead of mocking it
+const mockConvertToMentionPath = jest.spyOn(pathMentions, "convertToMentionPath")
 
 // Mock ExtensionStateContext
 jest.mock("../../../context/ExtensionStateContext")