Skip to content

Commit b062a54

Browse files
authored
Don't use uri params for comments document (#8860)
Part of microsoft/vscode#326491
1 parent c8edd85 commit b062a54

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

src/issues/userCompletionProvider.ts

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@
55

66
import * as path from 'path';
77
import * as vscode from 'vscode';
8+
import { ASSIGNEES } from './issueFile';
9+
import { StateManager } from './stateManager';
10+
import { getRootUriFromScmInputUri, isComment, UserCompletion } from './util';
811
import Logger from '../common/logger';
912
import { IGNORE_USER_COMPLETION_TRIGGER, ISSUES_SETTINGS_NAMESPACE } from '../common/settingKeys';
1013
import { TimelineEvent } from '../common/timelineEvent';
1114
import { fromNewIssueUri, fromPRUri, Schemes } from '../common/uri';
12-
import { compareIgnoreCase, isDescendant } from '../common/utils';
13-
import { EXTENSION_ID } from '../constants';
14-
import { ASSIGNEES } from './issueFile';
15-
import { StateManager } from './stateManager';
16-
import { getRootUriFromScmInputUri, isComment, UserCompletion } from './util';
15+
import { isDescendant } from '../common/utils';
1716
import { FolderRepositoryManager } from '../github/folderRepositoryManager';
1817
import { IAccount, User } from '../github/interface';
1918
import { userMarkdown } from '../github/markdownUtils';
2019
import { RepositoriesManager } from '../github/repositoriesManager';
2120
import { getRelatedUsersFromTimelineEvents } from '../github/utils';
21+
import { PullRequestCommentController } from '../view/pullRequestCommentController';
22+
import { ReviewCommentController } from '../view/reviewCommentController';
2223

2324
export class UserCompletionProvider implements vscode.CompletionItemProvider {
2425
private static readonly ID: string = 'UserCompletionProvider';
@@ -174,8 +175,13 @@ export class UserCompletionProvider implements vscode.CompletionItemProvider {
174175
document: vscode.TextDocument,
175176
position: vscode.Position) {
176177
try {
177-
const query = JSON.parse(document.uri.query);
178-
if ((document.uri.scheme !== Schemes.Comment) || compareIgnoreCase(query.extensionId, EXTENSION_ID) !== 0) {
178+
if (
179+
document.uri.scheme !== Schemes.Comment ||
180+
(
181+
!document.uri.authority.startsWith(`${PullRequestCommentController.PREFIX}-`) &&
182+
!document.uri.authority.startsWith(`${ReviewCommentController.PREFIX}-`)
183+
)
184+
) {
179185
return;
180186
}
181187

src/view/reviewCommentController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export interface SuggestionInformation {
4949

5050
export class ReviewCommentController extends CommentControllerBase implements CommentHandler, vscode.CommentingRangeProvider2, CommentReactionHandler {
5151
private static readonly ID = 'ReviewCommentController';
52-
private static readonly PREFIX = 'github-review';
52+
static readonly PREFIX = 'github-review';
5353
private _commentHandlerId: string;
5454

5555
// Note: marked as protected so that tests can verify caches have been updated correctly without breaking type safety

0 commit comments

Comments
 (0)