Revert code changes; document OR syntax for multiple authors

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

package.nls.json

@@ -30,7 +30,7 @@
 	"githubPullRequests.autoRepositoryDetection.markdownDescription": "Controls which repositories are automatically detected and opened by the extension.",
 	"githubPullRequests.autoRepositoryDetection.workspace": "Only detect repositories within the current workspace folders.",
 	"githubPullRequests.autoRepositoryDetection.true": "Detect all repositories found by the Git extension, including those outside workspace folders.",
-	"githubPullRequests.queries.markdownDescription": "Specifies what queries should be used in the GitHub Pull Requests tree. All queries are made against **the currently opened repos**. Each query object has a `label` that will be shown in the tree and a search `query` using [GitHub search syntax](https://help.github.com/en/articles/understanding-the-search-syntax). By default these queries define the categories \"Copilot on My Behalf\", \"Local Pull Request Branches\", \"Waiting For My Review\", \"Assigned To Me\" and \"Created By Me\". If you want to preserve these, make sure they are still in the array when you modify the setting. \n\n**Variables available:**\n - `${user}` - currently logged in user \n - `${owner}` - repository owner, ex. `microsoft` in `microsoft/vscode` \n - `${repository}` - repository name, ex. `vscode` in `microsoft/vscode` \n - `${today-Nd}` - date N days ago, ex. `${today-7d}` becomes `2025-01-04`\n\n**Example custom queries:**\n```json\n\"githubPullRequests.queries\": [\n  {\n    \"label\": \"Waiting For My Review\",\n    \"query\": \"is:open review-requested:${user}\"\n  },\n  {\n    \"label\": \"Mentioned Me\",\n    \"query\": \"is:open mentions:${user}\"\n  },\n  {\n    \"label\": \"Recent Activity\",\n    \"query\": \"is:open updated:>${today-7d}\"\n  }\n]\n```",
+	"githubPullRequests.queries.markdownDescription": "Specifies what queries should be used in the GitHub Pull Requests tree. All queries are made against **the currently opened repos**. Each query object has a `label` that will be shown in the tree and a search `query` using [GitHub search syntax](https://help.github.com/en/articles/understanding-the-search-syntax). By default these queries define the categories \"Copilot on My Behalf\", \"Local Pull Request Branches\", \"Waiting For My Review\", \"Assigned To Me\" and \"Created By Me\". If you want to preserve these, make sure they are still in the array when you modify the setting. \n\n**Variables available:**\n - `${user}` - currently logged in user \n - `${owner}` - repository owner, ex. `microsoft` in `microsoft/vscode` \n - `${repository}` - repository name, ex. `vscode` in `microsoft/vscode` \n - `${today-Nd}` - date N days ago, ex. `${today-7d}` becomes `2025-01-04`\n\n**Matching multiple values:** Queries use GitHub's advanced search, where a space between qualifiers means `AND`. To match any one of several values (for example several authors), combine them with `OR`, ex. `author:name1 OR author:name2 OR author:name3`.\n\n**Example custom queries:**\n```json\n\"githubPullRequests.queries\": [\n  {\n    \"label\": \"Waiting For My Review\",\n    \"query\": \"is:open review-requested:${user}\"\n  },\n  {\n    \"label\": \"Mentioned Me\",\n    \"query\": \"is:open mentions:${user}\"\n  },\n  {\n    \"label\": \"Created By My Team\",\n    \"query\": \"is:open author:name1 OR author:name2 OR author:name3\"\n  },\n  {\n    \"label\": \"Recent Activity\",\n    \"query\": \"is:open updated:>${today-7d}\"\n  }\n]\n```",
 	"githubPullRequests.queries.label.description": "The label to display for the query in the Pull Requests tree.",
 	"githubPullRequests.queries.query.description": "The GitHub search query for finding pull requests. Use GitHub search syntax with variables like ${user}, ${owner}, ${repository}. Example: 'is:open author:${user}' finds your open pull requests.",
 	"githubPullRequests.queries.copilotOnMyBehalf": "Copilot on My Behalf",

src/github/utils.ts

@@ -1764,53 +1764,8 @@ export function insertNewCommitsSinceReview(
 	});
 }
 
