bug: space in folder and file name #2361

Author: kunwarVivek

src/core/mentions/__tests__/index.test.ts

@@ -156,7 +156,7 @@ Detailed commit message with multiple lines
 			jest.spyOn(fs, "stat").mockResolvedValue({ isFile: () => true, isDirectory: () => false } as any)
 
 			// Test with a file path containing escaped spaces
-			const filePath = "/path/with\\ spaces/my\\ file.txt"
+			const filePath = "/path/with\ spaces/my\ file.txt"
 
 			// First, verify that the regex pattern correctly matches the entire path
 			// Import the regex pattern directly to test it
@@ -188,7 +188,7 @@ Detailed commit message with multiple lines
 			jest.spyOn(fs, "stat").mockResolvedValue({ isFile: () => false, isDirectory: () => true } as any)
 
 			// Test with a folder path containing escaped spaces
-			const folderPath = "/folder\\ with\\ spaces/"
+			const folderPath = "/folder\ with\ spaces/"
 
 			// First, verify that the regex pattern correctly matches the entire path
 			const { mentionRegexGlobal } = require("../../../shared/context-mentions")
@@ -214,7 +214,7 @@ Detailed commit message with multiple lines
 			jest.spyOn(fs, "stat").mockResolvedValue({ isFile: () => true, isDirectory: () => false } as any)
 
 			// Test with a deeply nested path containing multiple escaped spaces
-			const filePath = "/root\\ dir/my\\ documents/project\\ files/important\\ notes/final\\ draft\\ v2.txt"
+			const filePath = "/root\ dir/my\ documents/project\ files/important\ notes/final\ draft\ v2.txt"
 
 			// Verify the regex pattern correctly matches the entire path
 			const { mentionRegexGlobal } = require("../../../shared/context-mentions")

src/core/mentions/index.ts

@@ -47,8 +47,8 @@ export async function parseMentions(
 ): Promise<string> {
 	const mentions: Set<string> = new Set()
 	let parsedText = text.replace(mentionRegexGlobal, (match, mention) => {
-		// Unescape spaces in the mention (convert "\\s" to " ")
-		const unescapedMention = mention.replace(/\\\\\s/g, " ")
+		// Unescape spaces in the mention (convert "\s" to " ")
+		const unescapedMention = mention.replace(/\\\s/g, " ")
 		mentions.add(unescapedMention)
 
 		if (unescapedMention.startsWith("http")) {

src/shared/context-mentions.ts

@@ -18,11 +18,11 @@ Mention regex:
 	  - `|`: Logical OR.
 	  - `\w+:\/\/`:
 		- **Protocol (`\w+://`)**: Matches URLs that start with a word character sequence followed by '://', such as 'http://', 'https://', 'ftp://', etc.
-	- `[^\s\r\n]*?(?:\\\\\s[^\s\r\n]*?)*?(?=\s*$|\s+@|[.,;:!?](?=[\s\r\n]|$))`:
+	- `[^\s\r\n]*?(?:\\[\s][^\s\r\n]*?)*?(?=\s*$|\s+@|[.,;:!?](?=[\s\r\n]|$))`:
 	  - **Character Pattern**: Matches any characters except whitespace and line breaks.
-	  - **Escaped Spaces**: The `(?:\\\\\s[^\s\r\n]*?)*?` part allows for escaped spaces (like `\\s`) in the path.
+	  - **Escaped Spaces**: The `(?:\\[\s][^\s\r\n]*?)*?` part allows for escaped spaces (like `\s`) in the path.
 	  - **Followed by a lookahead**: Ensures the match ends at the end of the line, before another @ symbol, or before punctuation followed by whitespace or end of line.
-	  - **This handles paths with escaped spaces (e.g., `my\\ folder/my\\ file.txt`)**.
+	  - **This handles paths with escaped spaces (e.g., `my\ folder/my\ file.txt`)**.
 	  - **Non-Greedy (`*?`)**: Ensures the smallest possible match.
 	- `|`: Logical OR.
 	- `problems\b`:
@@ -41,7 +41,7 @@ Mention regex:
 
 - **Summary**:
   - The regex effectively matches:
-	- Mentions that are file or folder paths starting with '/' and can contain escaped spaces within the path (e.g., 'my\\ folder/my\\ file.txt').
+	- Mentions that are file or folder paths starting with '/' and can contain escaped spaces within the path (e.g., 'my\ folder/my\ file.txt').
 	  The regex properly handles paths with escaped spaces and ensures the entire path is captured.
 	- URLs that start with a protocol (like 'http://') followed by any non-whitespace characters (including query parameters).
 	- The exact word 'problems'.
@@ -54,7 +54,7 @@ Mention regex:
 
 */
 export const mentionRegex =
-	/@((?:\/|\w+:\/\/)[^\s\r\n]*?(?:\\\\\s[^\s\r\n]*?)*?(?=\s*$|\s+@|[.,;:!?](?=[\s\r\n]|$))|[a-f0-9]{7,40}\b|problems\b|git-changes\b|terminal\b)(?=[.,;:!?]?(?=[\s\r\n]|$))/
+	/@((?:\/|\w+:\/\/)[^\s\r\n]*?(?:\\[\s][^\s\r\n]*?)*?(?=\s*$|\s+@|[.,;:!?](?=[\s\r\n]|$))|[a-f0-9]{7,40}\b|problems\b|git-changes\b|terminal\b)(?=[.,;:!?]?(?=[\s\r\n]|$))/
 export const mentionRegexGlobal = new RegExp(mentionRegex.source, "g")
 
 export interface MentionSuggestion {

webview-ui/src/utils/__tests__/context-mentions.test.ts

@@ -375,16 +375,16 @@ describe("shouldShowContextMenu", () => {
 
 	it("should return true for file paths with escaped spaces", () => {
 		// Test with a file path containing escaped spaces
-		expect(shouldShowContextMenu("@/path/to/my\\ file.txt", 20)).toBe(true)
+		expect(shouldShowContextMenu("@/path/to/my\ file.txt", 20)).toBe(true)
 	})
 
 	it("should return true for folder paths with escaped spaces", () => {
 		// Test with a folder path containing escaped spaces
-		expect(shouldShowContextMenu("@/path/to/my\\ folder/", 20)).toBe(true)
+		expect(shouldShowContextMenu("@/path/to/my\ folder/", 20)).toBe(true)
 	})
 
 	it("should return true for nested paths with multiple escaped spaces", () => {
 		// Test with a deeply nested path containing multiple escaped spaces
-		expect(shouldShowContextMenu("@/root\\ dir/my\\ documents/project\\ files/file.txt", 50)).toBe(true)
+		expect(shouldShowContextMenu("@/root\ dir/my\ documents/project\ files/file.txt", 50)).toBe(true)
 	})
 })