|
5 | 5 |
|
6 | 6 | import * as path from 'path'; |
7 | 7 | import * as vscode from 'vscode'; |
| 8 | +import { ASSIGNEES } from './issueFile'; |
| 9 | +import { StateManager } from './stateManager'; |
| 10 | +import { getRootUriFromScmInputUri, isComment, UserCompletion } from './util'; |
8 | 11 | import Logger from '../common/logger'; |
9 | 12 | import { IGNORE_USER_COMPLETION_TRIGGER, ISSUES_SETTINGS_NAMESPACE } from '../common/settingKeys'; |
10 | 13 | import { TimelineEvent } from '../common/timelineEvent'; |
11 | 14 | 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'; |
17 | 16 | import { FolderRepositoryManager } from '../github/folderRepositoryManager'; |
18 | 17 | import { IAccount, User } from '../github/interface'; |
19 | 18 | import { userMarkdown } from '../github/markdownUtils'; |
20 | 19 | import { RepositoriesManager } from '../github/repositoriesManager'; |
21 | 20 | import { getRelatedUsersFromTimelineEvents } from '../github/utils'; |
| 21 | +import { PullRequestCommentController } from '../view/pullRequestCommentController'; |
| 22 | +import { ReviewCommentController } from '../view/reviewCommentController'; |
22 | 23 |
|
23 | 24 | export class UserCompletionProvider implements vscode.CompletionItemProvider { |
24 | 25 | private static readonly ID: string = 'UserCompletionProvider'; |
@@ -174,8 +175,13 @@ export class UserCompletionProvider implements vscode.CompletionItemProvider { |
174 | 175 | document: vscode.TextDocument, |
175 | 176 | position: vscode.Position) { |
176 | 177 | 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 | + ) { |
179 | 185 | return; |
180 | 186 | } |
181 | 187 |
|
|
0 commit comments