-const AUTHOR_QUALIFIER_PATTERN = /(^|\s|\()(-?)author:("[^"]+"|\S+)/g;
-
-/**
- * GitHub's advanced search treats a space between qualifiers as an `AND` operator.
- * Because a pull request only has a single author, repeating positive `author:`
- * qualifiers (e.g. `author:a author:b`) would `AND` them together and never match.
- * The legacy search API used to `OR` these together, so combine repeated positive
- * `author:` qualifiers into a single `(author:a OR author:b)` group to preserve that
- * behavior. Negated qualifiers (e.g. `-author:a`) keep their `AND` semantics.
- */
-function combineAuthorQualifiers(query: string): string {
-	const positiveAuthors: string[] = [];
-	let match: RegExpExecArray | null;
-	AUTHOR_QUALIFIER_PATTERN.lastIndex = 0;
-	while ((match = AUTHOR_QUALIFIER_PATTERN.exec(query)) !== null) {
-		if (!match[2]) {
-			positiveAuthors.push(`author:${match[3]}`);
-		}
-	}
-	if (positiveAuthors.length < 2) {
-		return query;
-	}
-
-	const group = `(${positiveAuthors.join(' OR ')})`;
-	let inserted = false;
-	AUTHOR_QUALIFIER_PATTERN.lastIndex = 0;
-	return query
-		.replace(AUTHOR_QUALIFIER_PATTERN, (full, prefix, negation) => {
-			if (negation) {
-				return full;
-			}
-			if (!inserted) {
-				inserted = true;
-				return `${prefix}${group}`;
-			}
-			// Drop this duplicate author qualifier. When the prefix is a plain
-			// separating space we remove it entirely; otherwise (e.g. a leading
-			// `(`) we keep the prefix so surrounding syntax stays intact. Any
-			// resulting double spaces are collapsed below.
-			return prefix === ' ' ? '' : prefix;
-		})
-		.replace(/\s{2,}/g, ' ')
-		.trim();
-}
-
 export function getPRFetchQuery(user: string, query: string): string {
-	const filter = combineAuthorQualifiers(query.replace(/\$\{user\}/g, user));
+	const filter = query.replace(/\$\{user\}/g, user);
 	return `is:pull-request ${filter} type:pr`;
 }
 

src/test/github/utils.test.ts

@@ -19,36 +19,6 @@ describe('utils', () => {
 			const result = getPRFetchQuery(user, query)
 			assert.strictEqual(result, 'is:pull-request reviewed-by:rmacfarlane -author:rmacfarlane type:pr');
 		});
-
-		it('combines multiple author qualifiers with OR', () => {
-			const query = 'repo:owner/repo is:open author:name1 author:name2 author:name3';
-			const result = getPRFetchQuery('me', query);
-			assert.strictEqual(result, 'is:pull-request repo:owner/repo is:open (author:name1 OR author:name2 OR author:name3) type:pr');
-		});
-
-		it('leaves a single author qualifier unchanged', () => {
-			const query = 'repo:owner/repo is:open author:name1';
-			const result = getPRFetchQuery('me', query);
-			assert.strictEqual(result, 'is:pull-request repo:owner/repo is:open author:name1 type:pr');
-		});
-
-		it('does not combine negated author qualifiers', () => {
-			const query = 'is:open -author:name1 -author:name2';
-			const result = getPRFetchQuery('me', query);
-			assert.strictEqual(result, 'is:pull-request is:open -author:name1 -author:name2 type:pr');
-		});
-
-		it('only groups positive author qualifiers, keeping negations', () => {
-			const query = 'author:name1 author:name2 -author:name3';
-			const result = getPRFetchQuery('me', query);
-			assert.strictEqual(result, 'is:pull-request (author:name1 OR author:name2) -author:name3 type:pr');
-		});
-
-		it('combines author qualifiers after ${user} substitution', () => {
-			const query = 'author:${user} author:teammate';
-			const result = getPRFetchQuery('me', query);
-			assert.strictEqual(result, 'is:pull-request (author:me OR author:teammate) type:pr');
-		});
 	});
 
 	describe('sanitizeIssueTitle', () => {