Added check to see if the command parameter is undefined and show an error notification.

Author: RandomEngy

README.md

@@ -30,4 +30,11 @@ For example, this sets up Beyond Compare 4 on Windows:
     trustexitcode = true
 ```
 
-`keepbackup = false` prevents the system from creating `.orig` backup files after a merge. `trustexitcode = true` tells Git that the diff tool's exit code can be trusted to determine the outcome of the merge.
+`keepbackup = false` prevents the system from creating `.orig` backup files after a merge. `trustexitcode = true` tells Git that the diff tool's exit code can be trusted to determine the outcome of the merge.
+
+## Changelog
+
+### 1.0.5
+2021-10-02
+- Added configuration option to disable the notification on launching the tool.
+- Added error notification if VSCode fails to provide the command parameter, which can sometimes happen when the merge conflict list is being refreshed.

package.json

@@ -2,12 +2,12 @@
 	"name": "git-diff-and-merge-tool",
 	"displayName": "Git Diff and Merge Tool",
 	"description": "Launch git difftool and mergetool from VSCode.",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"author": {
 		"name": "David Rickard",
 		"email": "david.rickard@gmail.com"
 	},
-	"publisher": "david-rickard",
+	"publisher": "RandomEngy",
 	"repository": "https://github.com/RandomEngy/VSCodeGitDiffAndMergeTool",
 	"bugs": {
 		"url": "https://github.com/RandomEngy/VSCodeGitDiffAndMergeTool/issues"

src/extension.ts

@@ -19,6 +19,11 @@ export function activate(context: vscode.ExtensionContext) {
 		commandParam: any,
 		gitArgumentsFunc: (targetFile: string) => string[],
 		infoMessageFunc: (targetFile: string) => string): Promise<void> {
+		if (!commandParam) {
+			vscode.window.showErrorMessage('Could not launch merge tool. VSCode did not supply command parameters. Try again in a few seconds.');
+			return;
+		}
+
         const fullTargetFilePath: string = commandParam.resourceUri.fsPath;
 
 		const simpleGit = await import('simple-git');
@@ -29,7 +34,7 @@ export function activate(context: vscode.ExtensionContext) {
                 if (fullTargetFilePath.startsWith(projectPath)) {
                     var targetFile = getRelativeItemPath(projectPath, fullTargetFilePath);
                     if (targetFile === null) {
-                        vscode.window.showWarningMessage('Could not get target path.');
+                        vscode.window.showErrorMessage('Could not get target path.');
                         return;
                     }
 
@@ -50,7 +55,7 @@ export function activate(context: vscode.ExtensionContext) {
                 }
             }
 
-            vscode.window.showWarningMessage('Could not find workspace for ' + fullTargetFilePath);
+            vscode.window.showErrorMessage('Could not find workspace for ' + fullTargetFilePath);
 		}
 	}