Fix incorrect checks for descendants (#5964)

Fixes #5789

Author: alexr00

src/github/pullRequestModel.ts

@@ -18,7 +18,7 @@ import { Remote } from '../common/remote';
 import { ITelemetry } from '../common/telemetry';
 import { ReviewEvent as CommonReviewEvent, EventType, TimelineEvent } from '../common/timelineEvent';
 import { resolvePath, Schemes, toPRUri, toReviewUri } from '../common/uri';
-import { formatError } from '../common/utils';
+import { formatError, isDescendant } from '../common/utils';
 import { InMemFileChangeModel, RemoteFileChangeModel } from '../view/fileChangeModel';
 import { OctokitCommon } from './common';
 import { ConflictResolutionModel } from './conflictResolutionModel';
@@ -1933,7 +1933,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 
 		const allFilenames = filePathOrSubpaths
 			.map((f) =>
-				f.startsWith(this.githubRepository.rootUri.path)
+				isDescendant(this.githubRepository.rootUri.path, f)
 					? f.substring(this.githubRepository.rootUri.path.length + 1)
 					: f
 			);

src/github/repositoriesManager.ts

@@ -10,7 +10,7 @@ import { commands, contexts } from '../common/executeCommands';
 import Logger from '../common/logger';
 import { ITelemetry } from '../common/telemetry';
 import { EventType } from '../common/timelineEvent';
-import { compareIgnoreCase, dispose } from '../common/utils';
+import { compareIgnoreCase, dispose, isDescendant } from '../common/utils';
 import { CredentialStore } from './credentials';
 import { FolderRepositoryManager, ReposManagerState, ReposManagerStateContext } from './folderRepositoryManager';
 import { IssueModel } from './issueModel';
@@ -86,7 +86,7 @@ export class RepositoriesManager implements vscode.Disposable {
 		const workspaceFolders = vscode.workspace.workspaceFolders;
 		if (workspaceFolders) {
 			const index = workspaceFolders.findIndex(
-				folder => folder.uri.toString() === folderManager.repository.rootUri.toString(),
+				folder => isDescendant(folder.uri.fsPath, folderManager.repository.rootUri.fsPath) || isDescendant(folderManager.repository.rootUri.fsPath, folder.uri.fsPath),
 			);
 			if (index > -1) {
 				const arrayEnd = this._folderManagers.slice(index, this._folderManagers.length);

src/issues/userCompletionProvider.ts

@@ -9,7 +9,7 @@ import Logger from '../common/logger';
 import { IGNORE_USER_COMPLETION_TRIGGER, ISSUES_SETTINGS_NAMESPACE } from '../common/settingKeys';
 import { TimelineEvent } from '../common/timelineEvent';
 import { fromPRUri, Schemes } from '../common/uri';
-import { compareIgnoreCase } from '../common/utils';
+import { compareIgnoreCase, isDescendant } from '../common/utils';
 import { EXTENSION_ID } from '../constants';
 import { FolderRepositoryManager } from '../github/folderRepositoryManager';
 import { IAccount, User } from '../github/interface';
@@ -128,7 +128,7 @@ export class UserCompletionProvider implements vscode.CompletionItemProvider {
 
 	private isCodeownersFiles(uri: vscode.Uri): boolean {
 		const repositoryManager = this.manager.getManagerForFile(uri);
-		if (!repositoryManager || !uri.path.startsWith(repositoryManager.repository.rootUri.path)) {
+		if (!repositoryManager || !isDescendant(repositoryManager.repository.rootUri.fsPath, uri.fsPath)) {
 			return false;
 		}
 		const subpath = uri.path.substring(repositoryManager.repository.rootUri.path.length).toLowerCase();

src/view/prChangesTreeDataProvider.ts

@@ -8,6 +8,7 @@ import { GitApiImpl } from '../api/api1';
 import { commands, contexts } from '../common/executeCommands';
 import Logger, { PR_TREE } from '../common/logger';
 import { FILE_LIST_LAYOUT, GIT, OPEN_DIFF_ON_CLICK, PR_SETTINGS_NAMESPACE } from '../common/settingKeys';
+import { isDescendant } from '../common/utils';
 import { FolderRepositoryManager } from '../github/folderRepositoryManager';
 import { PullRequestModel } from '../github/pullRequestModel';
 import { RepositoriesManager } from '../github/repositoriesManager';
@@ -166,9 +167,10 @@ export class PullRequestChangesTreeDataProvider extends vscode.Disposable implem
 	private sortMap() {
 		const workspaceFolders = vscode.workspace.workspaceFolders;
 		const compareFolders = (a: vscode.Uri, b: vscode.Uri) => {
-			const aFolder = a.toString().toLowerCase();
-			const bFolder = b.toString().toLowerCase();
-			return aFolder.includes(bFolder) || bFolder.includes(aFolder);
+			const aFolder = a.fsPath.toLowerCase();
+			const bFolder = b.fsPath.toLowerCase();
+
+			return isDescendant(aFolder, bFolder) || isDescendant(bFolder, aFolder);
 		};
 
 		return Array.from(this._pullRequestManagerMap.entries()).sort((a, b) => {

src/view/reviewsManager.ts

@@ -8,6 +8,7 @@ import { Repository } from '../api/api';
 import { GitApiImpl } from '../api/api1';
 import { ITelemetry } from '../common/telemetry';
 import { Schemes } from '../common/uri';
+import { isDescendant } from '../common/utils';
 import { CredentialStore } from '../github/credentials';
 import { RepositoriesManager } from '../github/repositoriesManager';
 import { GitContentFileSystemProvider } from './gitContentProvider';
@@ -65,7 +66,7 @@ export class ReviewsManager {
 
 	async provideTextDocumentContent(uri: vscode.Uri): Promise<string | undefined> {
 		for (const reviewManager of this._reviewManagers) {
-			if (uri.fsPath.startsWith(reviewManager.repository.rootUri.fsPath)) {
+			if (isDescendant(reviewManager.repository.rootUri.fsPath, uri.fsPath)) {
 				return reviewManager.provideTextDocumentContent(uri);
 			}
 		}