more clean up

Author: alexr00

src/github/emptyCommitWebview.ts

@@ -4,13 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { EXTENSION_ID } from '../constants';
 
 /**
  * Opens a webview panel to display a message for an empty commit.
  * The message is centered and styled similar to GitHub.com.
  */
-export function showEmptyCommitWebview(commitSha: string): void {
+export function showEmptyCommitWebview(extensionUri: vscode.Uri, commitSha: string): void {
 	const panel = vscode.window.createWebviewPanel(
 		'emptyCommit',
 		vscode.l10n.t('Commit {0}', commitSha.substring(0, 7)),
@@ -21,14 +20,10 @@ export function showEmptyCommitWebview(commitSha: string): void {
 		}
 	);
 
-	// Set icon for the webview panel tab
-	const extensionUri = vscode.extensions.getExtension(EXTENSION_ID)?.extensionUri;
-	if (extensionUri) {
-		panel.iconPath = {
-			light: vscode.Uri.joinPath(extensionUri, 'resources', 'icons', 'codicons', 'git-commit.svg'),
-			dark: vscode.Uri.joinPath(extensionUri, 'resources', 'icons', 'codicons', 'git-commit.svg')
-		};
-	}
+	panel.iconPath = {
+		light: vscode.Uri.joinPath(extensionUri, 'resources', 'icons', 'codicons', 'git-commit.svg'),
+		dark: vscode.Uri.joinPath(extensionUri, 'resources', 'icons', 'codicons', 'git-commit.svg')
+	};
 
 	panel.webview.html = getEmptyCommitHtml();
 }

src/github/pullRequestModel.ts

@@ -1466,7 +1466,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		return vscode.commands.executeCommand('vscode.changes', vscode.l10n.t('Changes in Pull Request #{0}', pullRequestModel.number), args);
 	}
 
-	static async openCommitChanges(githubRepository: GitHubRepository, commitSha: string) {
+	static async openCommitChanges(extensionUri: vscode.Uri, githubRepository: GitHubRepository, commitSha: string) {
 		try {
 			const parentCommit = await githubRepository.getCommitParent(commitSha);
 			if (!parentCommit) {
@@ -1477,7 +1477,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			const changes = await githubRepository.compareCommits(parentCommit, commitSha);
 			if (!changes?.files || changes.files.length === 0) {
 				// Show a webview with the empty commit message instead of a notification
-				showEmptyCommitWebview(commitSha);
+				showEmptyCommitWebview(extensionUri, commitSha);
 				return;
 			}
 

src/github/pullRequestOverview.ts

@@ -554,7 +554,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	private async openCommitChanges(message: IRequestMessage<OpenCommitChangesArgs>): Promise<void> {
 		try {
 			const { commitSha } = message.args;
-			await PullRequestModel.openCommitChanges(this._item.githubRepository, commitSha);
+			await PullRequestModel.openCommitChanges(this._extensionUri, this._item.githubRepository, commitSha);
 			this._replyMessage(message, {});
 		} catch (error) {
 			Logger.error(`Failed to open commit changes: ${formatError(error)}`, PullRequestOverviewPanel.ID);