Merge pull request #118 from JamiLu/fix-fileopen

Fix open files with spaces

File path and filename were not escaped with quote signs which then led failing to open files with spaces. The sames issue could have aroused for filenames with spacial characters as well. This fix the escaping of the path name and the filename fixes this issue and files are opened correctly. The filename with spaces would be interpreted as separated files if the filename was not escaped which is not wanted behavior

Author: JamiLu

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the "simply-blame" extension will be documented in this file.
 
+## [1.10.2]
+ ### Update
+  - Fix open file and file path with spaces
+
 ## [1.10.1]
  ### Update
   - Fix editor manager try open unopend editor issue

src/Git.ts

@@ -23,7 +23,7 @@ export const blameFile = async (fileName: string): Promise<string> => {
     const location = fileName.replace(name, '');
 
     try {
-        return await command(`cd ${location} && git blame --porcelain ${name}`) ?? '';
+        return await command(`cd "${location}" && git blame --porcelain "${name}"`) ?? '';
     } catch (e) {
         if ((e as Error).message.match(/no such path .* in HEAD/)) {
             vscode.window.showWarningMessage(`File: ${name} is not in HEAD`);

src/test/suite/Git.test.ts

@@ -100,18 +100,36 @@ Maybe this commit message is long and descriptive enough to prove a point.
     test('test blameFile slash succeeds', async () => {      
         await blameFile('path/to/file/test.ts');
 
-        sinon.assert.calledWithExactly(commandStub, `cd path/to/file/ && git blame --porcelain test.ts`);
+        sinon.assert.calledWithExactly(commandStub, `cd \"path/to/file/\" && git blame --porcelain \"test.ts\"`);
     });
 
     test('test blameFile backslash succeeds', async () => {
         await blameFile('path\\to\\file\\test.ts');
 
-        sinon.assert.calledWithExactly(commandStub, 'cd path\\to\\file\\ && git blame --porcelain test.ts');
+        sinon.assert.calledWithExactly(commandStub, 'cd \"path\\to\\file\\\" && git blame --porcelain \"test.ts\"');
     });
 
     test('test blameFile filename with dash succeeds', async () => {
         await blameFile('path/to/file/test-this.txt');
 
-        sinon.assert.calledWithExactly(commandStub, `cd path/to/file/ && git blame --porcelain test-this.txt`);
+        sinon.assert.calledWithExactly(commandStub, `cd \"path/to/file/\" && git blame --porcelain \"test-this.txt\"`);
+    });
+
+    test('test blameFile filename with space succeeds', async () => {
+        await blameFile('path/to/file/test this.txt');
+
+        sinon.assert.calledWithExactly(commandStub, `cd \"path/to/file/\" && git blame --porcelain \"test this.txt\"`);
+    });
+
+    test('test blameFile path with space succeeds', async () => {
+        await blameFile('path/to my files/test.txt');
+
+        sinon.assert.calledWithExactly(commandStub, `cd \"path/to my files/\" && git blame --porcelain \"test.txt\"`);
+    });
+
+    test('test blameFile path and filename with space succeeds', async () => {
+        await blameFile('path/to my files/test this.txt');
+
+        sinon.assert.calledWithExactly(commandStub, `cd \"path/to my files/\" && git blame --porcelain \"test this.txt\"`);
     });
 });