Comments not possible to save within a submodule (#6424)

Fixes #6096

Author: alexr00

src/commentHandlerResolver.ts

@@ -5,6 +5,7 @@
 'use strict';
 
 import * as vscode from 'vscode';
+import { Repository } from './api/api';
 import Logger from './common/logger';
 import { GHPRComment, GHPRCommentThread, TemporaryComment } from './github/prComment';
 
@@ -34,32 +35,38 @@ export namespace CommentReply {
 	}
 }
 
-const commentHandlers = new Map<string, CommentHandler>();
+const commentHandlers = new Map<string, { handler: CommentHandler, repoRootUri: string }>();
 
-export function registerCommentHandler(key: string, commentHandler: CommentHandler) {
-	commentHandlers.set(key, commentHandler);
+export function registerCommentHandler(key: string, commentHandler: CommentHandler, repository: Repository) {
+	commentHandlers.set(key, { handler: commentHandler, repoRootUri: repository.rootUri.toString() });
 }
 
 export function unregisterCommentHandler(key: string) {
 	commentHandlers.delete(key);
 }
 
 export function resolveCommentHandler(commentThread: GHPRCommentThread): CommentHandler | undefined {
+	const possibleHandlers: { handler: CommentHandler, repoRootUri: string }[] = [];
 	for (const commentHandler of commentHandlers.values()) {
-		if (commentHandler.hasCommentThread(commentThread)) {
-			return commentHandler;
+		if (commentHandler.handler.hasCommentThread(commentThread)) {
+			possibleHandlers.push(commentHandler);
 		}
 	}
-
+	if (possibleHandlers.length > 0) {
+		possibleHandlers.sort((a, b) => {
+			return b.repoRootUri.length - a.repoRootUri.length;
+		});
+		return possibleHandlers[0].handler;
+	}
 	Logger.warn(`Unable to find handler for comment thread ${commentThread.gitHubThreadId}`);
 
 	return;
 }
 
 export function findActiveHandler() {
 	for (const commentHandler of commentHandlers.values()) {
-		if (commentHandler.commentController.activeCommentThread) {
-			return commentHandler;
+		if (commentHandler.handler.commentController.activeCommentThread) {
+			return commentHandler.handler;
 		}
 	}
 }

src/view/pullRequestCommentController.ts

@@ -46,7 +46,7 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 		this._commentController = commentController;
 		this._context = folderRepoManager.context;
 		this._commentHandlerId = uuid();
-		registerCommentHandler(this._commentHandlerId, this);
+		registerCommentHandler(this._commentHandlerId, this, folderRepoManager.repository);
 
 		if (this.pullRequestModel.reviewThreadsCacheReady) {
 			this.initializeThreadsInOpenEditors().then(() => {

src/view/reviewCommentController.ts

@@ -82,7 +82,7 @@ export class ReviewCommentController extends CommentControllerBase
 		this._localToDispose.push(this._folderRepoManager.onDidChangeActivePullRequest(() => this.updateResourcesWithCommentingRanges()));
 		this._localToDispose.push(this._commentController);
 		this._commentHandlerId = uuid();
-		registerCommentHandler(this._commentHandlerId, this);
+		registerCommentHandler(this._commentHandlerId, this, _repository);
 	}
 
 	// #region initialize